diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs index 8662ee4..490d19e 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs @@ -272,6 +272,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem NextStep = 49, OnAdvance = () => { //go to gates + AddFollower(Game.GetWorld(WorldSno.trout_town), ActorSno._leah); var world = Game.GetWorld(WorldSno.trout_town); StartConversation(world, 166678); ListenProximity(ActorSno._trout_oldtristram_exit_gate, new Advance()); @@ -416,12 +417,16 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Saveable = true, NextStep = 23, OnAdvance = () => - { //go to church + { + //go to church var world = Game.GetWorld(WorldSno.trout_town); ListenProximity(ActorSno._trdun_cath_cathedraldoorexterior, new Advance()); var leah = world.GetActorBySNO(ActorSno._leah); if (leah != null) + { leah.Hidden = false; + leah.SetVisible(true); + } SetActorVisible(world, ActorSno._tristram_mayor, false); var cart = world.GetActorBySNO(ActorSno._trout_newtristram_blocking_cart, true); if (cart != null) @@ -489,6 +494,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem OnAdvance = () => { //go with Cain Game.CurrentEncounter.Activated = false; + StartConversation(Game.GetWorld(WorldSno.trdun_cain_intro), 72496); ListenTeleport(19938, new Advance()); } @@ -511,6 +517,8 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem StartConversation(tristramWorld, 72498); }); //StartConversation(this.Game.GetWorld(71150), 72496); + DestroyFollower(ActorSno._leah); + var leah = tristramWorld.GetActorBySNO(ActorSno._leah, true); if (leah == null) { diff --git a/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs b/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs index 4e3b28b..5863cd2 100644 --- a/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs +++ b/src/DiIiS-NA/D3-GameServer/GameModsConfig.cs @@ -159,6 +159,63 @@ public class GameModsConfig { #pragma warning disable CS0618 + Rate = + { + Experience = migration.RateExp, + Gold = migration.RateMoney, + ChangeDrop = migration.RateChangeDrop, + Drop = migration.RateDrop + }, + Health = + { + ResurrectionCharges = migration.ResurrectionCharges, + PotionCooldown = migration.HealthPotionCooldown, + PotionRestorePercentage = migration.HealthPotionRestorePercentage + }, + Monster = + { + HealthMultiplier = migration.RateMonsterHP, + DamageMultiplier = migration.RateMonsterDMG + }, + Boss = + { + HealthMultiplier = migration.BossHealthMultiplier, + DamageMultiplier = migration.BossDamageMultiplier + }, + Quest = + { + AutoSave = migration.AutoSaveQuests, + UnlockAllWaypoints = migration.UnlockAllWaypoints + }, + Player = + { + Multipliers = + { + Strength = new(migration.StrengthMultiplier, migration.StrengthParagonMultiplier), + Dexterity = new(migration.DexterityMultiplier, migration.DexterityParagonMultiplier), + Intelligence = new(migration.IntelligenceMultiplier, migration.IntelligenceParagonMultiplier), + Vitality = new(migration.VitalityMultiplier, migration.VitalityParagonMultiplier) + } + }, + Items = + { + UnidentifiedDropChances = + { + HighQuality = migration.ChanceHighQualityUnidentified, + NormalQuality = migration.ChanceNormalUnidentified + } + }, + Minimap = + { + ForceVisibility = migration.ForceMinimapVisibility + }, + NephalemRift = + { + AutoFinish = migration.NephalemRiftAutoFinish, + AutoFinishThreshold = migration.NephalemRiftAutoFinishThreshold, + OrbsChance = migration.NephalemRiftAutoFinishThreshold, + ProgressMultiplier = migration.NephalemRiftProgressMultiplier + } #pragma warning restore CS0618 }; File.WriteAllText("config.mods.json", content.ToJson());