From aab9e62247af1c22772bb79821675fbab06c047d Mon Sep 17 00:00:00 2001 From: athrxx Date: Wed, 3 Aug 2011 00:40:21 +0200 Subject: KYRA: (EOB) - some more sequence code and bug fixes --- devtools/create_kyradat/create_kyradat.cpp | 15 ++++++++++++- devtools/create_kyradat/create_kyradat.h | 5 +++++ devtools/create_kyradat/games.cpp | 10 +++++++++ devtools/create_kyradat/tables.cpp | 35 ++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) (limited to 'devtools/create_kyradat') diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 68fc8cc5b7..582516bc93 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -346,6 +346,11 @@ const ExtractFilename extractFilenames[] = { { kEobBaseDscItemShapeMap, kTypeRawData, false }, { kEobBaseDscTelptrShpCoords, kTypeRawData, false }, + { kEobBasePortalSeqData, kTypeRawData, false }, + { kEobBaseManDef, kTypeRawData, true }, + { kEobBaseManWord, kTypeStringList, true }, + { kEobBaseManPrompt, kTypeStringList, true }, + { kEobBaseDscMonsterFrmOffsTbl1, kTypeRawData, false }, { kEobBaseDscMonsterFrmOffsTbl2, kTypeRawData, false }, @@ -1556,7 +1561,15 @@ const char *getIdString(const int id) { case kEobBaseFlightObjSclIndex: return "kEobBaseFlightObjSclIndex"; case kEobBaseDscTelptrShpCoords: - return "kEobBaseDscTelptrShpCoords"; + return "kEobBaseDscTelptrShpCoords"; + case kEobBasePortalSeqData: + return "kEobBasePortalSeqData"; + case kEobBaseManDef: + return "kEobBaseManDef"; + case kEobBaseManWord: + return "kEobBaseManWord"; + case kEobBaseManPrompt: + return "kEobBaseManPrompt"; case kEobBaseBookNumbers: return "kEobBaseBookNumbers"; case kEobBaseMageSpellsList: diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h index 54fd91b394..ebaff503f4 100644 --- a/devtools/create_kyradat/create_kyradat.h +++ b/devtools/create_kyradat/create_kyradat.h @@ -361,6 +361,11 @@ enum kExtractID { kEobBaseFlightObjSclIndex, kEobBaseDscTelptrShpCoords, + + kEobBasePortalSeqData, + kEobBaseManDef, + kEobBaseManWord, + kEobBaseManPrompt, kEobBaseBookNumbers, kEobBaseMageSpellsList, diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index 5f710507f4..6e1503b45b 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -1215,6 +1215,11 @@ const int eob1FloppyNeed[] = { kEobBaseDscItemShapeMap, kEobBaseDscTelptrShpCoords, + kEobBasePortalSeqData, + kEobBaseManDef, + kEobBaseManWord, + kEobBaseManPrompt, + kEobBaseDscMonsterFrmOffsTbl1, kEobBaseDscMonsterFrmOffsTbl2, @@ -1423,6 +1428,11 @@ const int eob2FloppyNeed[] = { kEobBaseDscItemShapeMap, kEobBaseDscTelptrShpCoords, + kEobBasePortalSeqData, + kEobBaseManDef, + kEobBaseManWord, + kEobBaseManPrompt, + kEobBaseDscMonsterFrmOffsTbl1, kEobBaseDscMonsterFrmOffsTbl2, diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 663652d4be..e27c6edf44 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -2063,6 +2063,36 @@ const ExtractEntrySearchData kEobBaseDscTelptrShpCoordsProvider[] = { EXTRACT_END_ENTRY }; +const ExtractEntrySearchData kEobBasePortalSeqDataProvider[] = { + { UNK_LANG, kPlatformPC, { 0x0000007E, 0x000002D0, { { 0x18, 0x7E, 0x65, 0x17, 0x4C, 0xD2, 0xB5, 0x2E, 0x81, 0xF8, 0x1C, 0xAC, 0x37, 0x21, 0x62, 0x2A } } } }, + + EXTRACT_END_ENTRY +}; + +const ExtractEntrySearchData kEobBaseManDefProvider[] = { + { EN_ANY, kPlatformPC, { 0x00000078, 0x000002CD, { { 0x33, 0x9B, 0x0C, 0x6A, 0x2E, 0x4F, 0xE9, 0x02, 0x7B, 0xEE, 0xF1, 0x04, 0xA3, 0xBA, 0xD4, 0xF3 } } } }, // Eob 1 + { DE_DEU, kPlatformPC, { 0x00000078, 0x000002C4, { { 0x92, 0x20, 0x58, 0x5F, 0x44, 0x09, 0x0B, 0xF0, 0xDA, 0x09, 0xE2, 0x44, 0x0B, 0xB7, 0x95, 0x96 } } } }, // Eob 1 + { EN_ANY, kPlatformPC, { 0x000000C8, 0x00000834, { { 0x18, 0xEA, 0x33, 0xB7, 0x4B, 0x72, 0x23, 0x8D, 0x0E, 0x9F, 0x4E, 0xF5, 0x09, 0xA3, 0x9C, 0xEA } } } }, // Eob 2 + { DE_DEU, kPlatformPC, { 0x000000C8, 0x00000622, { { 0xFE, 0x1D, 0x94, 0x3A, 0x0B, 0x17, 0x89, 0xEF, 0x60, 0x18, 0xB2, 0x43, 0x7A, 0x02, 0xDB, 0x61 } } } }, // Eob 2 + EXTRACT_END_ENTRY +}; + +const ExtractEntrySearchData kEobBaseManWordProvider[] = { + { EN_ANY, kPlatformPC, { 0x000000E0, 0x00005134, { { 0x68, 0x9C, 0x19, 0x2B, 0x5F, 0x38, 0x36, 0x41, 0xA7, 0x7E, 0xB7, 0x51, 0x41, 0x60, 0x1D, 0x67 } } } }, // Eob 1 + { DE_DEU, kPlatformPC, { 0x000000EA, 0x00005458, { { 0xEC, 0x14, 0x11, 0xE9, 0x19, 0xFD, 0xF8, 0xFC, 0xA8, 0x46, 0x3D, 0xCD, 0x56, 0x08, 0xC3, 0x4A } } } }, // Eob 1 + { EN_ANY, kPlatformPC, { 0x0000017E, 0x00008B64, { { 0x66, 0x38, 0x09, 0x5B, 0x2E, 0x50, 0x54, 0x43, 0x1C, 0xEC, 0x56, 0x3B, 0x72, 0x39, 0xF9, 0xC3 } } } }, // Eob 2 + { DE_DEU, kPlatformPC, { 0x0000015B, 0x00007C37, { { 0x44, 0xA3, 0x32, 0x88, 0x9F, 0x63, 0x28, 0xA0, 0xBD, 0x00, 0xF1, 0x08, 0xCA, 0xE5, 0xFE, 0x5F } } } }, // Eob 2 + EXTRACT_END_ENTRY +}; + +const ExtractEntrySearchData kEobBaseManPromptProvider[] = { + { EN_ANY, kPlatformPC, { 0x00000041, 0x000013AC, { { 0x40, 0x2B, 0xB5, 0x99, 0xEF, 0x8F, 0x3C, 0x9F, 0xB1, 0x5A, 0xBE, 0xE4, 0x80, 0x8E, 0xBB, 0x96 } } } }, // Eob 1 + { DE_DEU, kPlatformPC, { 0x00000048, 0x000015A5, { { 0x0B, 0xB4, 0x9E, 0xAD, 0xB3, 0x56, 0x75, 0xC1, 0xAE, 0x29, 0xF7, 0xB5, 0x82, 0x14, 0xD1, 0x27 } } } }, // Eob 1 + { EN_ANY, kPlatformPC, { 0x00000041, 0x000013AC, { { 0x40, 0x2B, 0xB5, 0x99, 0xEF, 0x8F, 0x3C, 0x9F, 0xB1, 0x5A, 0xBE, 0xE4, 0x80, 0x8E, 0xBB, 0x96 } } } }, // Eob 2 + { DE_DEU, kPlatformPC, { 0x0000005C, 0x00001D08, { { 0x10, 0xCE, 0x2D, 0xED, 0xA9, 0xA0, 0x7C, 0xA1, 0x91, 0x3F, 0xD8, 0x43, 0x03, 0x53, 0x97, 0xCA } } } }, // Eob 2 + EXTRACT_END_ENTRY +}; + const ExtractEntrySearchData kEobBaseDscMonsterFrmOffsTbl1Provider[] = { { UNK_LANG, kPlatformPC, { 0x00000020, 0x00001000, { { 0x98, 0x27, 0x57, 0x25, 0x3B, 0x04, 0x7D, 0x14, 0x3A, 0xD4, 0xA2, 0x5D, 0xBA, 0x04, 0x45, 0xAC } } } }, EXTRACT_END_ENTRY @@ -3758,6 +3788,11 @@ const ExtractEntry extractProviders[] = { { kEobBaseDscItemShapeMap, kEobBaseDscItemShapeMapProvider }, { kEobBaseDscTelptrShpCoords, kEobBaseDscTelptrShpCoordsProvider }, + { kEobBasePortalSeqData, kEobBasePortalSeqDataProvider }, + { kEobBaseManDef, kEobBaseManDefProvider }, + { kEobBaseManWord, kEobBaseManWordProvider }, + { kEobBaseManPrompt, kEobBaseManPromptProvider }, + { kEobBaseDscMonsterFrmOffsTbl1, kEobBaseDscMonsterFrmOffsTbl1Provider }, { kEobBaseDscMonsterFrmOffsTbl2, kEobBaseDscMonsterFrmOffsTbl2Provider }, -- cgit v1.2.3