From 1fbde7a866d5bf0115e445699202bc5ee1148b4d Mon Sep 17 00:00:00 2001 From: partmedia Date: Thu, 6 Aug 2015 14:47:22 +0000 Subject: [PATCH] Fix various grammatical issues in dialogs Submitted by: Jason Zheng git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20001 282e977c-c81d-0410-88c4-b93c2d0d6712 --- pup_land/barrier | 78 +++++----------------------- pup_land/lone_town/guild_freedom | 50 +++++++++--------- pup_land/lone_town/guild_law | 24 ++++----- pup_land/lone_town/tavern | 88 ++++++++++++++++---------------- pup_land/nurnberg/castle | 40 +++++++-------- pup_land/nurnberg/castle_ud | 12 ++--- pup_land/nurnberg/hq | 26 +++------- 7 files changed, 128 insertions(+), 190 deletions(-) diff --git a/pup_land/barrier b/pup_land/barrier index fdef7099a..8bc6db0a5 100644 --- a/pup_land/barrier +++ b/pup_land/barrier @@ -8,7 +8,7 @@ enter_x 1 enter_y 7 msg Created: 1996-01-28 -Modified: 2012-04-04 Rick Tanner +Modified: 2015-04-18 Jason Zheng endmsg end arch cobblestones2 @@ -365,7 +365,7 @@ msg @match liberation Oops! @match * -I cannot pass. Members of Liberation Army are not allowed to. +I cannot pass. Members of the Liberation Army are not allowed to. endmsg face viking.131 hp 100 @@ -431,9 +431,9 @@ end arch swashbuckler msg @match regular|resistance|pass -I have an official Regular Army - passport. So, I can pass. Hehe! +I have an official Regular Army Passport, so I can pass. Hehe! @match * -I'm a member of Regular Army. +I'm a member of the Regular Army. endmsg hp 100 x 4 @@ -446,7 +446,7 @@ unaggressive 1 arch card name shredded Passport msg - This passport is *not* usable anymore! +This passport is *not* usable anymore! endmsg end end @@ -573,7 +573,7 @@ end arch priest msg @match pass -I said, "I am not a member of Resistance." But they didn't allow me to pass... +I said, "I am not a member of the Resistance.", but they didn't allow me to pass... @match * Hello. endmsg @@ -650,16 +650,6 @@ x 6 y 14 end arch guard -msg -@match Siegfried -You may pass :-). -@match yes -Please bring up it. -@match no -.. Are you a member of Resistance, aren't you? -@match * -Do you have passport? -endmsg x 6 y 14 end @@ -790,7 +780,7 @@ end arch ninja msg @match pass -But they didn't let me... +They didn't let me pass... @match * I want to pass. endmsg @@ -1070,14 +1060,6 @@ x 11 y 14 end arch guard -msg -@match yes|passport -Please bring it up. -@match no -.. So you're a member of Resistance, aren't you? -@match * -Do you have a Passport? -endmsg x 11 y 14 end @@ -1257,14 +1239,6 @@ x 13 y 1 end arch guard -msg -@match yes|passport -Please bring it up. -@match no -.. So you're a member of Resistance, aren't you? -@match * -Do you have a Passport? -endmsg x 13 y 1 end @@ -1407,9 +1381,9 @@ msg @match yes|passport Please bring it up. @match no -.. So you're a member of Resistance, aren't you? +...you're a member of the Resistance, aren't you? @match * -Do you have a Passport? +Do you have a passport? endmsg x 14 y 4 @@ -1483,7 +1457,7 @@ end arch magic_mouth name 3 msg -The guards examine your Passport. +The guards examine your passport. endmsg x 14 y 10 @@ -1498,9 +1472,9 @@ msg @match yes|passport Please bring it up. @match no -.. So you're a member of Resistance, aren't you? +...you're a member of the Resistance, aren't you? @match * -Do you have a Passport? +Do you have a passport? endmsg x 14 y 10 @@ -1522,14 +1496,6 @@ x 14 y 13 end arch guard -msg -@match yes|passport -Please bring it up. -@match no -.. So you're a member of Resistance, aren't you? -@match * -Do you have a Passport? -endmsg x 14 y 13 end @@ -1556,14 +1522,6 @@ x 15 y 1 end arch guard -msg -@match yes|passport -Please bring it up. -@match no -.. So you're a member of Resistance, aren't you? -@match * -Do you have a Passport? -endmsg x 15 y 1 end @@ -1975,14 +1933,6 @@ x 18 y 14 end arch guard -msg -@match yes|passport -Please bring it up. -@match no -.. So you're a member of Resistance, aren't you? -@match * -Do you have a Passport? -endmsg x 18 y 14 end @@ -2506,7 +2456,7 @@ end arch woman msg @match * -Ahh... I like the strong men from Regular Army ^_^ +Ahh... I like the strong men from the Regular Army. endmsg face woman.171 hp 180 @@ -2719,7 +2669,7 @@ arch a_townsman name merchant msg @match * -How did YOU get to be a member of Regular Army? Go away. +How did YOU get to be a member of the Regular Army? Go away. endmsg hp 150 maxhp 150 diff --git a/pup_land/lone_town/guild_freedom b/pup_land/lone_town/guild_freedom index 117d3854e..ee153ac74 100644 --- a/pup_land/lone_town/guild_freedom +++ b/pup_land/lone_town/guild_freedom @@ -8,7 +8,7 @@ enter_x 1 enter_y 7 msg Created: 1996-12-18 -Modified: 2012-04-06 Rick Tanner +Modified: 2015-04-17 Jason Zheng endmsg end arch woodfloor @@ -215,11 +215,11 @@ arch ninja name Slik, the ninja msg @match task -I will assassinate Bauer, the leader of Regular Army. It's the only way to win that war. +I will assassinate Bauer, the leader of the Regular Army. It's the only way to win the war. @match training -I'm training for my great task. It will be difficult. +I'm training for my great task. It will be difficult. @match * -Hello. Don't disturb me, I'm doing ninja-training. +Hello. Don't disturb me, I'm doing ninja training. endmsg Dex -19 hp 100 @@ -254,15 +254,15 @@ end arch cleric msg @match nurnberg -Far east from Lone Town. +It's located east of Lone Town. @match liberation -We are members of Liberation Army. +We are members of the Liberation Army. @match regular -We fight against Regular Army. +We fight against the Regular Army. @match no|sumson -Sumson is the spy for Liberation Army. He entered the city of Nurnberg, to collect information about our enemies, the Regular Army. +Sumson is a spy for the Liberation Army. He entered the city of Nurnberg to collect information about our enemies, the Regular Army. @match yes -Really!? So, Where is he? +Really!? So, where is he? @match * Do you know Sumson? endmsg @@ -584,15 +584,15 @@ end arch sage msg @match barrier -There is the Barrier Station to the south-east from Lone Town. +The Barrier Station is southeast of Lone Town. @match regular -We fight against Regular Army. +We fight against the Regular Army. @match bauer -He is the leader of Regular Army and he is the mayer of Nurnberg. +He is the leader of the Regular Army and the mayor of Nurnberg. @match lone|town Welcome to Lone Town! @match * -Mr. Bauer and his Regular Army built the Barrier station. +Mr. Bauer and his Regular Army built the Barrier Station. endmsg hp 180 x 5 @@ -1059,11 +1059,11 @@ msg @match resistance We are not the "Resistance!" @match regular -They call us "Resistance." In fact, we want nothing but freedom. +They call us the "Resistance." In fact, we want nothing but freedom. @match liberation -We'll win the war against Regular Army. There's no doubt about that. +We'll win the war against the Regular Army. There's no doubt about that. @match * -This is the guild of Liberation Army. +This is the guild of the Liberation Army. endmsg hp 100 x 11 @@ -1366,20 +1366,20 @@ x 13 y 12 end arch human -name Reception of Liberation Army +name Liberation Army recruiter msg @match protect nature -Good, you passed the test! Talk to the guildmaster now. He will provide you with further instructions. +Good, you passed the test! Talk to the guildmaster now. He will provide you with further instructions. @match tower -The Tower of Ordeal lies to the east of Lone Town. I'll give you the key when you are ready. +The Tower of Ordeal lies to the east of Lone Town. I'll give you the key when you are ready. @match key -Here it is. The key for the Tower of Ordeal. +Here it is. The key for the Tower of Ordeal. @match scroll You must find the scroll by yourself. @match yes -Fine, but I must test your combat ability first. Go to the Tower of Ordeal, and search for a scroll there. +Fine, but I must test your combat ability first. Go to the Tower of Ordeal and search for a scroll there. @match * -I am a member of Liberation Army. Do you want to join us? +I am a member of the Liberation Army. Do you want to join us? endmsg hp 100 x 13 @@ -1573,7 +1573,7 @@ arch guildmaster name Dean, the guildmaster msg @match money -Yes, money is an important issue during war. And that's why the Liberation Army cannot be defeated. :-) +Yes, money is an important issue during war. That's why the Liberation Army cannot be defeated. @match * We're fighting for freedom. endmsg @@ -1918,9 +1918,9 @@ arch guildmaster name Dean, the guildmaster msg @match siegfried -Siegfried is a famous hero from the legends about Pup Land's history. It is said that he killed the Evil Masters and saved the world. He is our IDOL! +Siegfried is a famous hero from the legends about Pupland's history. It is said that he killed the Evil Masters and saved the world. He is our IDOL! @match * -Congratulations! The Liberation Army welcomes you as a new member. The common password of Liberation Army is "siegfried." Don't forget it! Okay, it's time for your first mission: Since you're a stranger, you'll be a formidable spy. Leave Lone Town and head east. There is a hidden port in the jungle. Take a ship to Nurnberg. +Congratulations! The Liberation Army welcomes you as a new member. The common password of the Liberation Army is "siegfried." Don't forget it! Okay, it's time for your first mission. Since you're a stranger, you'll be a formidable spy. Leave Lone Town and head east. There is a hidden port in the jungle. Take a ship to Nurnberg. endmsg hp 5000 maxhp 5000 diff --git a/pup_land/lone_town/guild_law b/pup_land/lone_town/guild_law index 96fde42bb..76728ed5c 100644 --- a/pup_land/lone_town/guild_law +++ b/pup_land/lone_town/guild_law @@ -8,7 +8,7 @@ enter_x 16 enter_y 7 msg Created: 1996-12-18 -Modified: 2015-04-12 Jason Zheng +Modified: 2015-04-16 Jason Zheng endmsg end arch grass @@ -227,7 +227,7 @@ arch guildmaster name James, the guildmaster msg @match * -We are fighting to defend the law. Our enemies, The Resistance, they are all rascals. +We are fighting to defend the law. Our enemies, the Resistance, are all rascals. endmsg hp 5000 maxhp 5000 @@ -481,9 +481,9 @@ arch elf name Regular Army recruiter msg @match yes -Sorry, but I have to test your combat abilities first: Enter the Cave of Ordeal and search for a scroll. I have opened the gate for you... +Sorry, but I have to test your combat abilities first. Enter the Cave of Ordeal and search for a scroll. I have opened the gate for you. @match * -Sssh! Please lower your voice... Do you want to join the Regular Army? +Sssh! Please lower your voice... do you want to join the Regular Army? endmsg face elf.131 hp 1000 @@ -914,7 +914,7 @@ arch elf name Regular Army soldier msg @match siegfried|saga -Siegfried is a great hero in the history of Pup Land. You *must* read it. +Siegfried is a great hero in the history of Pupland. You *must* read it. @match * Do you know about the Siegfried-Saga? endmsg @@ -983,9 +983,9 @@ msg @match resistance Lone Town is the origin and center of the "Resistance" movement. @match regular -We'll win the war against the Resistance because we can outnumber them. +We'll win the war against the Resistance because we outnumber them. @match * -This is the guild of Regular Army. I'm working as a spy. +This is the guild of the Regular Army. I'm working as a spy. endmsg hp 100 x 9 @@ -1448,7 +1448,7 @@ msg @match resistance We fight against them. @match barrier|station -There is a Barrier Station to the south-east from this town. We prevent Liberation Army from entering the eastern part of the country that way. +The Barrier Station is southeast of this town. It prevents the Liberation Army from entering the eastern part of the country. @match * We built the Barrier Station. endmsg @@ -1946,7 +1946,7 @@ msg @match siegfried He is our Hero! @match * -Congratulations! Now you are a member of Regular Army. Don't loose your passport, it enables you to pass the Barrier Station. +Congratulations! Now you are a member of the Regular Army. Don't loose your passport; it enables you to pass the Barrier Station. endmsg sp 0 maxsp 0 @@ -2162,7 +2162,7 @@ arch card name Passport slaying regular_army msg -This passport identifies you as member of the Regular Army. +This passport identifies you as a member of the Regular Army. endmsg x 21 type 21 @@ -2171,8 +2171,8 @@ end arch magic_mouth name 3 msg -The Reception of Regular Army says: -Excellent. You've been accepted as member of Regular Army. Here is your passport. Talk to the guildmaster for further instructions. +The Regular Army recruiter says: +Excellent. You've been accepted as a member of the Regular Army. Here is your passport. Talk to the guildmaster for further instructions. endmsg x 21 y 1 diff --git a/pup_land/lone_town/tavern b/pup_land/lone_town/tavern index 6c8d05311..70ce7035b 100644 --- a/pup_land/lone_town/tavern +++ b/pup_land/lone_town/tavern @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 1997-01-22 -Modified: 2013-07-18 Rick Tanner +Modified: 2015-04-16 Jason Zheng endmsg end arch afloor_left @@ -224,11 +224,11 @@ end arch dwarf msg @match fox|tail -Fox Tails live in the forest, somewhere in the center of Lone Town. But we don't know how to get there. +Fox Tails live in the forest, somewhere in the center of Lone Town. But we don't know how to get there. @match nazgul Nazgul's crew lives in the power plant, to the west of Lone Town. @match gang|bandit -One is Nazgul and his devils, the other one is "Fox Tails." The former are very cruel, Nazgul kills anyone on sight. The latter don't murder people. +One is Nazgul and his devils, the other one is called "Fox Tails." The former are very cruel, as Nazgul kills anyone on sight. The latter don't murder people. @match rob There are two Gangs of Bandits in this town. @match * @@ -302,14 +302,13 @@ msg @match no You should see it. @match yes -So where did the "paper-sword" go? +So where did the "paper sword" go? @match underground -You are very bright! I'll tell you a secret: -There is an invisible stairway to the south, under the Dressing room. +You are very bright! I'll tell you a secret. There is an invisible stairway to the south, under the Dressing Room. @match stair Be careful! The Magician Leader is very strong. @match fool -He is just stupid. However, his queries can be difficult. So, if you can't think of any correct answer, say honestly "I don't know." +He is just stupid. However, his queries can be difficult. So, if you can't think of any correct answer, say honestly, "I don't know." @match * Have you ever seen the Magic Show? endmsg @@ -685,8 +684,8 @@ end arch thief msg @match no|castle -There are two ways into the castle. Eureca was very smart. Don't you know the cave to the north of the castle? A secret passage from that cave leads into the castle. -@match Yes +There are two ways into the castle. Eureca was very smart. Don't you know the cave to the north of the castle? A secret passage from that cave leads into the castle. +@match yes ... @match * Have you ever been to the Castle of Eureca? @@ -1252,15 +1251,15 @@ arch mage name Learned man msg @match cordish -He lives in the south-eastern part of the town. +He lives in the southeastern part of the town. @match son|wife Ask Cordish about them. @match daughter -"He has no daughter." +He has no daughter. @match family Eureca has a Wife and a Son. @match eureca|no -He used to be the lord of this country. But he disappeared two years ago. His Family is still waiting for him to return... +He used to be the lord of this country, but he disappeared two years ago. His Family is still waiting for him to return. @match * Do you know the Castle of Eureca? endmsg @@ -1323,13 +1322,13 @@ end arch viking msg @match item -Shopkeepers say, "Transports are stopped by the war." But they hide many items under their shop, and wait for a rise in prices! +Shopkeepers say, "Transports are stopped by the war." But they hide many items under their shop, and wait for a rise in prices! @match yes -There are a few Items in it. +There are only a few Items in it. @match no -You had not better going there. +You better not go there! @match * -Have you ever been to shops in Lone Town? +Have you ever been to the shops in Lone Town? endmsg hp 100 x 8 @@ -1452,11 +1451,11 @@ end arch swashbuckler msg @match tower|no -It's to the east of the Lone Town. I've heard there should be a powerful artifact, a cloak, inside that tower... If I only knew how to enter!!! +It's to the east of Lone Town. I've heard there should be a powerful artifact, a cloak, inside that tower... if I only knew how to enter!!! @match yes -I have been there too, but I couldn't enter... :-( +I have been there too, but I couldn't enter... @match * -Do you know Tower of Ordeal yet? +Have you been to the Tower of Ordeal yet? endmsg hp 100 x 9 @@ -1937,7 +1936,7 @@ msg @match tree He loves trees very much. @match tower -He plants Tree around the tower. +He plants Trees around the tower. @match pupuly He lives in his Tower. @match * @@ -2004,7 +2003,7 @@ arch dog name old dog msg @match * -Poppy knows something new. Bow wow! +Poppy knows something new. Bow wow! endmsg Con 50 hp 1000 @@ -2143,9 +2142,9 @@ arch viking name Frederick msg @match heinrich -We live in sourth-eastern part of Lone Town. +We live in the sourtheastern part of Lone Town. @match yes -So, I suspect you have traveled to many places? Have you ever seen the pre-historical site? My brother, Heinrich has searched for that pre-historical site for many years now. If you know anything about it, please go and talk to Heinrich. +So, I suspect you have traveled to many places? Have you ever seen the prehistorical site? My brother, Heinrich, has searched for that prehistorical site for many years now. If you know anything about it, please go and talk to Heinrich. @match * Are you an adventurer? endmsg @@ -2483,13 +2482,16 @@ arch swashbuckler name Canvasser msg @match yes -Great, go to the Guild of Freedom, our guild. +Great, go to the Guild of Freedom, which is our guild. @match liberation|army -Do you wanna join us? :-) +Do you wanna join us? @match no -You are a member of Regular Army, aren't you? - I'LL KILL YOU!! +You are a member of the Regular Army, aren't you? I'LL KILL YOU!! +... +... +Not here, because murder is illegal... but later I will!! @match * -I'm a member of Liberation army. +I'm a member of the Liberation Army. endmsg face swashbuckl.131 hp 100 @@ -2999,7 +3001,7 @@ Hello stranger! Will you buy some booze for me? @match no|nope Then go away! @match yes -Thank you. Did you ever hear of Maveric the founder of the Forgotten Town? Until he died there was everything better in the Town. As he died only adventurers discovered the entrance to the town hidden under the earth. +Thank you. Did you ever hear of Maveric, the founder of the Forgotten Town? Until he died there everything was better in the Town. After he died only adventurers discovered the entrance to the town hidden under the earth. @match where When you want to see it travel to Darcap. endmsg @@ -3265,15 +3267,15 @@ end arch dwarf_priest msg @match electric|power|plant -It's located to the west of Lone Town. Would you retrieve the report for me? +It's located to the west of Lone Town. Would you retrieve the report for me? @match thieves Their aggitating point (agito) is the Electric Power Plant. @match nazgul He is the boss of those Thieves. @match note -It is the Nazgul Report. We must know and understand him - to defeat him. Now he stole it! +It is the Nazgul Report. We must know and understand him to defeat him. Now he stole it! @match yes -Thanks. If you get the Report, please put it on this table. I'll give you my special tool. But be careful! Nazgul is an odd creature. And his bodyguard, Ologhi is very strong. +Thanks. If you get the Report, please put it on this table. I'll give you my special tool. But be careful! Nazgul is an odd creature, and his bodyguard, Ologhi, is very strong. @match * My research Notes were stolen by thieves! endmsg @@ -3364,23 +3366,21 @@ arch guildmaster name Bob msg @match nurnberg -Nurnberg is located far east from this here. +Nurnberg is located east from here. @match Lickmond -He works for Bauer. He is the general of Regular Army. +He works for Bauer. He is the general of the Regular Army. @match Bauer -He is the mayor of the Nurnberg. Shortly after Eureca was gone, he said: -"The people of Lone Town kidnapped Eureca. We must not permit their reckless attempt." -In fact, THEY have kidnapped Eureca, probably Bauer himself did it. +He is the mayor of the Nurnberg. Shortly after Eureca was gone, he said, "The people of Lone Town kidnapped Eureca. We must not permit their reckless attempt." In fact, THEY kidnapped Eureca, probably Bauer himself did it. @match regular -Bauer and Lickmond are the leaders of Regular Army. +Bauer and Lickmond are the leaders of the Regular Army. @match eureca -He is the lord of this country. +He was the lord of this country. @match no -They kidnapped the lord of the land, Eureca. Those dirty bastards! +They kidnapped the lord of the land, Eureca. Those dirty bastards! @match yes ... @match * -Do you know why we fight agaist the Regular Army? +Do you know why we fight against the Regular Army? endmsg hp 500 x 22 @@ -3507,16 +3507,16 @@ x 23 y 17 end arch elf -name Spy of Regular Army +name Regular Army spy msg @match no You will regret your decision... @match spy -Oops! Sure... I'm a spy of Regular Army. Please, don't tell anybody. +Oops! Sure... I'm a spy of the Regular Army. Please, don't tell anybody. @match regular -Would you like to join us? :-) +Would you like to join us? @match yes -So, go to the Guild of Law, our guild. The password of the guild is "blackbird." Don't forget that... +So, go to the Guild of Law, our guild. The password to the guild is "blackbird." Don't forget that. @match * Be quiet! endmsg diff --git a/pup_land/nurnberg/castle b/pup_land/nurnberg/castle index f1f8155ad..6714d77b1 100644 --- a/pup_land/nurnberg/castle +++ b/pup_land/nurnberg/castle @@ -8,7 +8,7 @@ enter_x 12 enter_y 15 msg Created: 1996-03-02 -Modified: 2012-04-03 Rick Tanner +Modified: 2015-04-18 Jason Zheng endmsg end arch cobblestones2 @@ -736,7 +736,7 @@ arch locked_door2 name castle guard slaying no_way_to_pass_123 msg -The castle guards says: You cannot pass! +The castle guard says: You shall not pass! endmsg face guard_hard.111 x 5 @@ -1134,7 +1134,7 @@ arch cobblestones2 x 9 y 5 end -arch chair_1.1 +arch chair_1.4 x 9 y 5 end @@ -1142,11 +1142,11 @@ arch cleric name secretary 1 msg @match eureca -The Resistance has kidnapped him. We must rescue Eureca! +The Resistance has kidnapped him. We must rescue Eureca! @match army|regular|castle -We have entered the castle to search for Eureca's family and, of course, for the lord himself. +We have entered the castle to search for Eureca's family, and of course, for the lord himself. @match * -Our army has entered the western wing of Eureca's Castle. +Our army has entered the western wing of the Castle of Eureca. endmsg face cleric.131 hp 100 @@ -1167,7 +1167,7 @@ arch cobblestones2 x 9 y 7 end -arch chair_1.1 +arch chair_1.4 x 9 y 7 end @@ -1177,7 +1177,7 @@ msg @match head It's here in this city. @match lickmond -He is the general of Regular Army. Usually he can be found in the Headquarter. +He is the general of the Regular Army. Usually he can be found in the Headquarter of the Regular Army. @match * Lickmond will save Eureca from the Resistance. endmsg @@ -1199,7 +1199,7 @@ arch cobblestones2 x 9 y 9 end -arch chair_1.1 +arch chair_1.4 x 9 y 9 end @@ -1207,7 +1207,7 @@ arch human name secretary 5 msg @match dick -Dick is the carpenter of Nurnberg. He was very greedy at first, but then he lowered the price for this castle. +Dick is the carpenter of Nurnberg. He was very greedy at first, but then he lowered the price for this castle. @match * Dick built this castle. endmsg @@ -1518,11 +1518,11 @@ arch sage name Bauer msg @match yes -Are you a member of Regular Army? If not, you should go to the Guild of Law in this city. Times are rough and we need smart guys like you. +Are you a member of the Regular Army? If not, you should go to the Guild of Law in this city. Times are rough and we need smart guys like you. @match no Watch your mouth, punk! @match mayor|city -Yes, I'm the mayor of Nurnberg. Do you like my city? +Yes, I'm the mayor of Nurnberg. Do you like my city? @match * I'm Bauer, the mayor of this city. endmsg @@ -1769,11 +1769,11 @@ msg @match spy Ask our members in the Guild of Law. @match head|resistance -The headquarter of resistance can be found to the north-west of Eureca's castle. +The headquarter of the Resistance can be found northwest of the Castle of Eureca. @match eureca He was the lord of this country. @match * -We will soon rescue lord Eureca from the hands of Resistance. Already, our spy is sneaking into their Headquarter. +We will soon rescue Lord Eureca from the hands of the Resistance. Already, our spy is sneaking into their headquarter. endmsg hp 100 x 14 @@ -1800,13 +1800,13 @@ arch ninja name secretary 4 msg @match yes -The personal chambers of Bauer are Upstairs. And downstairs there is the Prison. +The personal chambers of Bauer are upstairs, and downstairs is the Prison. @match prison -Some bad guys are held in captivity there. Nobody special. +Some bad guys are held in captivity there. Nobody special. @match no ... @match * -In this castle, strangers are not allowed to use the stairways. Do you wanna know why? +In this castle, strangers are not allowed to use the stairways. Do you wanna know why? endmsg hp 100 x 14 @@ -1832,10 +1832,10 @@ end arch thief name secretary 6 msg -@match liberation|army +@match resistance Maybe someone supports them financially? @match * -Liberation Army is much smaller than us. But still they can resist our attacks. Why? +The Resistance is much smaller than us, but still they can resist our attacks. How? endmsg hp 1000 x 14 @@ -2259,7 +2259,7 @@ arch locked_door2 name castle guard slaying no_way_to_pass_123 msg -The castle guards says: You cannot pass! +The castle guard says: You shall not pass! endmsg face guard_hard.111 x 18 diff --git a/pup_land/nurnberg/castle_ud b/pup_land/nurnberg/castle_ud index b28b4a7b6..18b5c4e8f 100644 --- a/pup_land/nurnberg/castle_ud +++ b/pup_land/nurnberg/castle_ud @@ -8,7 +8,7 @@ enter_x 1 enter_y 7 msg Created: 1996-03-04 -Modified: 2012-04-03 Rick Tanner +Modified: 2015-04-18 Jason Zheng endmsg end arch blocked @@ -121,9 +121,9 @@ end arch cleric msg @match eureca|war -Eureca is not here. Our expectations were wrong! The war with Nurnberg must be stopped!! What the hell is going on in Pup Land? +Eureca is not here. Our expectations were wrong! The war with Nurnberg must be stopped!! What the hell is going on in Pupland? @match * -I'm a spy of Liberation Army.. We've made a terrible mistake... Eureca... this war... But I'm too weak to escape from here. +I'm a spy of the Liberation Army... we've made a terrible mistake... Eureca... this war... but I'm too weak to escape from here. endmsg face cleric.131 hp 100 @@ -921,7 +921,7 @@ arch dungeon_floor x 9 y 6 end -arch chair_1.2 +arch chair_1.1 x 9 y 6 end @@ -962,7 +962,7 @@ arch dungeon_floor x 9 y 8 end -arch chair_1.1 +arch chair_1.3 x 9 y 8 end @@ -1596,7 +1596,7 @@ msg @match eureca I don't know where he is... @match * -You are a spy of Liberation Army, aren't you? Help me!! +You are a spy of the Liberation Army, aren't you? Help me!! endmsg hp 100 x 15 diff --git a/pup_land/nurnberg/hq b/pup_land/nurnberg/hq index fa713b690..0628d35d5 100644 --- a/pup_land/nurnberg/hq +++ b/pup_land/nurnberg/hq @@ -8,7 +8,7 @@ enter_x 9 enter_y 17 msg Created: 1996-04-03 -Modified: 2011-12-09 Rick Tanner +Modified: 2015-04-13 Jason Zheng endmsg end arch dungeon_floor @@ -535,12 +535,6 @@ y 1 end arch knight name Imperial Guard -msg -@match member|join|regular -If you want to join Regular Army, enter the Reception Towers. -@match * -The elite training center is free for all members of Regular Army. -endmsg hp 2500 x 4 y 1 @@ -565,9 +559,9 @@ arch knight name Imperial Guard msg @match member|join|regular -If you want to join Regular Army, enter the Reception Towers. +If you want to join the Regular Army, enter the Reception Towers. @match * -The elite training center is free for all members of Regular Army. +The elite training center is free for all members of the Regular Army. endmsg hp 2500 x 4 @@ -1185,9 +1179,9 @@ arch warrior_1 name Lickmond, the general msg @match eureca -We must save him! +We must save him from the Resistance! @match * -Most of our soldiers stay at the castle of Eureca. +Most of our soldiers stay at the Castle of Eureca. endmsg face warrior_red.151 animation warrior_red @@ -1878,12 +1872,6 @@ y 1 end arch knight name Imperial Guard -msg -@match member|join|regular -If you want to join Regular Army, enter the Reception Towers. -@match * -What you see behind the gate, that is free equipment, available for all members of Regular Army. -endmsg hp 2500 x 14 y 1 @@ -1908,9 +1896,9 @@ arch knight name Imperial Guard msg @match member|join|regular -If you want to join Regular Army, enter the Reception Towers. +If you want to join the Regular Army, enter the Reception Towers. @match * -What you see behind the gate, that is free equipment, available for all members of Regular Army. +What you see behind the gate is free equipment available for all members of the Regular Army. endmsg hp 2500 x 14