[Scummvm-git-logs] scummvm master -> 1cb89679dc14d569a1503bff0b5955198942c0e8
dreammaster
noreply at scummvm.org
Mon Feb 6 02:11:47 UTC 2023
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d2384b7db3 MM: MM1: Fix display of 'H-Orc' race in char info
626388a902 MM: MM1: Fix some combat messages, party display
1cb89679dc MM: MM1: Fix incapicated chars are skipped in combat
Commit: d2384b7db3699abbff1a1c38b63e78251c8ca01d
https://github.com/scummvm/scummvm/commit/d2384b7db3699abbff1a1c38b63e78251c8ca01d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-05T16:36:51-08:00
Commit Message:
MM: MM1: Fix display of 'H-Orc' race in char info
Changed paths:
devtools/create_mm/files/mm1/strings_en.yml
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 10cd46e8237..f2e302d1f75 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -491,29 +491,29 @@ enhdialogs:
uncurse: "\x01""37uncurse"
realign: "\x01""37re-align"
stats:
- none: "none"
- inventory: "-----<equipped>----------<backpack>----"
+ none: "None"
+ inventory: "-----<Equipped>----------<Backpack>----"
classes:
- 1: "knight"
- 2: "paladin"
- 3: "archer"
- 4: "cleric"
- 5: "sorcerer"
- 6: "robber"
+ 1: "Knight"
+ 2: "Paladin"
+ 3: "Archer"
+ 4: "Cleric"
+ 5: "Sorcerer"
+ 6: "Robber"
races:
- 1: "human"
- 2: "elf"
- 3: "dwarf"
- 4: "gnome"
- 5: "half-orc"
+ 1: "Human"
+ 2: "Elf"
+ 3: "Dwarf"
+ 4: "Gnome"
+ 5: "H-Orc"
alignments:
- 1: "good"
- 2: "neut"
- 3: "evil"
+ 1: "Good"
+ 2: "Neut"
+ 3: "Evil"
sex:
- 1: "male"
- 2: "female"
- 3: "yes please"
+ 1: "Male"
+ 2: "Female"
+ 3: "Yes Please"
conditions:
good: "good"
eradicated: "eradicated"
@@ -527,29 +527,29 @@ stats:
blinded: "blinded,"
asleep: "asleep,"
attributes:
- int: "int="
- level: "level="
- age: "age="
- exp: "exp="
- mgt: "mgt="
- per: "per="
- sp: "sp="
- gems: "gems="
- end: "end="
- spd: "spd="
- hp: "hp="
- gold: "gold="
- acy: "acy="
- luc: "luc="
+ int: "Int="
+ level: "lEvel="
+ age: "Age="
+ exp: "Exp="
+ mgt: "Mgt="
+ per: "Per="
+ sp: "Xp="
+ gems: "Gems="
+ end: "End="
+ spd: "Spd="
+ hp: "Hp="
+ gold: "Gold="
+ acy: "Acy="
+ luc: "Luc="
ac: "ac="
- food: "food="
- cond: "cond="
+ food: "Food="
+ cond: "Cond="
towns:
- 1: "sorpigal"
- 2: "portsmith"
- 3: "algary"
- 4: "dusk"
- 5: "erliquin"
+ 1: "Sorpigal"
+ 2: "Portsmith"
+ 3: "Algary"
+ 4: "Dusk"
+ 5: "Erliquin"
items:
1: "club"
2: "dagger"
Commit: 626388a9027216596278bd2fe3b547e9444ab5f9
https://github.com/scummvm/scummvm/commit/626388a9027216596278bd2fe3b547e9444ab5f9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-05T17:49:34-08:00
Commit Message:
MM: MM1: Fix some combat messages, party display
Changed paths:
devtools/create_mm/files/mm1/strings_en.yml
engines/mm/mm1/game/combat.cpp
engines/mm/mm1/views/combat.cpp
engines/mm/mm1/views/quick_ref.cpp
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index f2e302d1f75..d6016ba47c5 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -392,6 +392,13 @@ dialogs:
delay_currently: "(currently= %d)"
infiltration: "infiltrates the ranks!"
exchange_places: "exchange places with (1-%c)?"
+ takes: "takes "
+ point: "point"
+ points: "points"
+ of_damage: "of damage!"
+ goes_down: "goes down!!!"
+ and_goes_down: "and goes down!!!"
+ dies: "dies!"
status:
0: "(paralyze)"
1: "(webbed) "
@@ -873,13 +880,6 @@ monster_spells:
casts: "casts "
fails_to_cast: "fails to cast a spell"
not_affected: "is not affected!"
- takes: "takes "
- point: "point"
- points: "points"
- of_damage: "of damage!"
- goes_down: "goes down!!!"
- and_goes_down: "and goes down!!!"
- dies: "dies!"
breathes: "breathes"
a_curse: "a curse"
energy_blast: "energy blast"
diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 8a150b2d4d3..9c7f12eeba3 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -1009,7 +1009,7 @@ void Combat::iterateMonsters2() {
void Combat::iterateMonsters2Inner() {
Encounter &enc = g_globals->_encounters;
- Common::String line1 = Common::String::format("|%s| %s",
+ Common::String line1 = Common::String::format("%s %s",
g_globals->_currCharacter->_name,
STRING["spells.casts_spell"].c_str());
const Common::String monsterName = _monsterP->_name;
@@ -1052,16 +1052,16 @@ void Combat::iterateMonsters2Inner() {
} else {
Common::String line2 = Common::String::format("%s %s %d %s %s",
monsterName.c_str(),
- STRING["monster_spells.takes"].c_str(),
+ STRING["dialogs.combat.takes"].c_str(),
_damage,
- STRING[_damage == 1 ? "monster_spells.point" : "monster_spells.points"].c_str(),
- STRING["monster_spells.of_damage"].c_str()
+ STRING[_damage == 1 ? "dialogs.combat.point" : "dialogs.combat.points"].c_str(),
+ STRING["dialogs.combat.of_damage"].c_str()
);
msg._lines.push_back(Line(0, 1, line2));
if (_damage >= enc._monsterList[getMonsterIndex()]._hp) {
- msg._lines.push_back(Line(0, 2, STRING["monster_spells.and_goes_down"]));
+ msg._lines.push_back(Line(0, 2, STRING["dialogs.combat.and_goes_down"]));
}
}
@@ -1650,7 +1650,7 @@ Common::String Combat::subtractDamageFromChar() {
c._condition |= UNCONSCIOUS;
result = Common::String::format("%s %s", c._name,
- STRING["monster_spellsState.goes_down"].c_str());
+ STRING["dialogs.combat.goes_down"].c_str());
Sound::sound2(SOUND_8);
} else {
@@ -1658,7 +1658,7 @@ Common::String Combat::subtractDamageFromChar() {
c._condition = BAD_CONDITION | DEAD;
result = Common::String::format("%s %s", c._name,
- STRING["monster_spellsState.dies"].c_str());
+ STRING["dialogs.combat.dies"].c_str());
Sound::sound2(SOUND_8);
}
}
diff --git a/engines/mm/mm1/views/combat.cpp b/engines/mm/mm1/views/combat.cpp
index ae0a58f5781..1e4ab7a49ce 100644
--- a/engines/mm/mm1/views/combat.cpp
+++ b/engines/mm/mm1/views/combat.cpp
@@ -568,9 +568,14 @@ void Combat::writeParty() {
clearPartyArea();
for (uint i = 0; i < g_globals->_combatParty.size(); ++i) {
- writeChar(1 + 21 * (i % 2), 16 + (i / 2), '1' + i);
- writeString(") ");
- writeString(g_globals->_combatParty[i]->_name);
+ const Character &c = *g_globals->_combatParty[i];
+ writeString(21 * (i % 2), 16 + (i / 2),
+ Common::String::format("%c%c) %s",
+ (c._condition == 0) ? ' ' : '*',
+ '1' + i,
+ c._name
+ )
+ );
}
}
diff --git a/engines/mm/mm1/views/quick_ref.cpp b/engines/mm/mm1/views/quick_ref.cpp
index 41d9bdaea08..cae2c8d38a1 100644
--- a/engines/mm/mm1/views/quick_ref.cpp
+++ b/engines/mm/mm1/views/quick_ref.cpp
@@ -74,8 +74,8 @@ void QuickRef::draw() {
// Print food and conditions of each character
for (uint idx = 0; idx < g_globals->_party.size(); ++idx) {
- Character &c = g_globals->_party[idx];
- g_globals->_currCharacter = &c;
+ Character &c = inCombat ? *g_globals->_combatParty[idx] :
+ g_globals->_party[idx];
writeNumber(0, 9 + idx, idx + 1);
_textPos.x++;
@@ -135,9 +135,7 @@ bool QuickRef::isInCombat() const {
}
size_t QuickRef::getPartySize() const {
- bool inCombat = isInCombat();
- return inCombat ? g_globals->_combatParty.size() :
- g_globals->_party.size();
+ return g_globals->_party.size();
}
} // namespace Views
Commit: 1cb89679dc14d569a1503bff0b5955198942c0e8
https://github.com/scummvm/scummvm/commit/1cb89679dc14d569a1503bff0b5955198942c0e8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-05T18:11:28-08:00
Commit Message:
MM: MM1: Fix incapicated chars are skipped in combat
Changed paths:
engines/mm/mm1/game/combat.cpp
diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 9c7f12eeba3..e6a1d56a1ac 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -281,7 +281,8 @@ void Combat::combatLoop(bool checkMonstersFirst) {
_currentChar = i;
g_globals->_currCharacter = &c;
- if (!(c._condition & (BLINDED | SILENCED | DISEASED | POISONED))) {
+ if (!(c._condition & (BAD_CONDITION | UNCONSCIOUS |
+ PARALYZED | ASLEEP))) {
// Character is enabled
setMode(SELECT_OPTION);
return;
More information about the Scummvm-git-logs
mailing list