[Scummvm-git-logs] scummvm master -> 803bf8073aa2dd1ad9ecf036b9898b4f6abb5c37

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
803bf8073a XEEN: Add missing armor class modifiers


Commit: 803bf8073aa2dd1ad9ecf036b9898b4f6abb5c37
    https://github.com/scummvm/scummvm/commit/803bf8073aa2dd1ad9ecf036b9898b4f6abb5c37
Author: Peter Helbing (peter at abulafia.org)
Date: 2019-06-09T14:22:59-07:00

Commit Message:
XEEN: Add missing armor class modifiers

Changed paths:
    devtools/create_xeen/constants.cpp
    engines/xeen/resources.cpp
    engines/xeen/resources.h


diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 7210759..5553e5f 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -807,7 +807,10 @@ const int METAL_DAMAGE_PERCENT[22] = {
 	1, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10
 };
 
-const int METAL_LAC[9] = { -3, 0, -2, -1, 1, 2, 4, 6, 8 };
+const int METAL_LAC[22] = {
+	-3, 0, -2, -1, 1, 2, 4, 6, 8, 0, 1,
+	1, 2, 2, 3, 4, 5, 10, 12, 14, 16, 20
+};
 
 const int ARMOR_STRENGTHS[14] = { 0, 2, 4, 5, 6, 7, 8, 10, 4, 2, 1, 1, 1, 1 };
 
@@ -2057,7 +2060,7 @@ void writeConstants(CCArchive &cc) {
 	file.syncNumbers(WEAPON_DAMAGE_MULTIPLIER, 35);
 	file.syncNumbers(METAL_DAMAGE, 22);
 	file.syncNumbers(METAL_DAMAGE_PERCENT, 22);
-	file.syncNumbers(METAL_LAC, 9);
+	file.syncNumbers(METAL_LAC, 22);
 	file.syncNumbers(ARMOR_STRENGTHS, 14);
 	file.syncNumbers(MAKE_ITEM_ARR1, 6);
 	file.syncNumbers3D((const int *)MAKE_ITEM_ARR2, 6, 7, 2);
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index 160c60a..a21812c 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -141,7 +141,7 @@ void Resources::loadData() {
 	file.syncNumbers(WEAPON_DAMAGE_MULTIPLIER, 35);
 	file.syncNumbers(METAL_DAMAGE, 22);
 	file.syncNumbers(METAL_DAMAGE_PERCENT, 22);
-	file.syncNumbers(METAL_LAC, 9);
+	file.syncNumbers(METAL_LAC, 22);
 	file.syncNumbers(ARMOR_STRENGTHS, 14);
 	file.syncNumbers(MAKE_ITEM_ARR1, 6);
 	file.syncNumbers3D((int *)MAKE_ITEM_ARR2, 6, 7, 2);
diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index 55f0ed3..c26c1cb 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -196,7 +196,7 @@ public:
 	int WEAPON_DAMAGE_MULTIPLIER[35];
 	int METAL_DAMAGE[22];
 	int METAL_DAMAGE_PERCENT[22];
-	int METAL_LAC[9];
+	int METAL_LAC[22];
 	int ARMOR_STRENGTHS[14];
 	int MAKE_ITEM_ARR1[6];
 	int MAKE_ITEM_ARR2[6][7][2];