diff --git a/Localization/zh-Hans.hjson b/Localization/zh-Hans.hjson index 707b59d..84376ee 100644 --- a/Localization/zh-Hans.hjson +++ b/Localization/zh-Hans.hjson @@ -241,6 +241,7 @@ Mods: { ''' 包含以下Buff 声呐, 钓鱼, 再生, 镇静, 荆棘, 铁皮, 狱火, 宝匣 + 右击来开启或关闭镇静效果 ''' } @@ -302,7 +303,7 @@ Mods: { } TankComb: { - DisplayName: 坦克药剂包 (炼金) + DisplayName: 防护药剂包 (炼金) Description: ''' 包含以下Buff @@ -334,12 +335,12 @@ Mods: { Description: ''' 完美结合了以下药剂包的Buff： - 坦克药剂包、魔法药剂包、射手药剂包以及召唤师药剂包 + 防护药剂包、魔法药剂包、射手药剂包以及召唤师药剂包 ''' } VanTankComb: { - DisplayName: 坦克药剂包 (原版) + DisplayName: 防护药剂包 (原版) Description: ''' 包含以下Buff @@ -460,6 +461,7 @@ Mods: { ''' 获得你在钓鱼时所需的Buff (声呐, 钓鱼, 再生, 镇静, 荆棘, 铁皮, 狱火, 宝匣) + 右击来开启或关闭镇静效果 ''' } @@ -786,11 +788,11 @@ Mods: { } TankCombination: { - DisplayName: 坦克药剂包 (炼金) + DisplayName: 防护药剂包 (炼金) Tooltip: ''' - 获得一些坦克Buff - (耐力, 生命力, 铁皮, 黑曜石皮, 荆棘, 再生, 泰坦皮肤, 无敌) + 获得一些防护Buff + (敏捷，耐力, 生命力, 铁皮, 黑曜石皮, 荆棘, 再生, 泰坦皮肤, 无敌) ''' } @@ -850,16 +852,16 @@ Mods: { Tooltip: ''' 完美结合了以下药剂包的buff： - 坦克药剂包、魔法药剂包、射手药剂包以及召唤师药剂包 + 防护药剂包、魔法药剂包、射手药剂包以及召唤师药剂包 ''' } VanTankCombination: { - DisplayName: 坦克药剂包 (原版) + DisplayName: 防护药剂包 (原版) Tooltip: ''' - 获得一些坦克Buff - (耐力, 生命力, 铁皮, 黑曜石皮, 荆棘, 再生) + 获得一些防护Buff + (敏捷，耐力, 生命力, 铁皮, 黑曜石皮, 荆棘, 再生) ''' } @@ -869,8 +871,8 @@ Mods: { } SingleUseCellphone: { - Tooltip: Calls for Travelling Merchant. Can only be used during day time. - DisplayName: Single Use Cellphone + Tooltip: 可以呼叫旅商, 只能在白天使用 + DisplayName: 一次性便携手机 } } @@ -1447,8 +1449,8 @@ Mods: { Excavation1: 极大增加挖掘能力 Excavation2: 挖掘区域被设定为 Excavation3: CTRL + 右键 来移除Buff - FishingComb1: Calming effect is enabled. - FishingComb2: Calming effect is disabled. + FishingComb1: 镇静效果已启用 + FishingComb2: 镇静效果已关闭 Tiles: { HMCraftPound.MapEntry: 豪华手工英镑 diff --git a/NPCs/Operator.cs b/NPCs/Operator.cs index 123ad2d..bcbbd57 100644 --- a/NPCs/Operator.cs +++ b/NPCs/Operator.cs @@ -863,8 +863,43 @@ public static bool Mutant get { return FargowiltasSouls.Core.Systems.WorldSavingSystem.DownedMutant; } } } + + [JITWhenModsEnabled("CatalystMod")] + public static class CatalystDown + { + public static bool Astrageldon + { + get { return CatalystMod.WorldDefeats.downedAstrageldon; } + } + } + + [JITWhenModsEnabled("CalamityHunt")] + public static class CalamityHuntDown + { + public static bool Goozma + { + get { return CalamityHunt.Common.Systems.BossDownedSystem.Instance.GoozmaDowned; } + } + } + + [JITWhenModsEnabled("AAMod")] + public static class AADown + { + public static bool Grips + { + get { return AAMod.Common.Globals.AABossDowned.downedGrips; } + } + public static bool Toad + { + get { return AAMod.Common.Globals.AABossDowned.downedToad; } + } + public static bool Monarch + { + get { return AAMod.Common.Globals.AABossDowned.downedMonarch; } + } + } // Possibly redundant with ModGlobalNPC - public override void ModifyNPCLoot(NPCLoot npcLoot) + public override void ModifyNPCLoot(NPCLoot npcLoot) { base.ModifyNPCLoot(npcLoot); @@ -878,6 +913,9 @@ public override void AddShops() ModLoader.TryGetMod("Redemption", out Mod Redemption); ModLoader.TryGetMod("ShardsOfAtheria", out Mod Atheria); ModLoader.TryGetMod("FargowiltasSouls", out Mod FargoSouls); + ModLoader.TryGetMod("CalamityHunt", out Mod CalamityHunt); + ModLoader.TryGetMod("Catalyst", out Mod Catalyst); + ModLoader.TryGetMod("AAMod", out Mod AAMod); #region Vaillan MaterialShop var shop = new NPCShop(Type, MaterialShop) @@ -953,7 +991,7 @@ public override void AddShops() .AddModItemToShop(Calamity, "DarksunFragment", 150000, () => (bool)Calamity.Call("Downed", "dog") && AlchemistNPCLiteWorld.downedDOGMothron) #endregion #region Fargo - .AddModItemToShop(FargoSouls, "DeviatingEnergy", Item.sellPrice(0, 1,50,0),() => FargoDowned.Devi) + .AddModItemToShop(FargoSouls, "DeviatingEnergy", Item.sellPrice(0, 1, 50, 0), () => FargoDowned.Devi) .AddModItemToShop(FargoSouls, "Eridanium", Item.sellPrice(0, 8, 50, 0), () => FargoDowned.Cosmos) .AddModItemToShop(FargoSouls, "AbomEnergy", Item.sellPrice(0, 6, 50, 0), () => FargoDowned.Abom) .AddModItemToShop(FargoSouls, "EternalEnergy", Item.sellPrice(0, 9, 50, 0), () => FargoDowned.Mutant) @@ -983,7 +1021,10 @@ public override void AddShops() .AddModItemToShop(Atheria, "HardlightPrism", 15000, () => ShardsConditions.DownedNova) .AddModItemToShop(Atheria, "BrokenHeroGun", 45000, Condition.DownedGolem) .AddModItemToShop(Atheria, "FragmentEntropy", 180000, Condition.DownedMoonLord) - .AddModItemToShop(Atheria, "MemoryFragment", 10000, Condition.DownedMoonLord); + .AddModItemToShop(Atheria, "MemoryFragment", 10000, Condition.DownedMoonLord) + #endregion + #region Catalyst + .AddModItemToShop(Catalyst, "MetanovaOre", Item.buyPrice(0, 2, 0, 0), () => CatalystDown.Astrageldon); #endregion shop.Register(); #endregion @@ -1033,7 +1074,7 @@ public override void AddShops() shop.Register(); #endregion - #region Bags 1 Shop - Calamity & Thorium + #region Bags 1 Shop - Calamity & lots of Affiliated Mods(Catalyst Entropy(added by itself) CalamityHunt) shop = new NPCShop(Type, Bags1Shop) #region Calamaity Part .AddModItemToShop(Calamity, "DesertScourgeBag", 375000, () => (bool)Calamity.Call("Downed", "desert scourge")) @@ -1062,7 +1103,26 @@ public override void AddShops() .AddModItemToShop(Calamity, "DraedonTreasureBag", 115000000, () => (bool)Calamity.Call("Downed", "exomechs")) .AddModItemToShop(Calamity, "SCalBag", 200000000, () => (bool)Calamity.Call("Downed", "supremecalamitas")) #endregion + #region Affiliated Mod + .AddModItemToShop(CalamityHunt, "TreasureTrunk", 200000000, () => CalamityHuntDown.Goozma) // The price is as same as Supreme Calamitas's + .AddModItemToShop(Catalyst,"AstrageldonBag", 12000000, () => CatalystDown.Astrageldon);// The price is as same as MoonLord's + ; + shop.Register(); + #endregion + #endregion + #region Bags 2 Shop - Fargo & Thorium & Ancient Awaken + shop = new NPCShop(Type, Bags2Shop) + #region Fargo + .AddModItemToShop(FargoSouls, "TrojanSquirrelBag", Item.buyPrice(0, 20, 0, 0), () => FargoDowned.Trojan) + .AddModItemToShop(FargoSouls, "CursedCoffinBag", Item.buyPrice(0, 29, 0, 0), () => FargoDowned.Cursed) + .AddModItemToShop(FargoSouls, "DeviBag", Item.buyPrice(1, 0, 0, 0), () => FargoDowned.Devi) + .AddModItemToShop(FargoSouls, "BanishedBaronBag", Item.buyPrice(1, 25, 0, 0), () => FargoDowned.Banished) + .AddModItemToShop(FargoSouls, "LifelightBag", Item.buyPrice(1, 60, 0, 0), () => FargoDowned.LifeLight) + .AddModItemToShop(FargoSouls, "CosmosBag", Item.buyPrice(20, 60, 0, 0), () => FargoDowned.Cosmos) + .AddModItemToShop(FargoSouls, "AbomBag", Item.buyPrice(30, 60, 0, 0), () => FargoDowned.Abom) + .AddModItemToShop(FargoSouls, "MutantBag", Item.buyPrice(40, 60, 0, 0), () => FargoDowned.Mutant) + #endregion #region Thorium Part .AddModItemToShop(ThoriumMod, "ThunderBirdBag", 500000, () => (bool)ThoriumMod.Call("GetDownedBoss", "TheGrandThunderBird")) .AddModItemToShop(ThoriumMod, "JellyFishBag", 750000, () => (bool)ThoriumMod.Call("GetDownedBoss", "QueenJellyfish")) @@ -1076,23 +1136,12 @@ public override void AddShops() .AddModItemToShop(ThoriumMod, "AbyssionBag", 3500000, () => (bool)ThoriumMod.Call("GetDownedBoss", "ForgottenOne")) .AddModItemToShop(ThoriumMod, "RagBag", 5000000, () => (bool)ThoriumMod.Call("GetDownedBoss", "ThePrimordials")) #endregion - ; - shop.Register(); + #region AAMod + .AddModItemToShop(AAMod, "GripsTreasureBag", Item.buyPrice(0,8,0,0),() => AADown.Grips) + .AddModItemToShop(AAMod, "ToadTreasureBag", Item.buyPrice(2,50,0,0), () => AADown.Toad) + .AddModItemToShop(AAMod, "MonarchTreasureBag", Item.buyPrice(4,0,0,0), () => AADown.Monarch) #endregion - - #region Bags 2 Shop - Fargo - shop = new NPCShop(Type, Bags2Shop) - .AddModItemToShop(FargoSouls, "TrojanSquirrelBag", Item.buyPrice(0,20,0,0), () => FargoDowned.Trojan) - .AddModItemToShop(FargoSouls, "CursedCoffinBag", Item.buyPrice(0, 29, 0, 0), () => FargoDowned.Cursed) - .AddModItemToShop(FargoSouls, "DeviBag", Item.buyPrice(1, 0, 0, 0), () => FargoDowned.Devi) - .AddModItemToShop(FargoSouls, "BanishedBaronBag", Item.buyPrice(1, 25, 0, 0), () => FargoDowned.Banished) - .AddModItemToShop(FargoSouls, "LifelightBag", Item.buyPrice(1, 60, 0, 0), () => FargoDowned.LifeLight) - .AddModItemToShop(FargoSouls, "CosmosBag", Item.buyPrice(20, 60, 0, 0), () => FargoDowned.Cosmos) - .AddModItemToShop(FargoSouls, "AbomBag", Item.buyPrice(30, 60, 0, 0), () => FargoDowned.Abom) - .AddModItemToShop(FargoSouls, "MutantBag", Item.buyPrice(40, 60, 0, 0), () => FargoDowned.Mutant) ; - - //.AddModItemToShop(Atheria, "NovaBossBag", 1500000, () => FargoDowned.Trojan); shop.Register(); #endregion diff --git a/build.txt b/build.txt index 7f6b8de..33380d1 100644 --- a/build.txt +++ b/build.txt @@ -2,6 +2,6 @@ displayName = AlchemistNPC Lite author = Gregg/VVV101, b2mauler, Rockman Zeta, somebody0214, RebooT, drh version = 1.9.9 homepage = https://forums.terraria.org/index.php?threads/alchemistnpc-v8-0.52798/ -weakReferences = CalamityMod, CalamityModMusic, Redemption, ShardsOfAtheria, ThoriumMod, FargowiltasSouls +weakReferences = CalamityMod, CalamityModMusic, Redemption, ShardsOfAtheria, ThoriumMod, FargowiltasSouls, CalamityHunt, CatalystMod, AAMod includeSource = true -sortAfter = Census, CalamityMod, CalamityModMusic, Redemption, ShardsOfAtheria, ThoriumMod, imkSushisMod +sortAfter = Census, CalamityMod, CalamityModMusic, Redemption, ShardsOfAtheria, ThoriumMod, imkSushisMod, FargowiltasSouls, CalamityHunt, CatalystMod, AAMod