Skip to content

Commit

Permalink
0.1.2.1 (2) - fixed a few things and changed a few types
Browse files Browse the repository at this point in the history
  • Loading branch information
@CrimsonTek
CrimsonTek committed Feb 19, 2020
1 parent b3df0e9 commit 4b83cdd
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 28 deletions.
46 changes: 23 additions & 23 deletions Dictionaries/Enemies.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ public class Enemies
{NPCID.ZombieEskimo, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.Frankenstein, new Tuple<Element, Element, Element, Element>(Element.normal, Element.dark, Element.none, Element.normal) },
{NPCID.BlackRecluse, new Tuple<Element, Element, Element, Element>(Element.bug, Element.poison, Element.none, Element.poison) },
{NPCID.WallCreeper, new Tuple<Element, Element, Element, Element>(Element.bug, Element.poison, Element.none, Element.normal) },
{NPCID.WallCreeperWall, new Tuple<Element, Element, Element, Element>(Element.bug, Element.poison, Element.none, Element.normal) },
{NPCID.WallCreeper, new Tuple<Element, Element, Element, Element>(Element.bug, Element.poison, Element.none, Element.poison) },
{NPCID.WallCreeperWall, new Tuple<Element, Element, Element, Element>(Element.bug, Element.poison, Element.none, Element.poison) },
{NPCID.SwampThing, new Tuple<Element, Element, Element, Element>(Element.water, Element.grass, Element.none, Element.grass) },
{NPCID.UndeadViking, new Tuple<Element, Element, Element, Element>(Element.bone, Element.none, Element.none, Element.bone) },

Expand All @@ -301,10 +301,10 @@ public class Enemies

{NPCID.SpikedIceSlime, new Tuple<Element, Element, Element, Element>(Element.water, Element.ice, Element.none, Element.ice) },
{NPCID.SnowFlinx, new Tuple<Element, Element, Element, Element>(Element.normal, Element.ice, Element.none, Element.ice) },
{NPCID.PincushionZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.SlimedZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.water, Element.none, Element.normal) },
{NPCID.SwampZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.grass, Element.none, Element.normal) },
{NPCID.TwiggyZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.PincushionZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.SlimedZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.SwampZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.TwiggyZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.CataractEye, new Tuple<Element, Element, Element, Element>(Element.normal, Element.flying, Element.none, Element.normal) },
{NPCID.SleepyEye, new Tuple<Element, Element, Element, Element>(Element.normal, Element.flying, Element.none, Element.normal) },
{NPCID.DialatedEye, new Tuple<Element, Element, Element, Element>(Element.normal, Element.flying, Element.none, Element.normal) },
Expand All @@ -315,7 +315,7 @@ public class Enemies
{NPCID.ArmoredViking, new Tuple<Element, Element, Element, Element>(Element.bone, Element.steel, Element.none, Element.bone) },
{NPCID.Lihzahrd, new Tuple<Element, Element, Element, Element>(Element.normal, Element.none, Element.none, Element.normal) },
{NPCID.LihzahrdCrawler, new Tuple<Element, Element, Element, Element>(Element.normal, Element.none, Element.none, Element.normal) },
{NPCID.FemaleZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.FemaleZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.HeadacheSkeleton, new Tuple<Element, Element, Element, Element>(Element.bone, Element.none, Element.none, Element.bone) },
{NPCID.MisassembledSkeleton, new Tuple<Element, Element, Element, Element>(Element.bone, Element.none, Element.none, Element.bone) },
{NPCID.PantlessSkeleton, new Tuple<Element, Element, Element, Element>(Element.bone, Element.none, Element.none, Element.bone) },
Expand All @@ -340,7 +340,7 @@ public class Enemies
{NPCID.SeaSnail, new Tuple<Element, Element, Element, Element>(Element.water, Element.rock, Element.none, Element.water) },
{NPCID.Squid, new Tuple<Element, Element, Element, Element>(Element.water, Element.none, Element.none, Element.water) },
{NPCID.QueenBee, new Tuple<Element, Element, Element, Element>(Element.bug, Element.none, Element.levitate, Element.bug) },
{NPCID.ZombieRaincoat, new Tuple<Element, Element, Element, Element>(Element.blood, Element.normal, Element.none, Element.normal) },
{NPCID.ZombieRaincoat, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.FlyingFish, new Tuple<Element, Element, Element, Element>(Element.water, Element.flying, Element.none, Element.water) },
{NPCID.UmbrellaSlime, new Tuple<Element, Element, Element, Element>(Element.water, Element.none, Element.none, Element.water) },
{NPCID.FlyingSnake, new Tuple<Element, Element, Element, Element>(Element.normal, Element.flying, Element.none, Element.normal) },
Expand Down Expand Up @@ -438,9 +438,9 @@ public class Enemies

{NPCID.DemonEyeOwl, new Tuple<Element, Element, Element, Element>(Element.normal, Element.flying, Element.none, Element.normal) },
{NPCID.DemonEyeSpaceship, new Tuple<Element, Element, Element, Element>(Element.normal, Element.steel, Element.none, Element.normal) },
{NPCID.ZombieDoctor, new Tuple<Element, Element, Element, Element>(Element.blood, Element.normal, Element.none, Element.normal) },
{NPCID.ZombieSuperman, new Tuple<Element, Element, Element, Element>(Element.blood, Element.fighting, Element.none, Element.normal) },
{NPCID.ZombiePixie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.fairy, Element.none, Element.normal) },
{NPCID.ZombieDoctor, new Tuple<Element, Element, Element, Element>(Element.blood, Element.normal, Element.none, Element.blood) },
{NPCID.ZombieSuperman, new Tuple<Element, Element, Element, Element>(Element.blood, Element.fighting, Element.none, Element.blood) },
{NPCID.ZombiePixie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.fairy, Element.none, Element.blood) },
{NPCID.SkeletonTopHat, new Tuple<Element, Element, Element, Element>(Element.bone, Element.normal, Element.none, Element.normal) },
{NPCID.SkeletonAstonaut, new Tuple<Element, Element, Element, Element>(Element.bone, Element.steel, Element.none, Element.normal) },
{NPCID.SkeletonAlien, new Tuple<Element, Element, Element, Element>(Element.bone, Element.none, Element.none, Element.normal) },
Expand All @@ -451,16 +451,16 @@ public class Enemies
{NPCID.PumpkingBlade, new Tuple<Element, Element, Element, Element>(Element.steel, Element.none, Element.none, Element.steel) },
{NPCID.Hellhound, new Tuple<Element, Element, Element, Element>(Element.normal, Element.dark, Element.none, Element.normal) },
{NPCID.Poltergeist, new Tuple<Element, Element, Element, Element>(Element.ghost, Element.none, Element.levitate, Element.ghost) },
{NPCID.ZombieXmas, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ZombieSweater, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ZombieXmas, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ZombieSweater, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.SlimeRibbonWhite, new Tuple<Element, Element, Element, Element>(Element.water, Element.none, Element.none, Element.water) },
{NPCID.SlimeRibbonYellow, new Tuple<Element, Element, Element, Element>(Element.water, Element.none, Element.none, Element.water) },
{NPCID.SlimeRibbonGreen, new Tuple<Element, Element, Element, Element>(Element.water, Element.none, Element.none, Element.water) },
{NPCID.SlimeRibbonRed, new Tuple<Element, Element, Element, Element>(Element.water, Element.none, Element.none, Element.water) },
{NPCID.BunnyXmas, new Tuple<Element, Element, Element, Element>(Element.normal, Element.none, Element.none, Element.normal) },
{NPCID.ZombieElf, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ZombieElfBeard, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ZombieElfGirl, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ZombieElf, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ZombieElfBeard, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ZombieElfGirl, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },

{NPCID.PresentMimic, new Tuple<Element, Element, Element, Element>(Element.steel, Element.none, Element.none, Element.steel) },
{NPCID.GingerbreadMan, new Tuple<Element, Element, Element, Element>(Element.normal, Element.none, Element.none, Element.normal) },
Expand Down Expand Up @@ -561,13 +561,13 @@ public class Enemies
{NPCID.VortexLarva, new Tuple<Element, Element, Element, Element>(Element.electric, Element.bug, Element.none, Element.electric) },
{NPCID.VortexSoldier, new Tuple<Element, Element, Element, Element>(Element.electric, Element.normal, Element.none, Element.electric) },

{NPCID.ArmedZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ArmedZombieEskimo, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ArmedZombiePincussion, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ArmedZombieSlimed, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ArmedZombieSwamp, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ArmedZombieTwiggy, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ArmedZombieCenx, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.normal) },
{NPCID.ArmedZombie, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ArmedZombieEskimo, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ArmedZombiePincussion, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ArmedZombieSlimed, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ArmedZombieSwamp, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ArmedZombieTwiggy, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.ArmedZombieCenx, new Tuple<Element, Element, Element, Element>(Element.blood, Element.none, Element.none, Element.blood) },
{NPCID.CultistTablet, new Tuple<Element, Element, Element, Element>(Element.dark, Element.fire, Element.none, Element.fire) },
{NPCID.CultistDevote, new Tuple<Element, Element, Element, Element>(Element.dark, Element.none, Element.none, Element.dark) },
{NPCID.CultistBoss, new Tuple<Element, Element, Element, Element>(Element.dark, Element.none, Element.levitate, Element.dark) },
Expand Down
9 changes: 8 additions & 1 deletion HeldItems/HeldItems.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions Items/Weather.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion description.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 4b83cdd

Please sign in to comment.