From fc5b29fdbcf4170436a32da2c1f4b078b1f1f90f Mon Sep 17 00:00:00 2001 From: athrxx Date: Sun, 7 Aug 2011 03:31:15 +0200 Subject: KYRA: (EOB) - implemented some spells and fixed more bugs --- devtools/create_kyradat/create_kyradat.cpp | 12 ++++++------ devtools/create_kyradat/create_kyradat.h | 4 ++-- devtools/create_kyradat/games.cpp | 4 ++-- devtools/create_kyradat/tables.cpp | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'devtools') diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index a646bee5b1..d5fc803f8f 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -411,8 +411,8 @@ const ExtractFilename extractFilenames[] = { { kEob1DoorSwitchShapeDefs, kTypeRawData, false }, { kEob1DoorSwitchCoords, kTypeRawData, false }, { kEob1MonsterProperties, kTypeRawData, false }, - { kEob1MonsterDistAttType10, kTypeRawData, false }, - { kEob1MonsterDistAttSfx10, kTypeRawData, false }, + { kEob1EnemyMageSpellList, kTypeRawData, false }, + { kEob1EnemyMageSfx, kTypeRawData, false }, { kEob1MonsterDistAttType17, kTypeRawData, false }, { kEob1MonsterDistAttSfx17, kTypeRawData, false }, { kEob1TurnUndeadString, kTypeStringList, true }, @@ -1652,10 +1652,10 @@ const char *getIdString(const int id) { return "kEob1DoorSwitchCoords"; case kEob1MonsterProperties: return "kEob1MonsterProperties"; - case kEob1MonsterDistAttType10: - return "kEob1MonsterDistAttType10"; - case kEob1MonsterDistAttSfx10: - return "kEob1MonsterDistAttSfx10"; + case kEob1EnemyMageSpellList: + return "kEob1EnemyMageSpellList"; + case kEob1EnemyMageSfx: + return "kEob1EnemyMageSfx"; case kEob1MonsterDistAttType17: return "kEob1MonsterDistAttType17"; case kEob1MonsterDistAttSfx17: diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h index a7b53b4128..75511b6a67 100644 --- a/devtools/create_kyradat/create_kyradat.h +++ b/devtools/create_kyradat/create_kyradat.h @@ -412,8 +412,8 @@ enum kExtractID { kEob1DoorSwitchCoords, kEob1MonsterProperties, - kEob1MonsterDistAttType10, - kEob1MonsterDistAttSfx10, + kEob1EnemyMageSpellList, + kEob1EnemyMageSfx, kEob1MonsterDistAttType17, kEob1MonsterDistAttSfx17, kEob1TurnUndeadString, diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index 000c350f2b..bfbab79ee8 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -1059,8 +1059,8 @@ const int eob1FloppyNeed[] = { kEob1DoorSwitchShapeDefs, kEob1DoorSwitchCoords, kEob1MonsterProperties, - kEob1MonsterDistAttType10, - kEob1MonsterDistAttSfx10, + kEob1EnemyMageSpellList, + kEob1EnemyMageSfx, kEob1MonsterDistAttType17, kEob1MonsterDistAttSfx17, kEob1TurnUndeadString, diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index a92c09798b..a30d248d28 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -2388,12 +2388,12 @@ const ExtractEntrySearchData kEob1MonsterPropertiesProvider[] = { EXTRACT_END_ENTRY }; -const ExtractEntrySearchData kEob1MonsterDistAttType10Provider[] = { +const ExtractEntrySearchData kEob1EnemyMageSpellListProvider[] = { { UNK_LANG, kPlatformPC, { 0x0000000A, 0x0000000F, { { 0x01, 0x1B, 0x9C, 0x51, 0xC9, 0xA2, 0x10, 0xBB, 0xA7, 0x82, 0xD4, 0x91, 0x7E, 0x84, 0x54, 0x93 } } } }, EXTRACT_END_ENTRY }; -const ExtractEntrySearchData kEob1MonsterDistAttSfx10Provider[] = { +const ExtractEntrySearchData kEob1EnemyMageSfxProvider[] = { { UNK_LANG, kPlatformPC, { 0x0000000A, 0x0000029B, { { 0xA2, 0x9F, 0x2E, 0xDE, 0x15, 0x23, 0x78, 0xDD, 0x26, 0x98, 0x6E, 0xA3, 0x77, 0xEA, 0xB5, 0x80 } } } }, EXTRACT_END_ENTRY }; @@ -3870,8 +3870,8 @@ const ExtractEntry extractProviders[] = { { kEob1DoorSwitchCoords, kEob1DoorSwitchCoordsProvider }, { kEob1MonsterProperties, kEob1MonsterPropertiesProvider }, - { kEob1MonsterDistAttType10, kEob1MonsterDistAttType10Provider }, - { kEob1MonsterDistAttSfx10, kEob1MonsterDistAttSfx10Provider }, + { kEob1EnemyMageSpellList, kEob1EnemyMageSpellListProvider }, + { kEob1EnemyMageSfx, kEob1EnemyMageSfxProvider }, { kEob1MonsterDistAttType17, kEob1MonsterDistAttType17Provider }, { kEob1MonsterDistAttSfx17, kEob1MonsterDistAttSfx17Provider }, { kEob1TurnUndeadString, kEob1TurnUndeadStringProvider }, -- cgit v1.2.3