Update items.cpp

ikonomov · Nov 30, 2023 · df1c37b · df1c37b
1 parent 1dabafc
commit df1c37b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Source/items.cpp b/Source/items.cpp
@@ -2701,7 +2701,7 @@ void CalcPlrItemVals(Player &player, bool loadgfx)
 		    || (player.InvBody[INVLOC_HAND_RIGHT]._itype == ItemType::Mace && player.InvBody[INVLOC_HAND_RIGHT]._iLoc == ILOC_TWOHAND)
 		    || (player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Sword && player.InvBody[INVLOC_HAND_LEFT]._iLoc == ILOC_TWOHAND)
 		    || (player.InvBody[INVLOC_HAND_RIGHT]._itype == ItemType::Sword && player.InvBody[INVLOC_HAND_RIGHT]._iLoc == ILOC_TWOHAND)) {
-			player._pDamageMod = player._pLevel * (player._pStrength * 3 / 2 + player._pDexterity) / 200;
+			player._pDamageMod = player._pLevel * (player._pStrength + player._pDexterity) * 3 / 400;
 		} else {
 			player._pDamageMod = player._pLevel * (player._pStrength + player._pDexterity) / 200;
 		}
@@ -2753,6 +2753,14 @@ void CalcPlrItemVals(Player &player, bool loadgfx)
 		}
 	}
 
+	if (player.InvBody[INVLOC_HAND_LEFT]._itype != ItemType::Shield && player.InvBody[INVLOC_HAND_RIGHT]._itype != ItemType::Shield
+	    && (player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Axe || player.InvBody[INVLOC_HAND_RIGHT]._itype == ItemType::Axe
+	        || player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Staff || player.InvBody[INVLOC_HAND_RIGHT]._itype == ItemType::Staff
+	        || player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Mace || player.InvBody[INVLOC_HAND_RIGHT]._itype == ItemType::Mace
+	        || player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Sword || player.InvBody[INVLOC_HAND_RIGHT]._itype == ItemType::Sword)) {
+		player._pIAC += player._pDexterity / 10;
+	}
+
 	player._pISpells = spl;
 
 	EnsureValidReadiedSpell(player);