Skip to content

Commit

Permalink
KYRA: (LOL) - fix #10764 (Cannot Use Vaelan's Cube)
Browse files Browse the repository at this point in the history
  • Loading branch information
@athrxx
athrxx committed Dec 26, 2018
1 parent 1474ca4 commit 4b2dc67
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 10 deletions.
2 changes: 1 addition & 1 deletion devtools/create_kyradat/create_kyradat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@


enum {
kKyraDatVersion = 90
kKyraDatVersion = 92
};

const ExtractFilename extractFilenames[] = {
Expand Down
11 changes: 9 additions & 2 deletions devtools/create_kyradat/resources/lol_dos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ static const byte kLoLIngamePcSpkSfxIndexDOS[250] = {

static const ByteProvider kLoLIngamePcSpkSfxIndexDOSProvider = { ARRAYSIZE(kLoLIngamePcSpkSfxIndexDOS), kLoLIngamePcSpkSfxIndexDOS };

static const SpellProperty kLoLSpellPropertiesDOS[10] = {
static const SpellProperty kLoLSpellPropertiesDOS[17] = {
{ 16436, { 5, 10, 15, 25 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0100 },
{ 16437, { 5, 10, 25, 60 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0001 },
{ 16438, { 8, 15, 30, 80 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0102 },
Expand All @@ -460,7 +460,14 @@ static const SpellProperty kLoLSpellPropertiesDOS[10] = {
{ 16439, { 25, 30, 50, 100 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0106 },
{ 16443, { 3, 6, 12, 24 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0107 },
{ 16975, { 15, 15, 15, 15 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 }
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 }
};

static const SpellPropertyProvider kLoLSpellPropertiesDOSProvider = { ARRAYSIZE(kLoLSpellPropertiesDOS), kLoLSpellPropertiesDOS };
Expand Down
11 changes: 9 additions & 2 deletions devtools/create_kyradat/resources/lol_dos_cd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ static const byte kLoLIngamePcSpkSfxIndexDOSCD[250] = {

static const ByteProvider kLoLIngamePcSpkSfxIndexDOSCDProvider = { ARRAYSIZE(kLoLIngamePcSpkSfxIndexDOSCD), kLoLIngamePcSpkSfxIndexDOSCD };

static const SpellProperty kLoLSpellPropertiesDOSCD[10] = {
static const SpellProperty kLoLSpellPropertiesDOSCD[17] = {
{ 16436, { 5, 10, 15, 25 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0100 },
{ 16437, { 5, 10, 25, 60 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0001 },
{ 16438, { 8, 15, 30, 80 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0102 },
Expand All @@ -508,7 +508,14 @@ static const SpellProperty kLoLSpellPropertiesDOSCD[10] = {
{ 16439, { 25, 30, 50, 100 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0106 },
{ 16443, { 3, 6, 12, 24 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0107 },
{ 16975, { 15, 15, 15, 15 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 }
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 }
};

static const SpellPropertyProvider kLoLSpellPropertiesDOSCDProvider = { ARRAYSIZE(kLoLSpellPropertiesDOSCD), kLoLSpellPropertiesDOSCD };
Expand Down
11 changes: 9 additions & 2 deletions devtools/create_kyradat/resources/lol_fmtowns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ static const uint16 kLoLIngameSfxIndexFMTowns[500] = {

static const Uint16Provider kLoLIngameSfxIndexFMTownsProvider = { ARRAYSIZE(kLoLIngameSfxIndexFMTowns), kLoLIngameSfxIndexFMTowns };

static const SpellProperty kLoLSpellPropertiesFMTowns[10] = {
static const SpellProperty kLoLSpellPropertiesFMTowns[17] = {
{ 16436, { 5, 10, 15, 25 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0100 },
{ 16437, { 5, 10, 25, 60 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0001 },
{ 16438, { 8, 15, 30, 80 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0102 },
Expand All @@ -314,7 +314,14 @@ static const SpellProperty kLoLSpellPropertiesFMTowns[10] = {
{ 16439, { 25, 30, 50, 100 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0106 },
{ 16443, { 3, 6, 12, 24 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0107 },
{ 16975, { 15, 15, 15, 15 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 }
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 }
};

static const SpellPropertyProvider kLoLSpellPropertiesFMTownsProvider = { ARRAYSIZE(kLoLSpellPropertiesFMTowns), kLoLSpellPropertiesFMTowns };
Expand Down
11 changes: 9 additions & 2 deletions devtools/create_kyradat/resources/lol_pc98.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static const uint16 kLoLIngameSfxIndexPC98[500] = {

static const Uint16Provider kLoLIngameSfxIndexPC98Provider = { ARRAYSIZE(kLoLIngameSfxIndexPC98), kLoLIngameSfxIndexPC98 };

static const SpellProperty kLoLSpellPropertiesPC98[10] = {
static const SpellProperty kLoLSpellPropertiesPC98[17] = {
{ 16436, { 5, 10, 15, 25 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0100 },
{ 16437, { 5, 10, 25, 60 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0001 },
{ 16438, { 8, 15, 30, 80 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0102 },
Expand All @@ -313,7 +313,14 @@ static const SpellProperty kLoLSpellPropertiesPC98[10] = {
{ 16439, { 25, 30, 50, 100 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0106 },
{ 16443, { 3, 6, 12, 24 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0107 },
{ 16975, { 15, 15, 15, 15 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 }
{ 16975, { 15, 15, 15, 15 }, 15, 0, { 0, 0, 0, 0 }, 0, 0, 0x0108 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 },
{ 0, { 0, 0, 0, 0 }, 0, 0, { 0, 0, 0, 0 }, 0, 0, 0 }
};

static const SpellPropertyProvider kLoLSpellPropertiesPC98Provider = { ARRAYSIZE(kLoLSpellPropertiesPC98), kLoLSpellPropertiesPC98 };
Expand Down
Binary file modified dists/engine-data/kyra.dat
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion engines/kyra/staticres.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

namespace Kyra {

#define RESFILE_VERSION 91
#define RESFILE_VERSION 92

namespace {
bool checkKyraDat(Common::SeekableReadStream *file) {
Expand Down

0 comments on commit 4b2dc67

Please sign in to comment.