laziness strikes

TheEternalAce · Jan 30, 2024 · dda641d · dda641d
1 parent 771cc8c
commit dda641d
Show file tree

Hide file tree

Showing 31 changed files with 334 additions and 409 deletions.
diff --git a/Buffs/PlayerBuff/ElectricVeil.cs b/Buffs/PlayerBuff/ElectricVeil.cs
@@ -10,7 +10,7 @@ public class ElectricVeil : ModBuff
         public override void Update(Player player, ref int buffIndex)
         {
             player.thorns += 0.2f;
-            player.moveSpeed -= 0.6f;
+            player.moveSpeed += 0.2f;
             player.aggro -= 500;
         }
     }

diff --git a/Buffs/Summons/AreusMirrorBuff.cs b/Buffs/Summons/AreusMirrorBuff.cs
@@ -15,7 +15,8 @@ public override void SetStaticDefaults()
         public override void Update(Player player, ref int buffIndex)
         {
             // If the minions exist reset the buff time, otherwise remove the buff from the player
-            if (player.ownedProjectileCounts[ModContent.ProjectileType<BrokenAreusMirror>()] > 0 || player.ownedProjectileCounts[ModContent.ProjectileType<AreusMirrorShard>()] > 0)
+            if (player.ownedProjectileCounts[ModContent.ProjectileType<AreusMirrorBroken>()] > 0 ||
+                player.ownedProjectileCounts[ModContent.ProjectileType<AreusMirrorShard>()] > 0)
             {
                 player.buffTime[buffIndex] = 18000;
             }

diff --git a/Buffs/Summons/AreusMirrorBuff.png b/Buffs/Summons/AreusMirrorBuff.png
diff --git a/CrossMod/ElementsMod/SetProjectileElements.cs b/CrossMod/ElementsMod/SetProjectileElements.cs
diff --git a/CrossMod/TerraTypes/Ammo.csv b/CrossMod/TerraTypes/Ammo.csv
@@ -1,7 +1,8 @@
 internalName,type,type
 AreusArrow,Electric,
 AreusBullet,Electric,
+AreusGrenade,Electric,
 BB,Steel,
+PlagueCell,Poison,
 SpectralArrow,Ghost,
-SpectralBullet,Ghost,
-AreusGrenade,Electric,
+SpectralBullet,Ghost,
diff --git a/CrossMod/TerraTypes/Items.csv b/CrossMod/TerraTypes/Items.csv
@@ -2,7 +2,7 @@ internalName,type,type,tooltipOverride
 AmberCore,Rock,Bug,"{""Tooltips"": [{""Type"":""Rock,Bug"",""Tooltip"": ""Amber flies are {0}""}]}"
 AmberCore_Greater,Rock,Bug,"{""Tooltips"": [{""Type"":""Rock,Bug"",""Tooltip"": ""Amber flies are {0}""}]}"
 AmberCore_Super,Rock,Bug,"{""Tooltips"": [{""Type"":""Rock,Bug"",""Tooltip"": ""Amber flies are {0}""}]}"
-SapphireCore_Greater,Rock,,"{""Tooltips"": [{""Type"":""Rock"",""Tooltip"": ""Sapphire spikes are {0}""}]}"
-SapphireCore_Super,Rock,,"{""Tooltips"": [{""Type"":""Rock"",""Tooltip"": ""Sapphire spikes are {0}""}]}"
-MegaGemCore,Rock,,,"{""DontOverride"":true,""Tooltips"":[{""Type"":""Rock"",""Tooltip"": ""Sapphire spikes are {0}""},{""Type"":""Rock,Bug"",""Tooltip"": ""Amber flies are {0}""}]}"
+SapphireCore_Greater,Rock,,"{""Tooltips"": [{""Type"":""Rock"",""Tooltip"": ""Sapphire spikes are {0}""},{""Type"":""Rock"",""Tooltip"": ""Sapphire Spirit projectile is {0}""}]}"
+SapphireCore_Super,Rock,,"{""Tooltips"": [{""Type"":""Rock"",""Tooltip"": ""Sapphire spikes are {0}""},{""Type"":""Rock"",""Tooltip"": ""Sapphire Spirit projectile is {0}""}]}"
+MegaGemCore,Rock,,,"{""DontOverride"":true,""Tooltips"":[{""Type"":""Rock"",""Tooltip"": ""Sapphire spikes are {0}""},{""Type"":""Rock"",""Tooltip"": ""Gem Soul projectile is {0}""},{""Type"":""Rock,Bug"",""Tooltip"": ""Amber flies are {0}""}]}"
 AmethystDagger,Rock,,
diff --git a/CrossMod/TerraTypes/Projectiles.csv b/CrossMod/TerraTypes/Projectiles.csv
@@ -24,11 +24,11 @@ SilverBoltHostile,Steel,
 ElectricTrail,Electric,
 FeatherBlade,Electric,
 HardlightKnifeHostile,Electric,
+HardlightBladeHitbox,Electric,
 LightningBolt,Electric,
 StormCloud,Electric,
 StormLance,Electric,
 StormSword,Electric,
-HardlightBladeHitbox,Electric,
 
 CactusNeedle,Grass,
 FlamePillar,Fire,
@@ -48,7 +48,6 @@ ElectricTrailFriendly,Electric,
 ElementExplosion,,
 GolemBeam,Fire,
 PhantasmalEye,Dragon,Dark
-RubyExplosive,Rock,
 RubyShard,Rock,
 SpinPrime,Steel,
 SpinSkull,Bone,
@@ -74,22 +73,24 @@ AreusGambleDagger,Electric,
 AreusGambleGoodExplosion,Electric,
 AreusShardProj,Electric,
 AreusShockwave,Electric,
+AreusWandBlade,Electric,
 BitBlock,Electric,
 BloodDropFriendly,Blood,
 BloodWaveFriendly,Blood,
 ByteBlock,,
 DeathNote,Ghost,
 ElecBlade,Electric,
 ElecCannon,Electric,
+ElecCoin,Electric,
 ElecCrossbow,Electric,
 ElecDagger,Electric,
 ElecKnuckle,Electric,
 ElecPistol,Electric,
-ElectricOrb,Electric,
-ElectricSpike,Electric,
-ElecCoin,Electric,
 ElecScorpionFang,Electric,
 ElecScorpionTail,Electric,Poison
+ElectricHook,Electric,
+ElectricOrb,Electric,
+ElectricSpike,Electric,
 GunswordProj,Steel,
 HardlightFeatherMagic,Electric,
 IceBolt,Ice,
@@ -212,13 +213,15 @@ HeroBullet,Fire,
 KusarigamaKing,Water,
 LaserArrow,Electric,
 MetalBladeProj,Steel,
+PlagueBeam,Poison,
 PrometheusFire,Fire,
 ScarletSpark,Electric,
 SilverBoltFriendly,Steel,
 
 AmberFly,Rock,Bug
 AmberSpit,Rock,Bug
 AreusChainWhip,Electric,
+AreusStabber,Electric,
 BlackStar,Dark,Electric
 BloodSickleFriendly,Blood,
 DragonBone,Dark,Poison

diff --git a/CrossMod/TerraTypes/Weapons.csv b/CrossMod/TerraTypes/Weapons.csv
@@ -83,11 +83,13 @@ MetalBlade,Steel,,
 P90,Grass,,
 Pantheon,Steel,,
 PhantomRose,Dark,Grass,
+PlagueRailgun,Poison,,
 Scarlet,Dark,Grass,
 TheBall,Blood,,
 
 AreusChain,Electric,Steel,"{""Tooltips"": [{""Type"":""Electric"",""Tooltip"": ""Whip: {0}""},{""Type"":""Steel"",""Tooltip"": ""Gold Chain: {0}""}]}"
 AreusCrate,Electric,,
+AreusStabberStaff,Electric,,
 AreusStriker,Electric,,
 BloodTome,Blood,,
 BrokenAreusMirror,Electric,,