From 4b83cdd6c8601ab940fd71218e7e38590aac7777 Mon Sep 17 00:00:00 2001 From: CrimsonTek <56491941+CrimsonTek@users.noreply.github.com> Date: Tue, 18 Feb 2020 22:20:09 -0700 Subject: [PATCH] 0.1.2.1 (2) - fixed a few things and changed a few types --- Dictionaries/Enemies.cs | 46 ++++++++++++++++++++--------------------- HeldItems/HeldItems.cs | 9 +++++++- Items/Weather.cs | 6 +++--- description.txt | 2 +- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Dictionaries/Enemies.cs b/Dictionaries/Enemies.cs index 6b42721..ccaee5c 100644 --- a/Dictionaries/Enemies.cs +++ b/Dictionaries/Enemies.cs @@ -277,8 +277,8 @@ public class Enemies {NPCID.ZombieEskimo, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, {NPCID.Frankenstein, new Tuple(Element.normal, Element.dark, Element.none, Element.normal) }, {NPCID.BlackRecluse, new Tuple(Element.bug, Element.poison, Element.none, Element.poison) }, - {NPCID.WallCreeper, new Tuple(Element.bug, Element.poison, Element.none, Element.normal) }, - {NPCID.WallCreeperWall, new Tuple(Element.bug, Element.poison, Element.none, Element.normal) }, + {NPCID.WallCreeper, new Tuple(Element.bug, Element.poison, Element.none, Element.poison) }, + {NPCID.WallCreeperWall, new Tuple(Element.bug, Element.poison, Element.none, Element.poison) }, {NPCID.SwampThing, new Tuple(Element.water, Element.grass, Element.none, Element.grass) }, {NPCID.UndeadViking, new Tuple(Element.bone, Element.none, Element.none, Element.bone) }, @@ -301,10 +301,10 @@ public class Enemies {NPCID.SpikedIceSlime, new Tuple(Element.water, Element.ice, Element.none, Element.ice) }, {NPCID.SnowFlinx, new Tuple(Element.normal, Element.ice, Element.none, Element.ice) }, - {NPCID.PincushionZombie, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.SlimedZombie, new Tuple(Element.blood, Element.water, Element.none, Element.normal) }, - {NPCID.SwampZombie, new Tuple(Element.blood, Element.grass, Element.none, Element.normal) }, - {NPCID.TwiggyZombie, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, + {NPCID.PincushionZombie, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.SlimedZombie, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.SwampZombie, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.TwiggyZombie, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, {NPCID.CataractEye, new Tuple(Element.normal, Element.flying, Element.none, Element.normal) }, {NPCID.SleepyEye, new Tuple(Element.normal, Element.flying, Element.none, Element.normal) }, {NPCID.DialatedEye, new Tuple(Element.normal, Element.flying, Element.none, Element.normal) }, @@ -315,7 +315,7 @@ public class Enemies {NPCID.ArmoredViking, new Tuple(Element.bone, Element.steel, Element.none, Element.bone) }, {NPCID.Lihzahrd, new Tuple(Element.normal, Element.none, Element.none, Element.normal) }, {NPCID.LihzahrdCrawler, new Tuple(Element.normal, Element.none, Element.none, Element.normal) }, - {NPCID.FemaleZombie, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, + {NPCID.FemaleZombie, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, {NPCID.HeadacheSkeleton, new Tuple(Element.bone, Element.none, Element.none, Element.bone) }, {NPCID.MisassembledSkeleton, new Tuple(Element.bone, Element.none, Element.none, Element.bone) }, {NPCID.PantlessSkeleton, new Tuple(Element.bone, Element.none, Element.none, Element.bone) }, @@ -340,7 +340,7 @@ public class Enemies {NPCID.SeaSnail, new Tuple(Element.water, Element.rock, Element.none, Element.water) }, {NPCID.Squid, new Tuple(Element.water, Element.none, Element.none, Element.water) }, {NPCID.QueenBee, new Tuple(Element.bug, Element.none, Element.levitate, Element.bug) }, - {NPCID.ZombieRaincoat, new Tuple(Element.blood, Element.normal, Element.none, Element.normal) }, + {NPCID.ZombieRaincoat, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, {NPCID.FlyingFish, new Tuple(Element.water, Element.flying, Element.none, Element.water) }, {NPCID.UmbrellaSlime, new Tuple(Element.water, Element.none, Element.none, Element.water) }, {NPCID.FlyingSnake, new Tuple(Element.normal, Element.flying, Element.none, Element.normal) }, @@ -438,9 +438,9 @@ public class Enemies {NPCID.DemonEyeOwl, new Tuple(Element.normal, Element.flying, Element.none, Element.normal) }, {NPCID.DemonEyeSpaceship, new Tuple(Element.normal, Element.steel, Element.none, Element.normal) }, - {NPCID.ZombieDoctor, new Tuple(Element.blood, Element.normal, Element.none, Element.normal) }, - {NPCID.ZombieSuperman, new Tuple(Element.blood, Element.fighting, Element.none, Element.normal) }, - {NPCID.ZombiePixie, new Tuple(Element.blood, Element.fairy, Element.none, Element.normal) }, + {NPCID.ZombieDoctor, new Tuple(Element.blood, Element.normal, Element.none, Element.blood) }, + {NPCID.ZombieSuperman, new Tuple(Element.blood, Element.fighting, Element.none, Element.blood) }, + {NPCID.ZombiePixie, new Tuple(Element.blood, Element.fairy, Element.none, Element.blood) }, {NPCID.SkeletonTopHat, new Tuple(Element.bone, Element.normal, Element.none, Element.normal) }, {NPCID.SkeletonAstonaut, new Tuple(Element.bone, Element.steel, Element.none, Element.normal) }, {NPCID.SkeletonAlien, new Tuple(Element.bone, Element.none, Element.none, Element.normal) }, @@ -451,16 +451,16 @@ public class Enemies {NPCID.PumpkingBlade, new Tuple(Element.steel, Element.none, Element.none, Element.steel) }, {NPCID.Hellhound, new Tuple(Element.normal, Element.dark, Element.none, Element.normal) }, {NPCID.Poltergeist, new Tuple(Element.ghost, Element.none, Element.levitate, Element.ghost) }, - {NPCID.ZombieXmas, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ZombieSweater, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, + {NPCID.ZombieXmas, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ZombieSweater, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, {NPCID.SlimeRibbonWhite, new Tuple(Element.water, Element.none, Element.none, Element.water) }, {NPCID.SlimeRibbonYellow, new Tuple(Element.water, Element.none, Element.none, Element.water) }, {NPCID.SlimeRibbonGreen, new Tuple(Element.water, Element.none, Element.none, Element.water) }, {NPCID.SlimeRibbonRed, new Tuple(Element.water, Element.none, Element.none, Element.water) }, {NPCID.BunnyXmas, new Tuple(Element.normal, Element.none, Element.none, Element.normal) }, - {NPCID.ZombieElf, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ZombieElfBeard, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ZombieElfGirl, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, + {NPCID.ZombieElf, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ZombieElfBeard, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ZombieElfGirl, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, {NPCID.PresentMimic, new Tuple(Element.steel, Element.none, Element.none, Element.steel) }, {NPCID.GingerbreadMan, new Tuple(Element.normal, Element.none, Element.none, Element.normal) }, @@ -561,13 +561,13 @@ public class Enemies {NPCID.VortexLarva, new Tuple(Element.electric, Element.bug, Element.none, Element.electric) }, {NPCID.VortexSoldier, new Tuple(Element.electric, Element.normal, Element.none, Element.electric) }, - {NPCID.ArmedZombie, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ArmedZombieEskimo, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ArmedZombiePincussion, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ArmedZombieSlimed, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ArmedZombieSwamp, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ArmedZombieTwiggy, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, - {NPCID.ArmedZombieCenx, new Tuple(Element.blood, Element.none, Element.none, Element.normal) }, + {NPCID.ArmedZombie, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ArmedZombieEskimo, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ArmedZombiePincussion, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ArmedZombieSlimed, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ArmedZombieSwamp, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ArmedZombieTwiggy, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, + {NPCID.ArmedZombieCenx, new Tuple(Element.blood, Element.none, Element.none, Element.blood) }, {NPCID.CultistTablet, new Tuple(Element.dark, Element.fire, Element.none, Element.fire) }, {NPCID.CultistDevote, new Tuple(Element.dark, Element.none, Element.none, Element.dark) }, {NPCID.CultistBoss, new Tuple(Element.dark, Element.none, Element.levitate, Element.dark) }, diff --git a/HeldItems/HeldItems.cs b/HeldItems/HeldItems.cs index 8fb8678..6adaadc 100644 --- a/HeldItems/HeldItems.cs +++ b/HeldItems/HeldItems.cs @@ -414,7 +414,14 @@ public class MetalCoat : HeldItems public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); - recipe.AddIngredient(RecipeGroupID.IronBar, 20); + recipe.AddIngredient(ItemID.IronBar, 20); + recipe.AddIngredient(ItemID.Diamond, 3); + recipe.AddTile(TileID.Anvils); + recipe.SetResult(this); + recipe.AddRecipe(); + + recipe = new ModRecipe(mod); + recipe.AddIngredient(ItemID.LeadBar, 20); recipe.AddIngredient(ItemID.Diamond, 3); recipe.AddTile(TileID.Anvils); recipe.SetResult(this); diff --git a/Items/Weather.cs b/Items/Weather.cs index 2d2b7ff..c90e668 100644 --- a/Items/Weather.cs +++ b/Items/Weather.cs @@ -14,9 +14,9 @@ class Weather : GlobalItem { public override bool InstancePerEntity => true; - float boostMult = 1; - float weatherMult = 1; - string weatherReason = string.Empty; + static float boostMult = 1; + static float weatherMult = 1; + static string weatherReason = string.Empty; public override void ModifyWeaponDamage(Item item, Player player, ref float add, ref float mult, ref float flat) { diff --git a/description.txt b/description.txt index e1ac168..0c7b48e 100644 --- a/description.txt +++ b/description.txt @@ -27,7 +27,7 @@ Version History: v0.1.2.1 - Made all Held Items rarer - Made bloody heart only drop during blood moons - - Maybe fixed a bug where everything that doesn't do damage shows "Item bonus: 10%" with a Held Item + - Changed a few types v0.1.2.0 - Added Held Items for every type.