Fix tModPorter meleeCrit typo

tModLoader · Aug 9, 2023 · 5a6b9c1 · 5a6b9c1
1 parent cb42d82
commit 5a6b9c1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/ExampleMod/Content/Buffs/Blocky.cs b/ExampleMod/Content/Buffs/Blocky.cs
@@ -31,12 +31,12 @@ public class Blocky : ModBuff
 				player.extraFall += 45;
 
 				// Some other effects:
-				//player.lifeRegen++;
-				//player.meleeCrit += 2;
-				//player.meleeDamage += 0.051f;
-				//player.meleeSpeed += 0.051f;
-				//player.statDefense += 3;
-				//player.moveSpeed += 0.05f;
+				// player.lifeRegen++;
+				// player.GetCritChance(DamageClass.Melee) += 2;
+				// player.GetDamage(DamageClass.Melee) += 0.051f;
+				// player.GetAttackSpeed(DamageClass.Melee) += 0.051f;
+				// player.statDefense += 3;
+				// player.moveSpeed += 0.05f;
 			}
 			else {
 				player.DelBuff(buffIndex);

diff --git a/tModPorter/tModPorter.Tests/TestData/DamageClassPlayerFields.Expected.cs b/tModPorter/tModPorter.Tests/TestData/DamageClassPlayerFields.Expected.cs
@@ -25,7 +25,8 @@ public class DamageClassPlayerFields : ModPlayer {
 		Player.GetDamage(DamageClass.Summon) *= 0.08f;
 		Player.GetDamage(DamageClass.Throwing) *= 0.08f;
 
-		Player.GetCritChance(DamageClass.Generic) *= 5;
+		Player.GetCritChance(DamageClass.Generic) += 1;
+		Player.GetCritChance(DamageClass.Melee) *= 5;
 		Player.GetCritChance(DamageClass.Ranged) *= 5;
 		Player.GetCritChance(DamageClass.Magic) *= 5;
 		Player.GetCritChance(DamageClass.Throwing) *= 5;

diff --git a/tModPorter/tModPorter.Tests/TestData/DamageClassPlayerFields.cs b/tModPorter/tModPorter.Tests/TestData/DamageClassPlayerFields.cs
@@ -25,6 +25,7 @@ public class DamageClassPlayerFields : ModPlayer {
 		player.minionDamageMult *= 0.08f;
 		player.thrownDamageMult *= 0.08f;
 
+		player.allCrit += 1;
 		player.meleeCrit *= 5;
 		player.rangedCrit *= 5;
 		player.magicCrit *= 5;

diff --git a/tModPorter/tModPorter/Config.Terraria.cs b/tModPorter/tModPorter/Config.Terraria.cs
@@ -108,7 +108,8 @@ public static partial class Config
 		RefactorInstanceMember("Terraria.Player",		"magicDamageMult",	DamageModifier("Magic",		"GetDamage"));
 		RefactorInstanceMember("Terraria.Player",		"minionDamageMult",	DamageModifier("Summon",	"GetDamage"));
 		RefactorInstanceMember("Terraria.Player",		"thrownDamageMult",	DamageModifier("Throwing",	"GetDamage"));
-		RefactorInstanceMember("Terraria.Player",		"meleeCrit",		DamageModifier("Generic",	"GetCritChance"));
+		RefactorInstanceMember("Terraria.Player",		"allCrit",			DamageModifier("Generic",	"GetCritChance"));
+		RefactorInstanceMember("Terraria.Player",		"meleeCrit",		DamageModifier("Melee",		"GetCritChance"));
 		RefactorInstanceMember("Terraria.Player",		"rangedCrit",		DamageModifier("Ranged",	"GetCritChance"));
 		RefactorInstanceMember("Terraria.Player",		"magicCrit",		DamageModifier("Magic",		"GetCritChance"));
 		RefactorInstanceMember("Terraria.Player",		"thrownCrit",		DamageModifier("Throwing",	"GetCritChance"));