[Scummvm-git-logs] scummvm master -> 0027ab82908f75d10d4af3959618e34800dfd017
dreammaster
noreply at scummvm.org
Sat Feb 25 06:47:17 UTC 2023
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9a4cfda211 MM: MM1: Map 0 string fixes
0027ab8290 MM: MM1: Merge duplicated passage outside messages
Commit: 9a4cfda2113644e9480ee7834147e59d2ea52615
https://github.com/scummvm/scummvm/commit/9a4cfda2113644e9480ee7834147e59d2ea52615
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-24T22:47:11-08:00
Commit Message:
MM: MM1: Map 0 string fixes
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 320acefb2f0..fa8a99a33a8 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1093,13 +1093,15 @@ maps:
inn_inside: "The innekeeper asks: \"Would you like to sign in (Y/N)?\""
market_inside: "Behind the counter, an overweight dwarf\nexclaims: \"You look like a hungry bunch!\nWould you like to buy some food (Y/N)?\""
temple_inside: "Several orantely robed clerics approach\nthe party and ask, \"Do you seek our help (Y/N)?\""
- training_inside: "Before you are various groups engaged intraining exercises. Worg,the guildmaster\nasks, \"Do you require training (Y/N)?\""
+ training_inside: "Before you are various groups engaged in\ntraining exercises. Worg,the guildmaster\nasks, \"Do you require training (Y/N)?\""
leprechaun: "A tenacious leprechaun appears saying,\n\"Traveling the roads is quite dangerous\nsave for the strong and courageous,\nonly 1 gem you lose and i'll send you\nto the town you choose.\"\n\n'ESC' to go back Which town (1-5)?"
statue: "There is a statue here. Search it (Y/N)?"
trapdoor: "Trap door!"
levitate: ", levitation saves you!"
passage_outside: "A passage leads outside, take it (Y/N)?"
+ emap00:
+ training_inside: "Before you are various groups engaged in training exercises. Worg, the guildmaster asks, \"Do you require training (Y/N)?\""
map01:
blacksmith: "\"B. Smith's workshop\""
Commit: 0027ab82908f75d10d4af3959618e34800dfd017
https://github.com/scummvm/scummvm/commit/0027ab82908f75d10d4af3959618e34800dfd017
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-24T22:47:11-08:00
Commit Message:
MM: MM1: Merge duplicated passage outside messages
Changed paths:
devtools/create_mm/files/mm1/strings_en.yml
engines/mm/mm1/maps/map00.cpp
engines/mm/mm1/maps/map01.cpp
engines/mm/mm1/maps/map02.cpp
engines/mm/mm1/maps/map03.cpp
engines/mm/mm1/maps/map04.cpp
engines/mm/mm1/maps/map06.cpp
engines/mm/mm1/maps/map10.cpp
engines/mm/mm1/maps/map34.cpp
engines/mm/mm1/maps/map44.cpp
engines/mm/mm1/maps/map49.cpp
engines/mm/mm1/maps/map50.cpp
diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index fa8a99a33a8..b5248e99075 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1059,6 +1059,8 @@ maps:
stairs_down: "Stairs going down! Take them (Y/N)?"
wall_painted: "The wall is painted from ceiling to\nfloor in a black and white checkered\npattern!"
tavern_inside: "Step up to the bar (Y/N)?"
+ passage_outside1: "A passage leads outside, take it (Y/N)?"
+ passage_outside2: "Passage outside, exit (Y/N)?"
desert:
its_hot: "It's hot... "
@@ -1099,7 +1101,6 @@ maps:
statue: "There is a statue here. Search it (Y/N)?"
trapdoor: "Trap door!"
levitate: ", levitation saves you!"
- passage_outside: "A passage leads outside, take it (Y/N)?"
emap00:
training_inside: "Before you are various groups engaged in training exercises. Worg, the guildmaster asks, \"Do you require training (Y/N)?\""
@@ -1118,7 +1119,6 @@ maps:
training_inside: "A tall, muscular female clad in leather\narmor approaches asking, \"Strangers,\nare you here for training (Y/N)?\""
males_drained: "Males are drained!"
- passage_outside: "Passage outside, exit (Y/N)?"
secret: "A sensuous female voice speaks from\nwithin an intoxicating mist,\n\"You've discovered my secret!\""
zam0: "Note: zam 12,2"
zam1: "\"I am zam, astral brother of zom and\nonly living male residing in portsmith\n"
@@ -1141,7 +1141,6 @@ maps:
training_inside: "several adventurers armored in dragon\nscales, address the party,\n\"Looking for training (Y/N)?\""
morango: "Morango the mystic asks,\n\"Who shall i measure (1-6)?\""
- passage_outside: "Passage outside, exit (Y/N)?"
resistances1: "% resistance for "
resistances2: "Magic Fire Cold Elec\nAcid Fear Poison Sleep"
pit: "Swaze pit! jump in (Y/N)?"
@@ -1167,8 +1166,6 @@ maps:
temple_inside: "Bright lights swirl throughout the room.a horrifying voice shrieks,\n\"Need help (Y/N)?\""
training_inside: "Several empty suits of armor approach\nasking, \"Need training (Y/N)?\""
- passage_outside: "A passage leads outside, take it (Y/N)?"
-
telgoran1: "An elf dressed in robes approaches...\n\n"
telgoran2: "\"Friends, I am telgoran. This scroll you\nhave brought me will be very helpful\n(+2500 exp) Here's 1500 gold for your\nservices. I'll tell you a secret, if\ntreasure is what you want...\""
telgoran3: "\"The brothers you must find...\nPortsmith and Algary are combined.\""
@@ -1192,7 +1189,6 @@ maps:
agar2: "\"You have done well to bring me this\nscroll. (+1000 exp) Now take it to my\nprotege Telgoran in Dusk.\""
agar3: "\"I have no business with you. begone!\""
guards: "Town guards: you're under arrest!\n\na)Attack b)Bribe c)Run d)Surrender"
- passage_outside: "Passage outside, exit (Y/N)?"
sentence: "High court sentence: years= "
treasure: "Town treasure, steal (Y/N)?"
@@ -1209,7 +1205,6 @@ maps:
backpacks_full: "*** Backpacks full ***"
map06:
- passage_outside: "Passage outside, exit (Y/N)?"
portal: "Shimmering blue and white portal,\nenter (Y/N)?"
acid: "Splash! A pool of acid!"
button: "Button on the wall, press it (Y/N)?"
@@ -1254,7 +1249,6 @@ maps:
map10:
levitation: "Levitation saved you."
- passage_outside: "A passage leads outside, take it (Y/N)?"
pit: "Jagged slime pit!"
poof: "Poof! you've been teleported..."
ranalou1: "\"I'm the wizard ranalou. are you here to\nuse the portals (Y/N)?\""
@@ -1298,11 +1292,11 @@ maps:
levitation1: "Luckily, your levitation spell saved you!"
map14:
- words: "Carved on a block of ice are the words:\nStart at 15-7 and walk to doom!"
- passage: "A secret passage to doom, take it (Y/N)?"
+ words: "Carved on a block of ice are the words:\nStart at 15-7 and walk to Doom!"
+ passage: "A secret passage to Ddoom, take it (Y/N)?"
pool: "The pool of health grants those who are\nworthy +4 endurance!"
- surrounded: "You've been surrounded by the dark riderand his men! He challenges you to a duel...accept (Y/N)?"
- castle: "The fabeled castle doom!\nWill you enter (Y/N)?"
+ surrounded: "You've been surrounded by the Dark Riderand his men! He challenges you to a duel...accept (Y/N)?"
+ castle: "The fabeled Castle Doom!\nWill you enter (Y/N)?"
map15:
lava: "Lava fills the valley of fire!"
@@ -1330,7 +1324,7 @@ maps:
wave: "A tidal wave sweeps the party away!"
map18:
- passage: "Cavernous passage to erliquin,\ntake it (Y/N)?"
+ passage: "Cavernous passage to Erliquin,\ntake it (Y/N)?"
cave: "A cave, enter (Y/N)?"
castle_north: "Castle blackridge north, enter (Y/N)?"
castle_south: "Castle blackridge south, enter (Y/N)?"
@@ -1544,7 +1538,6 @@ maps:
message5: "Etched in silver:\nMessage interleave 'fedbac'"
message6: "Etched in gold:\nMessage interleave '8,5,3,9,1,4,6,2,7'"
message7: "Written on the wall:\nJump three times to reach center."
- passage: "A passage leads outside, take it (Y/N)?"
door: "A golden door repels you!"
alamar1: "Suspended in a forcefield is the body\nof a man enclosed in an iron suit.\nTelepathic communication:\"I am the true\nKing Alamar, imprisoned by a demonic\nalien being! Confront him with this eye\nof goros and you shall see his true\nself."
alamar2: "The fate of the realm is at stake.\""
@@ -1672,7 +1665,6 @@ maps:
7: "Defeat the stronghold in ravens wood"
map44:
- exit: "A passage leads outside, take it (Y/N)?"
message_f: "Etched in silver, message F reads:\ntstst,e1,d-ds15a1drh"
clover: "The green clover grants those who\nare worthy +4 luck!"
fountain: "The Fabulous Fabled Fountain of\nDragadune converts all gold into\nexperience, accept (Y/N)?"
@@ -1714,7 +1706,6 @@ maps:
map49:
chute: "A chute..."
catapult: "A catapult ejects you from the tower!"
- passage: "A passage leads outside, take it (Y/N)?"
message_e: "Etched in silver, message e reads:\noei/:1-33-1ek5;d-et,"
alamar1: "The omnipotent king alamar speaks,\n\n"
alamar2: "\"Varnlings, i quest thee to find the\nCrypt of Carmenca. away with you...\""
@@ -1735,7 +1726,6 @@ maps:
sign4: "Ruby room"
sign5: "Twinkle room"
sign6: "Rainbow room"
- passage: "A passage leads outside, take it (Y/N)?"
grate: "The crystal grate repels you!"
map51:
diff --git a/engines/mm/mm1/maps/map00.cpp b/engines/mm/mm1/maps/map00.cpp
index 4609716f8a3..d2e7b21ec5e 100644
--- a/engines/mm/mm1/maps/map00.cpp
+++ b/engines/mm/mm1/maps/map00.cpp
@@ -94,7 +94,7 @@ void Map00::special03() {
void Map00::special04() {
visitedExit();
send(SoundMessage(
- STRING["maps.map00.passage_outside"],
+ STRING["maps.passage_outside1"],
[]() {
g_maps->_mapPos = Common::Point(10, 10);
g_maps->changeMap(0xa11, 2);
diff --git a/engines/mm/mm1/maps/map01.cpp b/engines/mm/mm1/maps/map01.cpp
index 1ca9aaf0e1a..1fd6e09eaff 100644
--- a/engines/mm/mm1/maps/map01.cpp
+++ b/engines/mm/mm1/maps/map01.cpp
@@ -88,7 +88,7 @@ void Map01::special03() {
void Map01::special04() {
visitedExit();
send(SoundMessage(
- STRING["maps.map01.passage_outside"],
+ STRING["maps.passage_outside2"],
[]() {
g_maps->_mapPos = Common::Point(3, 3);
g_maps->changeMap(0x101, 2);
diff --git a/engines/mm/mm1/maps/map02.cpp b/engines/mm/mm1/maps/map02.cpp
index 9b8428a4b31..9ba95b384a0 100644
--- a/engines/mm/mm1/maps/map02.cpp
+++ b/engines/mm/mm1/maps/map02.cpp
@@ -94,7 +94,7 @@ void Map02::special03() {
void Map02::special04() {
visitedExit();
send(SoundMessage(
- STRING["maps.map02.passage_outside"],
+ STRING["maps.passage_outside2"],
[]() {
g_maps->_mapPos = Common::Point(7, 7);
g_maps->changeMap(0x801, 2);
diff --git a/engines/mm/mm1/maps/map03.cpp b/engines/mm/mm1/maps/map03.cpp
index 98418911056..557e234aa7d 100644
--- a/engines/mm/mm1/maps/map03.cpp
+++ b/engines/mm/mm1/maps/map03.cpp
@@ -124,7 +124,7 @@ void Map03::special03() {
void Map03::special04() {
visitedExit();
send(SoundMessage(
- STRING["maps.map01.passage_outside"],
+ STRING["maps.passage_outside1"],
[]() {
g_maps->_mapPos = Common::Point(9, 11);
g_maps->changeMap(0x112, 2);
diff --git a/engines/mm/mm1/maps/map04.cpp b/engines/mm/mm1/maps/map04.cpp
index 08770adc042..604ca2b7951 100644
--- a/engines/mm/mm1/maps/map04.cpp
+++ b/engines/mm/mm1/maps/map04.cpp
@@ -110,7 +110,7 @@ void Map04::special04() {
visitedExit();
if (_data[MAP04_PASSAGE_OVERRIDE] || _data[MAP04_TREASURE_STOLEN] == 0) {
send(SoundMessage(
- STRING["maps.map04.passage_outside"],
+ STRING["maps.passage_outside2"],
[]() {
g_maps->_mapPos.x = 13;
g_maps->_mapPos.y = 1;
diff --git a/engines/mm/mm1/maps/map06.cpp b/engines/mm/mm1/maps/map06.cpp
index 6affcd21a06..5fdcec8e7ee 100644
--- a/engines/mm/mm1/maps/map06.cpp
+++ b/engines/mm/mm1/maps/map06.cpp
@@ -93,7 +93,7 @@ void Map06::special() {
void Map06::special00() {
visitedExit();
send(SoundMessage(
- STRING["maps.map06.passage_outside"],
+ STRING["maps.passage_outside2"],
[]() {
g_maps->_mapPos = Common::Point(15, 11);
g_maps->changeMap(0xa11, 2);
diff --git a/engines/mm/mm1/maps/map10.cpp b/engines/mm/mm1/maps/map10.cpp
index 8fc77ca81d1..2f4f1bf018f 100644
--- a/engines/mm/mm1/maps/map10.cpp
+++ b/engines/mm/mm1/maps/map10.cpp
@@ -66,7 +66,7 @@ void Map10::special() {
void Map10::special00() {
visitedExit();
send(SoundMessage(
- STRING["maps.map10.passage_outside"],
+ STRING["maps.passage_outside1"],
[]() {
g_maps->_mapPos = Common::Point(0, 7);
g_maps->changeMap(0x101, 2);
diff --git a/engines/mm/mm1/maps/map34.cpp b/engines/mm/mm1/maps/map34.cpp
index d3a52e68b8c..e5c6daf4bfb 100644
--- a/engines/mm/mm1/maps/map34.cpp
+++ b/engines/mm/mm1/maps/map34.cpp
@@ -59,7 +59,7 @@ void Map34::special01() {
visitedExit();
send(SoundMessage(
- STRING["maps.map34.passage"],
+ STRING["maps.passage_outside1"],
[]() {
g_maps->_mapPos = Common::Point(7, 15);
g_maps->changeMap(0xf01, 2);
diff --git a/engines/mm/mm1/maps/map44.cpp b/engines/mm/mm1/maps/map44.cpp
index 4cc4472eda1..d63a7da6eab 100644
--- a/engines/mm/mm1/maps/map44.cpp
+++ b/engines/mm/mm1/maps/map44.cpp
@@ -57,7 +57,7 @@ void Map44::special01() {
visitedExit();
send(SoundMessage(
- STRING["maps.map44.exit"],
+ STRING["maps.passage_outside1"],
[]() {
g_maps->_mapPos = Common::Point(12, 12);
g_maps->changeMap(0x112, 2);
diff --git a/engines/mm/mm1/maps/map49.cpp b/engines/mm/mm1/maps/map49.cpp
index c68eb430cca..7b114e971f3 100644
--- a/engines/mm/mm1/maps/map49.cpp
+++ b/engines/mm/mm1/maps/map49.cpp
@@ -60,7 +60,7 @@ void Map49::special01() {
visitedExit();
send(SoundMessage(
- STRING["maps.map49.passage"],
+ STRING["maps.passage_outside1"],
[]() {
g_maps->_mapPos = Common::Point(14, 7);
g_maps->changeMap(0xb1a, 2);
diff --git a/engines/mm/mm1/maps/map50.cpp b/engines/mm/mm1/maps/map50.cpp
index 5fd9091b876..afa5336aede 100644
--- a/engines/mm/mm1/maps/map50.cpp
+++ b/engines/mm/mm1/maps/map50.cpp
@@ -57,7 +57,7 @@ void Map50::special01() {
visitedExit();
send(SoundMessage(
- STRING["maps.map50.passage"],
+ STRING["maps.passage_outside1"],
[]() {
g_maps->_mapPos = Common::Point(10, 5);
g_maps->changeMap(0x11b, 2);
More information about the Scummvm-git-logs
mailing list