KYRA: (EOB) - add turn undead spell, add some screen fades, fix some bugs

4 files changed, 30 insertions, 2 deletions

diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 9f749f0dfd..276564bc64 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -395,6 +395,7 @@ const ExtractFilename extractFilenames[] = {
 	{ kEobBaseSparkOfY, kTypeRawData, false },
 	{ kEobBaseSpellProperties, kTypeRawData, false },
 	{ kEobBaseMagicFlightProps, kTypeRawData, false },
+	{ kEobBaseTurnUndeadEffect, kTypeRawData, false },
 
 	// EYE OF THE BEHOLDER I
 	{ kEob1MainMenuStrings, kTypeStringList, true },
@@ -406,6 +407,7 @@ const ExtractFilename extractFilenames[] = {
 	{ kEob1MonsterDistAttSfx10, kTypeRawData, false },
 	{ kEob1MonsterDistAttType17, kTypeRawData, false },
 	{ kEob1MonsterDistAttSfx17, kTypeRawData, false },
+	{ kEob1TurnUndeadString, kTypeStringList, true },
 
 	// EYE OF THE BEHOLDER II
 	{ kEob2MainMenuStrings, kTypeStringList, true },
@@ -1602,6 +1604,8 @@ const char *getIdString(const int id) {
 		return "kEobBaseSpellProperties";
 	case kEobBaseMagicFlightProps:
 		return "kEobBaseMagicFlightProps";
+	case kEobBaseTurnUndeadEffect:
+		return "kEobBaseTurnUndeadEffect";
 	case kEob1MainMenuStrings:
 		return "kEob1MainMenuStrings";
 	case kEob1DoorShapeDefs:
@@ -1618,6 +1622,8 @@ const char *getIdString(const int id) {
 		return "kEob1MonsterDistAttType17";
 	case kEob1MonsterDistAttSfx17:
 		return "kEob1MonsterDistAttSfx17";
+	case kEob1TurnUndeadString:
+		return "kEob1TurnUndeadString";
 	case kEob2MainMenuStrings:
 		return "kEob2MainMenuStrings";
 	case kEob2IntroStrings:
diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h
index 598050d80c..a587147974 100644
--- a/devtools/create_kyradat/create_kyradat.h
+++ b/devtools/create_kyradat/create_kyradat.h
@@ -396,6 +396,7 @@ enum kExtractID {
 
 	kEobBaseSpellProperties,
 	kEobBaseMagicFlightProps,
+	kEobBaseTurnUndeadEffect,
 
 	kEob1MainMenuStrings,
 	kEob1DoorShapeDefs,
@@ -407,6 +408,7 @@ enum kExtractID {
 	kEob1MonsterDistAttSfx10,
 	kEob1MonsterDistAttType17,
 	kEob1MonsterDistAttSfx17,
+	kEob1TurnUndeadString,
 
 	kEob2MainMenuStrings,
 	kEob2IntroStrings,
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index 0496acc4b1..4ab12028c2 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -1063,6 +1063,7 @@ const int eob1FloppyNeed[] = {
 	kEob1MonsterDistAttSfx10,
 	kEob1MonsterDistAttType17,
 	kEob1MonsterDistAttSfx17,
+	kEob1TurnUndeadString,
 
 	kEobBasePryDoorStrings,
 	kEobBaseWarningStrings,
@@ -1077,6 +1078,8 @@ const int eob1FloppyNeed[] = {
 	kEobBaseMagicObjectStrings,
 	kEobBaseMagicObject5String,
 	kEobBasePatternSuffix,
+	kEobBasePatternGrFix1,
+	kEobBasePatternGrFix2,
 	kEobBaseValidateArmorString,
 	kEobBaseValidateNoDropString,
 	kEobBasePotionStrings,
@@ -1169,6 +1172,7 @@ const int eob1FloppyNeed[] = {
 
 	kEobBaseSpellProperties,
 	kEobBaseMagicFlightProps,
+	kEobBaseTurnUndeadEffect,
 
 	kLolEobCommonDscDoorShapeIndex,
 	kEobBaseWllFlagPreset,
@@ -1382,6 +1386,7 @@ const int eob2FloppyNeed[] = {
 
 	kEobBaseSpellProperties,
 	kEobBaseMagicFlightProps,
+	kEobBaseTurnUndeadEffect,
 
 	kLolEobCommonDscDoorShapeIndex,
 	kEobBaseWllFlagPreset,
diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index c45b3d4c26..46239c2bee 100644
--- a/devtools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
@@ -2089,8 +2089,7 @@ const ExtractEntrySearchData kEobBaseSlotValidationFlagsProvider[] = {
 };
 
 const ExtractEntrySearchData kEobBaseProjectileWeaponTypesProvider[] = {
-	{ UNK_LANG, kPlatformPC, { 0x0000000D, 0x0000063E, { { 0xA6, 0x75, 0x6C, 0x39, 0x96, 0xCB, 0xA7, 0xC2, 0x31, 0xE0, 0x2A, 0x75, 0x30, 0x96, 0x58, 0x05 } } } }, // EOB 1
-	{ UNK_LANG, kPlatformPC, { 0x0000000C, 0x0000063E, { { 0x3E, 0x99, 0x6D, 0xE4, 0x6B, 0xC8, 0x49, 0x1B, 0x17, 0xD2, 0xBE, 0x9B, 0xE0, 0xCD, 0xA1, 0xC2 } } } }, // EOB 1
+	{ UNK_LANG, kPlatformPC, { 0x00000008, 0x0000061C, { { 0x05, 0x55, 0xA6, 0xD1, 0x3C, 0x12, 0x84, 0xDA, 0xA9, 0x33, 0xCF, 0x07, 0x05, 0x2A, 0xB2, 0x29 } } } }, // EOB 1
 	{ UNK_LANG, kPlatformPC, { 0x0000000F, 0x00000829, { { 0x9F, 0x6A, 0x13, 0x8A, 0xA7, 0x40, 0xE8, 0x40, 0x2E, 0x87, 0x49, 0x6B, 0x67, 0xED, 0xE8, 0xCE } } } }, // EOB 2
 	EXTRACT_END_ENTRY
 };
@@ -2310,6 +2309,12 @@ const ExtractEntrySearchData kEobBaseMagicFlightPropsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData kEobBaseTurnUndeadEffectProvider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x0000008C, 0x00002E8B, { { 0x96, 0x15, 0x61, 0x12, 0x43, 0xCF, 0x3A, 0x84, 0x1A, 0x89, 0xB5, 0x32, 0x0D, 0xB3, 0x20, 0x67 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
 const ExtractEntrySearchData kEob1MainMenuStringsProvider[] = {
 	{ EN_ANY, kPlatformUnknown, { 0x00000037, 0x00000D79, { { 0x1D, 0x72, 0x7F, 0x8F, 0xEB, 0x4A, 0xBF, 0x82, 0xB7, 0xB5, 0x9D, 0xB0, 0x7B, 0xDA, 0xEC, 0xEE } } } },
 	{ DE_DEU, kPlatformUnknown, { 0x00000034, 0x00000C6F, { { 0xF2, 0x5F, 0xBE, 0xFB, 0x27, 0x1C, 0x91, 0x33, 0x25, 0x09, 0xC1, 0xA0, 0x27, 0x89, 0xD7, 0xD5 } } } },
@@ -2356,6 +2361,14 @@ const ExtractEntrySearchData kEob1MonsterDistAttSfx17Provider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData kEob1TurnUndeadStringProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000027, 0x00000BF2, { { 0x43, 0x0A, 0x1E, 0xEE, 0x84, 0xD6, 0xD6, 0x87, 0x20, 0x9F, 0x15, 0x22, 0x9B, 0x65, 0x24, 0xDB } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000030, 0x00000F48, { { 0xDA, 0x59, 0xEC, 0xC1, 0x9B, 0xCF, 0x90, 0x4A, 0x93, 0x3E, 0xE5, 0x26, 0x20, 0x8B, 0x74, 0x92 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+
 const ExtractEntrySearchData kEob2MainMenuStringsProvider[] = {
 	{ EN_ANY, kPlatformUnknown, { 0x0000005F, 0x000017BE, { { 0x77, 0x8A, 0x50, 0x9F, 0x42, 0xD8, 0x00, 0x05, 0x60, 0x2A, 0x80, 0x25, 0x00, 0xDC, 0x7C, 0x92 } } } },
 	{ DE_DEU, kPlatformUnknown, { 0x0000005E, 0x000017F3, { { 0xD0, 0x93, 0x2E, 0x5F, 0x9D, 0xDB, 0xC4, 0xFB, 0x9E, 0x9F, 0x14, 0xD6, 0xB4, 0xBE, 0x3D, 0x0C } } } },
@@ -3698,6 +3711,7 @@ const ExtractEntry extractProviders[] = {
 
 	{ kEobBaseSpellProperties, kEobBaseSpellPropertiesProvider },
 	{ kEobBaseMagicFlightProps, kEobBaseMagicFlightPropsProvider },
+	{ kEobBaseTurnUndeadEffect, kEobBaseTurnUndeadEffectProvider },
 
 	{ kEob1MainMenuStrings, kEob1MainMenuStringsProvider },
 	{ kEob1DoorShapeDefs, kEob1DoorShapeDefsProvider },
@@ -3709,6 +3723,7 @@ const ExtractEntry extractProviders[] = {
 	{ kEob1MonsterDistAttSfx10, kEob1MonsterDistAttSfx10Provider },
 	{ kEob1MonsterDistAttType17, kEob1MonsterDistAttType17Provider },
 	{ kEob1MonsterDistAttSfx17, kEob1MonsterDistAttSfx17Provider },
+	{ kEob1TurnUndeadString, kEob1TurnUndeadStringProvider },
 
 	{ kEob2MainMenuStrings, kEob2MainMenuStringsProvider },
 	{ kEob2IntroStrings, kEob2IntroStringsProvider },