From c0246551c282f7fc4db96471ce0aed04d7f24b4f Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 24 Dec 2022 22:33:17 -0800 Subject: [PATCH] Updated version, making this public release (no big bugs yay). --- Items/Weapons/Explosives/FireCracker.cs | 4 +-- Items/Weapons/Explosives/Sparkler.cs | 2 +- Localization/en-US.hjson | 24 +++++------------- Projectiles/Bombs/Explosion.cs | 1 + .../Bombs/{Explosion.png => ExplosionPng.png} | Bin Projectiles/Bombs/SmallExplosion.cs | 5 ++-- Projectiles/Bombs/SmallExplosion.png | Bin 148 -> 0 bytes build.txt | 2 +- 8 files changed, 13 insertions(+), 25 deletions(-) rename Projectiles/Bombs/{Explosion.png => ExplosionPng.png} (100%) delete mode 100644 Projectiles/Bombs/SmallExplosion.png diff --git a/Items/Weapons/Explosives/FireCracker.cs b/Items/Weapons/Explosives/FireCracker.cs index 3b8e49f..421219b 100644 --- a/Items/Weapons/Explosives/FireCracker.cs +++ b/Items/Weapons/Explosives/FireCracker.cs @@ -10,7 +10,7 @@ namespace yourtale.Items.Weapons.Explosives { public class FireCracker : ModItem { - public override void SetStaticDefaults() + public override void SetStaticDefaults() // The sprite I used for this weapon was an unused terraria sprite for firecrackers. { DisplayName.SetDefault("Firecrackers"); Tooltip.SetDefault("A small explosive, to get you started in your boom business.\nThrows a string of 5 explosive firecrackers that explode after a short delay.\nFirecrackers do not destroy blocks."); @@ -18,7 +18,7 @@ public override void SetStaticDefaults() public override void SetDefaults() { - Item.damage = 50; + Item.damage = 18; Item.crit = 20; Item.noMelee= true; Item.DamageType = ModContent.GetInstance(); diff --git a/Items/Weapons/Explosives/Sparkler.cs b/Items/Weapons/Explosives/Sparkler.cs index 0906fbe..613dd92 100644 --- a/Items/Weapons/Explosives/Sparkler.cs +++ b/Items/Weapons/Explosives/Sparkler.cs @@ -13,7 +13,7 @@ public class Sparkler : ModItem public override void SetStaticDefaults() { DisplayName.SetDefault("Sparkler"); - Tooltip.SetDefault("A small basic sparkler, that will deal a steady stream of damage.\nWill light enemies on fire."); + Tooltip.SetDefault("A small basic sparkler, that will deal a steady stream of damage.\nWill light enemies on fire, but doesn't explode."); } public override void SetDefaults() diff --git a/Localization/en-US.hjson b/Localization/en-US.hjson index a065082..bb78f88 100644 --- a/Localization/en-US.hjson +++ b/Localization/en-US.hjson @@ -137,9 +137,9 @@ Mods: { Content: I feel pretty fine right now. NoHome: I'm homeless right now. And no, i'm not sharing a room with you. LoveSpace: It's very... empty. Very pleasing. - FarFromHome: I'm far from home right now. No biggie. + FarFromHome: I'm far from home right now. No biggie, guess I'll walk. DislikeCrowded: Too many people. Too many weak points, not enough security. - HateCrowded: The constant nagging and bickering is getting to me. + HateCrowded: The constant nagging and bickering of all these people is getting to me. LikeBiome: "I do like {BiomeName}. It is so mystifying and odd, it's very unique." LoveBiome: "The {BiomeName} is my favorite. It is so cold and beautiful, it takes me back to before the organization." DislikeBiome: "It is too bland in {BiomeName}, however." @@ -163,28 +163,16 @@ Mods: { StandardDialogue1 : "Sometimes I feel the organization calling me back." StandardDialogue2 : "Why are you talking to me." StandardDialogue3 : "hm." - CommonDialogue : "This message has a weight of 5, meaning it appears 5 times more often." + CommonDialogue : "check the github sometime." RareDialogue : "Go ask the nurse for a happy ending." TalkALot : "Why are you talking to me so much? Go do something productive, like anything else." } - ExampleBoneMerchant: { - StandardDialogue1 : "It's relaxing down here in the underground." - StandardDialogue2 : "What am I doing down here you may ask? I'm not sure, but leave me be!" - StandardDialogue3 : "Huh? What wares do I have? I have no idea! How about you ask?" - } - ExampleTravelingMerchant: { - PartyGirlDialogue : "Can you please tell {0} to stop decorating my cousin's house with colors?" - StandardDialogue1 : "Sometimes my cousin feels like they're different from everyone else here." - StandardDialogue2 : "What's your favorite color? My cousin's favorite colors are white and black." - StandardDialogue3 : "I'm a traveling merchant, and I sell things." - HiveBackpackDialogue : "Hey, if you find a [i:HiveBackpack], my cousin can upgrade it for you." - } } GameTips: { - ExampleTip0: "Woah! Example Tip!" - ExampleTip1: "This tip was added by Example Mod!" - ExampleTip2: "This is yet another tip added by Example Mod!" + ExampleTip0: "Just don't die!" + ExampleTip1: "Just blame whatever kills you on lag." + ExampleTip2: "deez?" DisabledExampleTip: "This tip will be added but then disabled by Example Mod." } } diff --git a/Projectiles/Bombs/Explosion.cs b/Projectiles/Bombs/Explosion.cs index 50458af..970d7c7 100644 --- a/Projectiles/Bombs/Explosion.cs +++ b/Projectiles/Bombs/Explosion.cs @@ -16,6 +16,7 @@ public override void SetStaticDefaults() ProjectileID.Sets.TrailCacheLength[Projectile.type] = 5; ProjectileID.Sets.TrailingMode[Projectile.type] = 0; } + public override string Texture => "yourtale/Projectiles/Bombs/ExplosionPng"; // Using only 1 texture for most basic explosions, because they don't need any texture. public override void SetDefaults() { diff --git a/Projectiles/Bombs/Explosion.png b/Projectiles/Bombs/ExplosionPng.png similarity index 100% rename from Projectiles/Bombs/Explosion.png rename to Projectiles/Bombs/ExplosionPng.png diff --git a/Projectiles/Bombs/SmallExplosion.cs b/Projectiles/Bombs/SmallExplosion.cs index 77b4e02..8b14e23 100644 --- a/Projectiles/Bombs/SmallExplosion.cs +++ b/Projectiles/Bombs/SmallExplosion.cs @@ -16,6 +16,7 @@ public override void SetStaticDefaults() ProjectileID.Sets.TrailCacheLength[Projectile.type] = 5; ProjectileID.Sets.TrailingMode[Projectile.type] = 0; } + public override string Texture => "yourtale/Projectiles/Bombs/ExplosionPng"; public override void SetDefaults() { @@ -23,7 +24,7 @@ public override void SetDefaults() Projectile.height = 50; Projectile.aiStyle = 0; Projectile.friendly = true; - Projectile.damage = 50; + Projectile.damage = 19; Projectile.DamageType = ModContent.GetInstance(); Projectile.penetrate = -1; Projectile.timeLeft = 2; @@ -32,8 +33,6 @@ public override void SetDefaults() Projectile.ignoreWater = true; Projectile.extraUpdates = 1; AIType = ProjectileID.Bullet; - //Projectile.usesIDStaticNPCImmunity = true; - //Projectile.idStaticNPCHitCooldown = 10; } public override void Kill(int timeLeft) diff --git a/Projectiles/Bombs/SmallExplosion.png b/Projectiles/Bombs/SmallExplosion.png deleted file mode 100644 index 6ea4de390303173be2d92b5b3fb1ba302aa351bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9 z0|Vb-5N14{zaj-F$X?><>&pIsolC${>|wRoS)h=jr;B5V#p&cf|Nq-Fn=%SBPd&Jz maWPw;lttEq6^+hE9T+mXnN^!s2qgd&GkCiCxvX