From aa6aa12e11afc774ff205fd0701bfa10889b830f Mon Sep 17 00:00:00 2001 From: Charlie <45357714+GoodPro712@users.noreply.github.com> Date: Sun, 2 Feb 2020 18:34:12 +1100 Subject: [PATCH 1/3] Update Laugicality.cs --- Laugicality.cs | 58 ++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/Laugicality.cs b/Laugicality.cs index 4e89143..79a7b60 100644 --- a/Laugicality.cs +++ b/Laugicality.cs @@ -185,42 +185,44 @@ public override void Load() restockNearby = RegisterHotKey("Restock from Nearby Chests", "N"); } - public override void PostSetupContent() - { - #region BossChecklist + public override void PostSetupContent() + { + #region BossChecklist - Mod bossChecklist = ModLoader.GetMod("BossChecklist"); + Mod bossChecklist = ModLoader.GetMod("BossChecklist"); - if (bossChecklist != null) - { - bossChecklist.Call("AddBossWithInfo", "The Annihilator", 9.991f, (Func)(() => LaugicalityWorld.downedAnnihilator), string.Format("The Steam-O-Vision [i:{0}] will summon it at night", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Slybertron", 9.992f, (Func)(() => LaugicalityWorld.downedSlybertron), string.Format("The Steam Crown [i:{0}] calls to its King", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Steam Train", 9.993f, (Func)(() => LaugicalityWorld.downedSteamTrain), string.Format("A Suspicious Train Whistle [i:{0}] might get its attention.", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Dune Sharkron", 2.3f, (Func)(() => LaugicalityWorld.downedDuneSharkron), string.Format("A Tasty Morsel [i:{0}] in the desert will attract this Shark's attention.", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Hypothema", 3.8f, (Func)(() => LaugicalityWorld.downedHypothema), string.Format("There's a chill in the air... [i:{0}]", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Ragnar", 4.5f, (Func)(() => LaugicalityWorld.downedRagnar), string.Format("This Molten Mess [i:{0}] guards the Obsidium.", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Etheria", 11.51f, (Func)(() => LaugicalityWorld.downedTrueEtheria), string.Format("The guardian of the Etherial will consume her prey. Can only be called at night.[i:{0}]", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Dioritus", 5.91f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("This [i:{0}] calls the brother of the Guardians of the Underground", ModContent.ItemType())); - bossChecklist.Call("AddBossWithInfo", "Andesia", 5.92f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("The brother calls for his sister.")); - } + bossChecklist?.Call("AddBossWithInfo", "The Annihilator", 9.991f, (Func)(() => LaugicalityWorld.downedAnnihilator), string.Format("The Steam-O-Vision [i:{0}] will summon it at night", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Slybertron", 9.992f, (Func)(() => LaugicalityWorld.downedSlybertron), string.Format("The Steam Crown [i:{0}] calls to its King", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Steam Train", 9.993f, (Func)(() => LaugicalityWorld.downedSteamTrain), string.Format("A Suspicious Train Whistle [i:{0}] might get its attention.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Dune Sharkron", 2.3f, (Func)(() => LaugicalityWorld.downedDuneSharkron), string.Format("A Tasty Morsel [i:{0}] in the desert will attract this Shark's attention.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Hypothema", 3.8f, (Func)(() => LaugicalityWorld.downedHypothema), string.Format("There's a chill in the air... [i:{0}]", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Ragnar", 4.5f, (Func)(() => LaugicalityWorld.downedRagnar), string.Format("This Molten Mess [i:{0}] guards the Obsidium.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Etheria", 11.51f, (Func)(() => LaugicalityWorld.downedTrueEtheria), string.Format("The guardian of the Etherial will consume her prey. Can only be called at night.[i:{0}]", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Dioritus", 5.91f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("This [i:{0}] calls the brother of the Guardians of the Underground", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Andesia", 5.92f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("The brother calls for his sister.")); - #endregion + #endregion - #region AchMod + #region AchievementLibs - Mod achMod = ModLoader.GetMod("AchievementLibs"); + Mod achMod = ModLoader.GetMod("AchievementLibs"); - int[] rewardsBleedingHeart = { ModContent.ItemType() }; - int[] rewardsBleedingHeartCount = { 1 }; + int[] rewardsBleedingHeart = { ModContent.ItemType() }; + int[] rewardsBleedingHeartCount = { 1 }; - if (achMod != null) - { - achMod.Call("AddAchievementWithoutAction", this, "A Bleeding Heart", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType()), "Achievements/ragChieve2", rewardsBleedingHeart, rewardsBleedingHeartCount, (Func)(() => LaugicalityWorld.downedRagnar)); - //achMod.Call("AddAchievementWithoutReward", this, "The Bleeding Heart Guardian", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType("MoltenMess")), "Achievements/ragChieve2", (Func)(() => LaugicalityWorld.downedRagnar)); - } + achMod?.Call("AddAchievementWithoutAction", this, "A Bleeding Heart", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType()), "Achievements/ragChieve2", rewardsBleedingHeart, rewardsBleedingHeartCount, (Func)(() => LaugicalityWorld.downedRagnar)); + //achMod.Call("AddAchievementWithoutReward", this, "The Bleeding Heart Guardian", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType("MoltenMess")), "Achievements/ragChieve2", (Func)(() => LaugicalityWorld.downedRagnar)); - #endregion - } + #endregion + + #region Census + + Mod censusMod = ModLoader.GetMod("Census"); + + censusMod?.Call("TownNPCCondition", ModContent.NPCType(), "Defeat all Steam Trio bosses."); + + #endregion + } public override void Unload() { From bf350aab14c45afc207fc3df25bea709de4cc2e0 Mon Sep 17 00:00:00 2001 From: Charlie <45357714+GoodPro712@users.noreply.github.com> Date: Sun, 2 Feb 2020 18:42:34 +1100 Subject: [PATCH 2/3] Fixed tabs --- Laugicality.cs | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Laugicality.cs b/Laugicality.cs index 79a7b60..e578c6b 100644 --- a/Laugicality.cs +++ b/Laugicality.cs @@ -185,44 +185,44 @@ public override void Load() restockNearby = RegisterHotKey("Restock from Nearby Chests", "N"); } - public override void PostSetupContent() - { - #region BossChecklist + public override void PostSetupContent() + { + #region BossChecklist - Mod bossChecklist = ModLoader.GetMod("BossChecklist"); + Mod bossChecklist = ModLoader.GetMod("BossChecklist"); - bossChecklist?.Call("AddBossWithInfo", "The Annihilator", 9.991f, (Func)(() => LaugicalityWorld.downedAnnihilator), string.Format("The Steam-O-Vision [i:{0}] will summon it at night", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Slybertron", 9.992f, (Func)(() => LaugicalityWorld.downedSlybertron), string.Format("The Steam Crown [i:{0}] calls to its King", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Steam Train", 9.993f, (Func)(() => LaugicalityWorld.downedSteamTrain), string.Format("A Suspicious Train Whistle [i:{0}] might get its attention.", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Dune Sharkron", 2.3f, (Func)(() => LaugicalityWorld.downedDuneSharkron), string.Format("A Tasty Morsel [i:{0}] in the desert will attract this Shark's attention.", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Hypothema", 3.8f, (Func)(() => LaugicalityWorld.downedHypothema), string.Format("There's a chill in the air... [i:{0}]", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Ragnar", 4.5f, (Func)(() => LaugicalityWorld.downedRagnar), string.Format("This Molten Mess [i:{0}] guards the Obsidium.", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Etheria", 11.51f, (Func)(() => LaugicalityWorld.downedTrueEtheria), string.Format("The guardian of the Etherial will consume her prey. Can only be called at night.[i:{0}]", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Dioritus", 5.91f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("This [i:{0}] calls the brother of the Guardians of the Underground", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Andesia", 5.92f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("The brother calls for his sister.")); + bossChecklist?.Call("AddBossWithInfo", "The Annihilator", 9.991f, (Func)(() => LaugicalityWorld.downedAnnihilator), string.Format("The Steam-O-Vision [i:{0}] will summon it at night", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Slybertron", 9.992f, (Func)(() => LaugicalityWorld.downedSlybertron), string.Format("The Steam Crown [i:{0}] calls to its King", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Steam Train", 9.993f, (Func)(() => LaugicalityWorld.downedSteamTrain), string.Format("A Suspicious Train Whistle [i:{0}] might get its attention.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Dune Sharkron", 2.3f, (Func)(() => LaugicalityWorld.downedDuneSharkron), string.Format("A Tasty Morsel [i:{0}] in the desert will attract this Shark's attention.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Hypothema", 3.8f, (Func)(() => LaugicalityWorld.downedHypothema), string.Format("There's a chill in the air... [i:{0}]", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Ragnar", 4.5f, (Func)(() => LaugicalityWorld.downedRagnar), string.Format("This Molten Mess [i:{0}] guards the Obsidium.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Etheria", 11.51f, (Func)(() => LaugicalityWorld.downedTrueEtheria), string.Format("The guardian of the Etherial will consume her prey. Can only be called at night.[i:{0}]", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Dioritus", 5.91f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("This [i:{0}] calls the brother of the Guardians of the Underground", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Andesia", 5.92f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("The brother calls for his sister.")); - #endregion + #endregion - #region AchievementLibs + #region AchievementLibs - Mod achMod = ModLoader.GetMod("AchievementLibs"); + Mod achMod = ModLoader.GetMod("AchievementLibs"); - int[] rewardsBleedingHeart = { ModContent.ItemType() }; - int[] rewardsBleedingHeartCount = { 1 }; + int[] rewardsBleedingHeart = { ModContent.ItemType() }; + int[] rewardsBleedingHeartCount = { 1 }; - achMod?.Call("AddAchievementWithoutAction", this, "A Bleeding Heart", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType()), "Achievements/ragChieve2", rewardsBleedingHeart, rewardsBleedingHeartCount, (Func)(() => LaugicalityWorld.downedRagnar)); - //achMod.Call("AddAchievementWithoutReward", this, "The Bleeding Heart Guardian", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType("MoltenMess")), "Achievements/ragChieve2", (Func)(() => LaugicalityWorld.downedRagnar)); + achMod?.Call("AddAchievementWithoutAction", this, "A Bleeding Heart", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType()), "Achievements/ragChieve2", rewardsBleedingHeart, rewardsBleedingHeartCount, (Func)(() => LaugicalityWorld.downedRagnar)); + //achMod.Call("AddAchievementWithoutReward", this, "The Bleeding Heart Guardian", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType("MoltenMess")), "Achievements/ragChieve2", (Func)(() => LaugicalityWorld.downedRagnar)); - #endregion + #endregion - #region Census + #region Census - Mod censusMod = ModLoader.GetMod("Census"); + Mod censusMod = ModLoader.GetMod("Census"); - censusMod?.Call("TownNPCCondition", ModContent.NPCType(), "Defeat all Steam Trio bosses."); + censusMod?.Call("TownNPCCondition", ModContent.NPCType(), "Defeat all Steam Trio bosses."); - #endregion - } + #endregion + } public override void Unload() { From d04748916666622d1df78744635275543ee43a25 Mon Sep 17 00:00:00 2001 From: Charlie <45357714+GoodPro712@users.noreply.github.com> Date: Sun, 2 Feb 2020 18:49:07 +1100 Subject: [PATCH 3/3] Actually fixed tabs --- Laugicality.cs | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/Laugicality.cs b/Laugicality.cs index e578c6b..b60b9ae 100644 --- a/Laugicality.cs +++ b/Laugicality.cs @@ -187,41 +187,41 @@ public override void Load() public override void PostSetupContent() { - #region BossChecklist + #region BossChecklist - Mod bossChecklist = ModLoader.GetMod("BossChecklist"); + Mod bossChecklist = ModLoader.GetMod("BossChecklist"); - bossChecklist?.Call("AddBossWithInfo", "The Annihilator", 9.991f, (Func)(() => LaugicalityWorld.downedAnnihilator), string.Format("The Steam-O-Vision [i:{0}] will summon it at night", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Slybertron", 9.992f, (Func)(() => LaugicalityWorld.downedSlybertron), string.Format("The Steam Crown [i:{0}] calls to its King", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Steam Train", 9.993f, (Func)(() => LaugicalityWorld.downedSteamTrain), string.Format("A Suspicious Train Whistle [i:{0}] might get its attention.", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Dune Sharkron", 2.3f, (Func)(() => LaugicalityWorld.downedDuneSharkron), string.Format("A Tasty Morsel [i:{0}] in the desert will attract this Shark's attention.", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Hypothema", 3.8f, (Func)(() => LaugicalityWorld.downedHypothema), string.Format("There's a chill in the air... [i:{0}]", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Ragnar", 4.5f, (Func)(() => LaugicalityWorld.downedRagnar), string.Format("This Molten Mess [i:{0}] guards the Obsidium.", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Etheria", 11.51f, (Func)(() => LaugicalityWorld.downedTrueEtheria), string.Format("The guardian of the Etherial will consume her prey. Can only be called at night.[i:{0}]", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Dioritus", 5.91f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("This [i:{0}] calls the brother of the Guardians of the Underground", ModContent.ItemType())); - bossChecklist?.Call("AddBossWithInfo", "Andesia", 5.92f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("The brother calls for his sister.")); + bossChecklist?.Call("AddBossWithInfo", "The Annihilator", 9.991f, (Func)(() => LaugicalityWorld.downedAnnihilator), string.Format("The Steam-O-Vision [i:{0}] will summon it at night", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Slybertron", 9.992f, (Func)(() => LaugicalityWorld.downedSlybertron), string.Format("The Steam Crown [i:{0}] calls to its King", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Steam Train", 9.993f, (Func)(() => LaugicalityWorld.downedSteamTrain), string.Format("A Suspicious Train Whistle [i:{0}] might get its attention.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Dune Sharkron", 2.3f, (Func)(() => LaugicalityWorld.downedDuneSharkron), string.Format("A Tasty Morsel [i:{0}] in the desert will attract this Shark's attention.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Hypothema", 3.8f, (Func)(() => LaugicalityWorld.downedHypothema), string.Format("There's a chill in the air... [i:{0}]", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Ragnar", 4.5f, (Func)(() => LaugicalityWorld.downedRagnar), string.Format("This Molten Mess [i:{0}] guards the Obsidium.", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Etheria", 11.51f, (Func)(() => LaugicalityWorld.downedTrueEtheria), string.Format("The guardian of the Etherial will consume her prey. Can only be called at night.[i:{0}]", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Dioritus", 5.91f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("This [i:{0}] calls the brother of the Guardians of the Underground", ModContent.ItemType())); + bossChecklist?.Call("AddBossWithInfo", "Andesia", 5.92f, (Func)(() => LaugicalityWorld.downedAnDio), string.Format("The brother calls for his sister.")); - #endregion + #endregion - #region AchievementLibs + #region AchievementLibs - Mod achMod = ModLoader.GetMod("AchievementLibs"); + Mod achMod = ModLoader.GetMod("AchievementLibs"); - int[] rewardsBleedingHeart = { ModContent.ItemType() }; - int[] rewardsBleedingHeartCount = { 1 }; + int[] rewardsBleedingHeart = { ModContent.ItemType() }; + int[] rewardsBleedingHeartCount = { 1 }; - achMod?.Call("AddAchievementWithoutAction", this, "A Bleeding Heart", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType()), "Achievements/ragChieve2", rewardsBleedingHeart, rewardsBleedingHeartCount, (Func)(() => LaugicalityWorld.downedRagnar)); - //achMod.Call("AddAchievementWithoutReward", this, "The Bleeding Heart Guardian", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType("MoltenMess")), "Achievements/ragChieve2", (Func)(() => LaugicalityWorld.downedRagnar)); + achMod?.Call("AddAchievementWithoutAction", this, "A Bleeding Heart", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType()), "Achievements/ragChieve2", rewardsBleedingHeart, rewardsBleedingHeartCount, (Func)(() => LaugicalityWorld.downedRagnar)); + //achMod.Call("AddAchievementWithoutReward", this, "The Bleeding Heart Guardian", string.Format("Defeat Ragnar, Guardian of the Obsidium. [i:{0}]", ModContent.ItemType("MoltenMess")), "Achievements/ragChieve2", (Func)(() => LaugicalityWorld.downedRagnar)); - #endregion + #endregion - #region Census + #region Census - Mod censusMod = ModLoader.GetMod("Census"); + Mod censusMod = ModLoader.GetMod("Census"); - censusMod?.Call("TownNPCCondition", ModContent.NPCType(), "Defeat all Steam Trio bosses."); + censusMod?.Call("TownNPCCondition", ModContent.NPCType(), "Defeat all Steam Trio bosses."); - #endregion + #endregion } public override void Unload()