Skip to content

Commit

Permalink
KYRA: (EOB) - more work on ingame menus
Browse files Browse the repository at this point in the history
  • Loading branch information
@athrxx
athrxx authored and Johannes Schickel committed Dec 26, 2011
1 parent 045d089 commit 97e5036
Show file tree
Hide file tree
Showing 31 changed files with 668 additions and 252 deletions.
6 changes: 6 additions & 0 deletions devtools/create_kyradat/create_kyradat.cpp
View file
Expand Up @@ -266,6 +266,8 @@ const ExtractFilename extractFilenames[] = {
{ kEobBaseMenuStringsMgc, kTypeStringList, true },
{ kEobBaseMenuStringsPrefs, kTypeStringList, true },
{ kEobBaseMenuStringsRest2, kTypeStringList, true },
{ kEobBaseMenuStringsRest3, kTypeStringList, true },
{ kEobBaseMenuStringsRest4, kTypeStringList, true },
{ kEobBaseMenuStringsDefeat, kTypeStringList, true },
{ kEobBaseMenuStringsTransfer, kTypeStringList, true },
{ kEobBaseMenuStringsSpec, kTypeStringList, true },
Expand Down Expand Up @@ -1342,6 +1344,10 @@ const char *getIdString(const int id) {
return "kEobBaseMenuStringsPrefs";
case kEobBaseMenuStringsRest2:
return "kEobBaseMenuStringsRest2";
case kEobBaseMenuStringsRest3:
return "kEobBaseMenuStringsRest3";
case kEobBaseMenuStringsRest4:
return "kEobBaseMenuStringsRest4";
case kEobBaseMenuStringsDefeat:
return "kEobBaseMenuStringsDefeat";
case kEobBaseMenuStringsTransfer:
Expand Down
2 changes: 2 additions & 0 deletions devtools/create_kyradat/create_kyradat.h
View file
Expand Up @@ -241,6 +241,8 @@ enum kExtractID {
kEobBaseMenuStringsMgc,
kEobBaseMenuStringsPrefs,
kEobBaseMenuStringsRest2,
kEobBaseMenuStringsRest3,
kEobBaseMenuStringsRest4,
kEobBaseMenuStringsDefeat,
kEobBaseMenuStringsTransfer,
kEobBaseMenuStringsSpec,
Expand Down
3 changes: 3 additions & 0 deletions devtools/create_kyradat/games.cpp
View file
Expand Up @@ -1092,6 +1092,7 @@ const int eob1FloppyNeed[] = {
kEobBaseMenuStringsMgc,
kEobBaseMenuStringsPrefs,
kEobBaseMenuStringsRest2,
kEobBaseMenuStringsRest4,
kEobBaseMenuStringsDefeat,

kEobBaseCharGuiStringsHp,
Expand Down Expand Up @@ -1268,6 +1269,8 @@ const int eob2FloppyNeed[] = {
kEobBaseMenuStringsMgc,
kEobBaseMenuStringsPrefs,
kEobBaseMenuStringsRest2,
kEobBaseMenuStringsRest3,
kEobBaseMenuStringsRest4,
kEobBaseMenuStringsDefeat,
kEobBaseMenuStringsTransfer,
kEobBaseMenuStringsSpec,
Expand Down
24 changes: 20 additions & 4 deletions devtools/create_kyradat/tables.cpp
View file
Expand Up @@ -1629,10 +1629,24 @@ const ExtractEntrySearchData kEobBaseMenuStringsPrefsProvider[] = {
};

const ExtractEntrySearchData kEobBaseMenuStringsRest2Provider[] = {
{ EN_ANY, kPlatformUnknown, { 0x00000076, 0x00002530, { { 0xAD, 0x7A, 0x80, 0x8B, 0x97, 0x65, 0x67, 0xB2, 0x67, 0xE3, 0xF8, 0xDA, 0x0B, 0x9A, 0x61, 0x26 } } } }, // EOB1
{ DE_DEU, kPlatformUnknown, { 0x00000082, 0x000029A1, { { 0x02, 0x83, 0xBC, 0x56, 0xB4, 0xFE, 0xF0, 0x03, 0x3D, 0xFD, 0x2C, 0x3B, 0x14, 0x8F, 0x44, 0x1B } } } }, // EOB
{ EN_ANY, kPlatformUnknown, { 0x000000A5, 0x000033C9, { { 0xC4, 0x69, 0x00, 0x7B, 0x93, 0x98, 0x0E, 0xD1, 0x94, 0xF8, 0x39, 0x19, 0xBA, 0x53, 0x37, 0x35 } } } }, // EOB2
{ DE_DEU, kPlatformUnknown, { 0x000000A4, 0x000033C1, { { 0x3B, 0x3A, 0x01, 0x8F, 0x3F, 0x9E, 0xC2, 0xC7, 0x70, 0xF8, 0x9C, 0x84, 0x6D, 0xFE, 0xC2, 0x40 } } } }, // EOB2
{ EN_ANY, kPlatformUnknown, { 0x0000004D, 0x00001744, { { 0x63, 0xA5, 0x6F, 0x09, 0x6F, 0x5E, 0x4B, 0x89, 0xFF, 0x33, 0x63, 0xCB, 0xAA, 0x04, 0x59, 0x63 } } } }, // EOB1
{ DE_DEU, kPlatformUnknown, { 0x0000004D, 0x00001769, { { 0x2C, 0xA9, 0x7D, 0x4C, 0xC5, 0x13, 0xE2, 0xEB, 0x89, 0x6C, 0xAE, 0x25, 0xC3, 0x3E, 0x56, 0x7E } } } }, // EOB1
{ EN_ANY, kPlatformUnknown, { 0x00000052, 0x000017F6, { { 0x7C, 0x49, 0xFC, 0x89, 0x90, 0x5D, 0xFF, 0x86, 0x86, 0xE9, 0xB2, 0x29, 0x60, 0xB2, 0x22, 0x7F } } } }, // EOB2
{ DE_DEU, kPlatformUnknown, { 0x0000004C, 0x000014FF, { { 0x0C, 0x94, 0x6D, 0x5A, 0x42, 0x68, 0xE0, 0xDC, 0xCD, 0xB9, 0x1A, 0x4A, 0xC1, 0xCC, 0xE6, 0x91 } } } }, // EOB2
EXTRACT_END_ENTRY
};

const ExtractEntrySearchData kEobBaseMenuStringsRest3Provider[] = {
{ EN_ANY, kPlatformUnknown, { 0x0000002B, 0x00000DF4, { { 0x42, 0x90, 0x49, 0xA7, 0x2E, 0x61, 0x77, 0x7F, 0x9F, 0x53, 0xAD, 0x3C, 0x87, 0xE2, 0x0E, 0x36 } } } }, // EOB2
{ DE_DEU, kPlatformUnknown, { 0x00000027, 0x00000D45, { { 0x8D, 0xAB, 0xBF, 0x57, 0xF3, 0x2C, 0x3F, 0x93, 0xBF, 0x33, 0x58, 0x2D, 0x97, 0x78, 0x71, 0x7F } } } }, // EOB2
EXTRACT_END_ENTRY
};

const ExtractEntrySearchData kEobBaseMenuStringsRest4Provider[] = {
{ EN_ANY, kPlatformUnknown, { 0x00000029, 0x00000DEC, { { 0x1C, 0x86, 0x3D, 0x40, 0x2C, 0x5E, 0xCA, 0xA0, 0xA1, 0xB8, 0x23, 0x42, 0x9C, 0x6B, 0xFA, 0xBB } } } }, // EOB1
{ DE_DEU, kPlatformUnknown, { 0x00000034, 0x00001238, { { 0xE9, 0x95, 0x27, 0x79, 0x1C, 0x0D, 0xF5, 0x94, 0x92, 0xFC, 0xCA, 0x22, 0x17, 0xA8, 0x36, 0x96 } } } }, // EOB1
{ EN_ANY, kPlatformUnknown, { 0x0000002A, 0x00000DEB, { { 0x0E, 0xD3, 0xC5, 0xA9, 0x8B, 0x06, 0x57, 0xB0, 0x20, 0x1A, 0xEE, 0x42, 0x49, 0x2E, 0xA1, 0x50 } } } }, // EOB2
{ DE_DEU, kPlatformUnknown, { 0x00000033, 0x00001189, { { 0x56, 0x1B, 0x6B, 0x00, 0x47, 0xFD, 0x56, 0xD3, 0x12, 0x03, 0x79, 0x7D, 0xFF, 0x83, 0xCF, 0xAA } } } }, // EOB2
EXTRACT_END_ENTRY
};

Expand Down Expand Up @@ -3378,6 +3392,8 @@ const ExtractEntry extractProviders[] = {
{ kEobBaseMenuStringsMgc, kEobBaseMenuStringsMgcProvider },
{ kEobBaseMenuStringsPrefs, kEobBaseMenuStringsPrefsProvider },
{ kEobBaseMenuStringsRest2, kEobBaseMenuStringsRest2Provider },
{ kEobBaseMenuStringsRest3, kEobBaseMenuStringsRest3Provider },
{ kEobBaseMenuStringsRest4, kEobBaseMenuStringsRest4Provider },
{ kEobBaseMenuStringsDefeat, kEobBaseMenuStringsDefeatProvider },
{ kEobBaseMenuStringsTransfer, kEobBaseMenuStringsTransferProvider },
{ kEobBaseMenuStringsSpec, kEobBaseMenuStringsSpecProvider },
Expand Down
102 changes: 31 additions & 71 deletions engines/kyra/chargen.cpp
View file
Expand Up @@ -42,7 +42,6 @@ class CharacterGenerator {
void checkForCompleteParty();
void toggleSpecialButton(int index, int bodyCustom, int pageNum);
void processSpecialButton(int index);
void highlightBoxFrame(int index);
int viewDeleteCharacter();
void createPartyMember();
int raceSexMenu();
Expand All @@ -67,11 +66,8 @@ class CharacterGenerator {
uint8 **_chargenButtonLabels;
int _activeBox;
int _magicShapesBox;
int _updateBoxIndex;
int _updateBoxColorIndex;
int _updateBoxShapesIndex;
int _lastUpdateBoxShapesIndex;
uint32 _chargenBoxTimer;
uint32 _chargenMagicShapeTimer;
int8 _chargenSelectedPortraits[4];
int8 _chargenSelectedPortraits2[4];
Expand All @@ -95,7 +91,6 @@ class CharacterGenerator {
static const EobChargenButtonDef _chargenButtonDefs[];
static const CreatePartyModButton _chargenModButtons[];
static const EobRect8 _chargenButtonBodyCoords[];
static const EobRect16 _chargenPortraitBoxFrames[];
static const int16 _chargenBoxX[];
static const int16 _chargenBoxY[];
static const int16 _chargenNameFieldX[];
Expand All @@ -118,9 +113,8 @@ bool EobCoreEngine::startCharacterGeneration() {
}

CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) : _vm(vm), _screen(screen),
_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _updateBoxIndex(-1),
_chargenBoxTimer(0), _chargenMagicShapeTimer(0), _updateBoxColorIndex(0), _updateBoxShapesIndex(0),
_lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _chargenMagicShapeTimer(0),
_updateBoxShapesIndex(0), _lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {

_chargenStatStrings = _vm->_chargenStatStrings;
_chargenRaceSexStrings = _vm->_chargenRaceSexStrings;
Expand Down Expand Up @@ -178,7 +172,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
_activeBox = 0;

for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
highlightBoxFrame(_activeBox + 6);
_vm->_gui->highLightBoxFrame(_activeBox + 6);
_vm->sound()->process();
int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
_vm->removeInputTop();
Expand All @@ -193,7 +187,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
_vm->sound()->haltTrack();
return false;
}
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);
}

if (inputFlag & 0x8000) {
Expand All @@ -207,7 +201,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
}

if (inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5]) {
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);
if (_characters[_activeBox].name[0]) {
int b = _activeBox;
if (viewDeleteCharacter())
Expand Down Expand Up @@ -381,50 +375,16 @@ void CharacterGenerator::processSpecialButton(int index) {
toggleSpecialButton(index, 0, 0);
}

void CharacterGenerator::highlightBoxFrame(int index) {
static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
};

if (_updateBoxIndex == index) {
if (_updateBoxIndex == -1)
return;

if (_vm->_system->getMillis() <= _chargenBoxTimer)
return;

if (!colorTable[_updateBoxColorIndex])
_updateBoxColorIndex = 0;

const EobRect16 *r = &_chargenPortraitBoxFrames[_updateBoxIndex];
_screen->drawBox(r->x1, r->y1, r->x2, r->y2, colorTable[_updateBoxColorIndex++]);
_screen->updateScreen();

_chargenBoxTimer = _vm->_system->getMillis() + _vm->_tickLength;

} else {
if (_updateBoxIndex != -1) {
const EobRect16 *r = &_chargenPortraitBoxFrames[_updateBoxIndex];
_screen->drawBox(r->x1, r->y1, r->x2, r->y2, 12);
_screen->updateScreen();
}

_updateBoxColorIndex = 0;
_updateBoxIndex = index;
_chargenBoxTimer = _vm->_system->getMillis();
}
}

int CharacterGenerator::viewDeleteCharacter() {
initButtonsFromList(0, 7);
_vm->removeInputTop();

highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);
printStats(_activeBox, 2);

int res = 0;
for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
highlightBoxFrame(_activeBox + 6);
_vm->_gui->highLightBoxFrame(_activeBox + 6);
_vm->sound()->process();

int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
Expand Down Expand Up @@ -463,14 +423,14 @@ int CharacterGenerator::viewDeleteCharacter() {
}

if (loop == false)
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);

if (!_characters[cbx].name[0])
loop = false;

if (cbx != _activeBox) {
_activeBox = cbx;
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);
if (loop)
printStats(_activeBox, 2);
}
Expand All @@ -480,8 +440,8 @@ int CharacterGenerator::viewDeleteCharacter() {
}

void CharacterGenerator::createPartyMember() {
_screen->setScreenDim(2);
_chargenBoxTimer = 0;
_screen->setScreenDim(2);
assert(_vm->_gui);

for (int i = 0; i != 3 && !_vm->shouldQuit(); i++) {
bool bck = false;
Expand Down Expand Up @@ -528,11 +488,11 @@ int CharacterGenerator::raceSexMenu() {
_screen->printShadedText(_chargenStrings2[8], 147, 67, 9, 0);
_vm->removeInputTop();

_vm->_gui->setupMenu(1, 0, _chargenRaceSexStrings, -1, 0, 0);
_vm->_gui->simpleMenu_setup(1, 0, _chargenRaceSexStrings, -1, 0, 0);
int16 res = -1;

while (res == -1 && !_vm->shouldQuit()) {
res = _vm->_gui->handleMenu(1, _chargenRaceSexStrings, 0, -1, 0);
res = _vm->_gui->simpleMenu_process(1, _chargenRaceSexStrings, 0, -1, 0);
updateMagicShapes();
}

Expand All @@ -557,7 +517,7 @@ int CharacterGenerator::classMenu(int raceSex) {
toggleSpecialButton(5, 0, 0);

itemsMask &=_classMenuMasks[raceSex / 2];
_vm->_gui->setupMenu(2, 15, _chargenClassStrings, itemsMask, 0, 0);
_vm->_gui->simpleMenu_setup(2, 15, _chargenClassStrings, itemsMask, 0, 0);

_vm->_mouseX = _vm->_mouseY = 0;
int16 res = -1;
Expand All @@ -576,7 +536,7 @@ int CharacterGenerator::classMenu(int raceSex) {
else
_vm->removeInputTop();
} else {
res = _vm->_gui->handleMenu(2, _chargenClassStrings, 0, itemsMask, 0);
res = _vm->_gui->simpleMenu_process(2, _chargenClassStrings, 0, itemsMask, 0);
}
}

Expand Down Expand Up @@ -606,7 +566,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
toggleSpecialButton(5, 0, 0);

itemsMask &=_alignmentMenuMasks[cClass];
_vm->_gui->setupMenu(3, 9, _chargenAlignmentStrings, itemsMask, 0, 0);
_vm->_gui->simpleMenu_setup(3, 9, _chargenAlignmentStrings, itemsMask, 0, 0);

_vm->_mouseX = _vm->_mouseY = 0;
int16 res = -1;
Expand All @@ -625,7 +585,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
else
_vm->removeInputTop();
} else {
res = _vm->_gui->handleMenu(3, _chargenAlignmentStrings, 0, itemsMask, 0);
res = _vm->_gui->simpleMenu_process(3, _chargenAlignmentStrings, 0, itemsMask, 0);
}
}

Expand Down Expand Up @@ -793,8 +753,8 @@ void CharacterGenerator::statsAndFacesMenu() {
}
}

highlightBoxFrame(6 + _activeBox);
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(6 + _activeBox);
_vm->_gui->highLightBoxFrame(-1);
}

void CharacterGenerator::faceSelectMenu() {
Expand All @@ -809,7 +769,7 @@ void CharacterGenerator::faceSelectMenu() {
printStats(_activeBox, 4);
toggleSpecialButton(12, 0, 0);
toggleSpecialButton(13, 0, 0);
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);

shp = getNextFreeFaceShape(shp, charSex, 1, _chargenSelectedPortraits);

Expand All @@ -833,7 +793,7 @@ void CharacterGenerator::faceSelectMenu() {
in = _vm->checkInput(_vm->_activeButtons, false, 0);
_vm->removeInputTop();

highlightBoxFrame(box + 10);
_vm->_gui->highLightBoxFrame(box + 10);

if (in == 0x8002 || in == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
processSpecialButton(13);
Expand All @@ -853,7 +813,7 @@ void CharacterGenerator::faceSelectMenu() {
}
}

highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);

if (in == 1)
shp = getNextFreeFaceShape(shp - 1, charSex, -1, _chargenSelectedPortraits);
Expand All @@ -864,7 +824,7 @@ void CharacterGenerator::faceSelectMenu() {
}

if (!_vm->shouldQuit()) {
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);
updateMagicShapes();

_chargenSelectedPortraits[_activeBox] = sp[res];
Expand Down Expand Up @@ -899,7 +859,7 @@ int CharacterGenerator::getNextFreeFaceShape(int shpIndex, int charSex, int step
}

void CharacterGenerator::processFaceMenuSelection(int index) {
highlightBoxFrame(-1);
_vm->_gui->highLightBoxFrame(-1);
if (index <= 48)
_screen->drawShape(0, _characters[_activeBox].faceShape, _chargenBoxX[_activeBox], _chargenBoxY[_activeBox] + 1, 0);
else
Expand Down Expand Up @@ -1127,15 +1087,15 @@ int CharacterGenerator::getMaxHp(int cclass, int constitution, int level1, int l
int res = 0;
constitution = _vm->getClassAndConstHitpointsModifier(cclass, constitution);

int m = _vm->getClassHpIncreaseType(cclass, 0);
int m = _vm->getCharacterClassType(cclass, 0);
if (m != -1)
res = _vm->getModifiedHpLimits(m, constitution, level1, false);

m = _vm->getClassHpIncreaseType(cclass, 1);
m = _vm->getCharacterClassType(cclass, 1);
if (m != -1)
res += _vm->getModifiedHpLimits(m, constitution, level2, false);

m = _vm->getClassHpIncreaseType(cclass, 2);
m = _vm->getCharacterClassType(cclass, 2);
if (m != -1)
res += _vm->getModifiedHpLimits(m, constitution, level3, false);

Expand All @@ -1148,15 +1108,15 @@ int CharacterGenerator::getMinHp(int cclass, int constitution, int level1, int l
int res = 0;
constitution = _vm->getClassAndConstHitpointsModifier(cclass, constitution);

int m = _vm->getClassHpIncreaseType(cclass, 0);
int m = _vm->getCharacterClassType(cclass, 0);
if (m != -1)
res = _vm->getModifiedHpLimits(m, constitution, level1, true);

m = _vm->getClassHpIncreaseType(cclass, 1);
m = _vm->getCharacterClassType(cclass, 1);
if (m != -1)
res += _vm->getModifiedHpLimits(m, constitution, level2, true);

m = _vm->getClassHpIncreaseType(cclass, 2);
m = _vm->getCharacterClassType(cclass, 2);
if (m != -1)
res += _vm->getModifiedHpLimits(m, constitution, level3, true);

Expand Down Expand Up @@ -1443,7 +1403,7 @@ const EobRect8 CharacterGenerator::_chargenButtonBodyCoords[] = {
{ 0x14, 0x90, 0x0B, 0x10 }
};

const EobRect16 CharacterGenerator::_chargenPortraitBoxFrames[] = {
const EobRect16 GUI_Eob::_highLightBoxFrames[] = {
{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
{ 0x00FF, 0x0001, 0x013F, 0x0034 },
{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
Expand Down

0 comments on commit 97e5036

Please sign in to comment.