From 38e10a90182b6eb53938f7c911dbed3cd8d1b274 Mon Sep 17 00:00:00 2001 From: partmedia Date: Mon, 13 Apr 2015 00:40:08 +0000 Subject: [PATCH] Standardize names of Regular Army personnel Submitted by: Jason Zheng git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19901 282e977c-c81d-0410-88c4-b93c2d0d6712 --- pup_land/castle_eureca/castle_eureca1 | 46 +++++++++++++------------- pup_land/castle_eureca/castle_eurecaB1 | 22 ++++++------ pup_land/lone_town/guild_law | 10 +++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pup_land/castle_eureca/castle_eureca1 b/pup_land/castle_eureca/castle_eureca1 index 9689cd162..ee6867f95 100644 --- a/pup_land/castle_eureca/castle_eureca1 +++ b/pup_land/castle_eureca/castle_eureca1 @@ -8,7 +8,7 @@ enter_x 10 enter_y 24 msg Created: 1996-01-29 -Modified: 2011-10-21 Rick Tanner +Modified: 2015-04-12 Jason Zheng endmsg end arch dungeon_floor @@ -1248,7 +1248,7 @@ x 8 y 17 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -1278,7 +1278,7 @@ x 8 y 18 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -1308,7 +1308,7 @@ x 8 y 19 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2282,7 +2282,7 @@ x 15 y 1 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2312,7 +2312,7 @@ x 15 y 2 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2342,7 +2342,7 @@ x 15 y 3 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2372,7 +2372,7 @@ x 15 y 4 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2402,7 +2402,7 @@ x 15 y 5 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2558,7 +2558,7 @@ x 16 y 1 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2588,7 +2588,7 @@ x 16 y 2 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2618,7 +2618,7 @@ x 16 y 3 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2648,7 +2648,7 @@ x 16 y 4 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2678,7 +2678,7 @@ x 16 y 5 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3032,7 +3032,7 @@ x 18 y 11 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3062,7 +3062,7 @@ x 18 y 12 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3092,7 +3092,7 @@ x 18 y 13 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3122,7 +3122,7 @@ x 18 y 14 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3152,7 +3152,7 @@ x 18 y 15 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3276,7 +3276,7 @@ x 19 y 12 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3306,7 +3306,7 @@ x 19 y 13 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3336,7 +3336,7 @@ x 19 y 14 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -3366,7 +3366,7 @@ x 19 y 15 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 diff --git a/pup_land/castle_eureca/castle_eurecaB1 b/pup_land/castle_eureca/castle_eurecaB1 index d45a3fbd8..8e0b91df4 100644 --- a/pup_land/castle_eureca/castle_eurecaB1 +++ b/pup_land/castle_eureca/castle_eurecaB1 @@ -8,7 +8,7 @@ enter_x 10 enter_y 8 msg Created: 1996-01-29 -Modified: 2008-10-20 Rick Tanner +Modified: 2015-04-12 Jason Zheng endmsg end arch blocked @@ -164,7 +164,7 @@ x 1 y 7 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -194,7 +194,7 @@ x 1 y 8 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -224,7 +224,7 @@ x 1 y 9 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -254,7 +254,7 @@ x 1 y 10 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -1595,7 +1595,7 @@ x 10 y 13 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -1625,7 +1625,7 @@ x 10 y 14 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2860,7 +2860,7 @@ x 19 y 6 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2890,7 +2890,7 @@ x 19 y 7 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2924,7 +2924,7 @@ x 19 y 9 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 @@ -2954,7 +2954,7 @@ x 19 y 10 end arch elf -name Regular army +name Regular Army soldier face elf.151 Str 2 Dex 8 diff --git a/pup_land/lone_town/guild_law b/pup_land/lone_town/guild_law index 2767d907c..96fde42bb 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: 2012-04-06 Rick Tanner +Modified: 2015-04-12 Jason Zheng endmsg end arch grass @@ -478,7 +478,7 @@ x 4 y 4 end arch elf -name Reception of Regular Army +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... @@ -911,7 +911,7 @@ x 8 y 14 end arch elf -name Regular Army +name Regular Army soldier msg @match siegfried|saga Siegfried is a great hero in the history of Pup Land. You *must* read it. @@ -978,7 +978,7 @@ x 9 y 8 end arch elf -name Regular Army +name Regular Army soldier msg @match resistance Lone Town is the origin and center of the "Resistance" movement. @@ -1443,7 +1443,7 @@ x 14 y 2 end arch elf -name Regular Army +name Regular Army soldier msg @match resistance We fight against them.