crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize NPC names and titles 

Submitted by:   Jason Zheng

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20002 282e977c-c81d-0410-88c4-b93c2d0d6712
master
partmedia 2015-08-06 14:47:32 +00:00
parent 1fbde7a866
commit 7f6965c806
6 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pup_land/lone_town/guild_freedom
View File

@ -212,7 +212,8 @@ x 1
y 14
end
arch ninja
name Slik, the ninja
name Slik
title the ninja
msg
@match task
I will assassinate Bauer, the leader of the Regular Army. It's the only way to win the war.
@ -225,8 +226,7 @@ Dex -19
hp 100
x 1
y 14
speed 0.001000
type 0
speed 0.001
weight 700000
randomitems none
move_type walk
@ -1570,7 +1570,8 @@ activate_on_push 1
activate_on_release 1
end
arch guildmaster
name Dean, the guildmaster
name Dean
title the guildmaster
msg
@match money
Yes, money is an important issue during war. That's why the Liberation Army cannot be defeated.
@ -1915,7 +1916,8 @@ resist_fire 30
connected 4
end
arch guildmaster
name Dean, the guildmaster
name Dean
title the guildmaster
msg
@match siegfried
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!

8
pup_land/lone_town/guild_law
View File

@ -8,7 +8,7 @@ enter_x 16
enter_y 7
msg
Created: 1996-12-18
Modified: 2015-04-16 Jason Zheng
Modified: 2015-04-17 Jason Zheng
endmsg
end
arch grass
@ -224,7 +224,8 @@ activate_on_push 1
activate_on_release 1
end
arch guildmaster
name James, the guildmaster
name James
title the guildmaster
msg
@match *
We are fighting to defend the law. Our enemies, the Resistance, are all rascals.
@ -1941,7 +1942,8 @@ speed 0.000000
connected 4
end
arch guildmaster
name James, the guildmaster
name James
title the guildmaster
msg
@match siegfried
He is our Hero!

50
pup_land/nurnberg/castle_bauer/castle2
View File

@ -8,7 +8,7 @@ enter_x 20
enter_y 7
msg
Created: 1996-03-04
Modified: 2008-10-20 Rick Tanner
Modified: 2015-04-18 Jason Zheng
endmsg
end
arch blocked
@ -107,12 +107,12 @@ arch cobblestones2
x 1
y 3
end
arch chair_1.1
arch chair_1.4
x 1
y 3
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -365,7 +365,7 @@ x 3
y 3
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -527,12 +527,12 @@ arch cobblestones2
x 4
y 1
end
arch chair_1.1
arch chair_1.4
x 4
y 1
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -564,12 +564,12 @@ arch cobblestones2
x 4
y 3
end
arch chair_1.1
arch chair_1.4
x 4
y 3
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -915,7 +915,7 @@ x 6
y 1
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -952,7 +952,7 @@ x 6
y 3
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -1114,7 +1114,7 @@ arch cobblestones2
x 7
y 10
end
arch chair_1.1
arch chair_1.4
x 7
y 10
end
@ -1132,7 +1132,7 @@ arch cobblestones2
x 7
y 12
end
arch chair_1.1
arch chair_1.4
x 7
y 12
end
@ -1150,7 +1150,7 @@ arch cobblestones2
x 7
y 14
end
arch chair_1.1
arch chair_1.4
x 7
y 14
end
@ -1406,7 +1406,7 @@ arch cobblestones2
x 9
y 10
end
arch chair_1.1
arch chair_1.4
x 9
y 10
end
@ -1424,7 +1424,7 @@ arch cobblestones2
x 9
y 12
end
arch chair_1.1
arch chair_1.4
x 9
y 12
end
@ -1442,7 +1442,7 @@ arch cobblestones2
x 9
y 14
end
arch chair_1.1
arch chair_1.4
x 9
y 14
end
@ -1682,7 +1682,7 @@ arch cobblestones2
x 11
y 10
end
arch chair_1.1
arch chair_1.4
x 11
y 10
end
@ -1700,7 +1700,7 @@ arch cobblestones2
x 11
y 12
end
arch chair_1.1
arch chair_1.4
x 11
y 12
end
@ -1718,7 +1718,7 @@ arch cobblestones2
x 11
y 14
end
arch chair_1.1
arch chair_1.4
x 11
y 14
end
@ -2046,7 +2046,7 @@ arch cobblestones2
x 13
y 10
end
arch chair_1.1
arch chair_1.4
x 13
y 10
end
@ -2064,7 +2064,7 @@ arch cobblestones2
x 13
y 12
end
arch chair_1.1
arch chair_1.4
x 13
y 12
end
@ -2082,16 +2082,16 @@ arch cobblestones2
x 13
y 14
end
arch chair_1.1
x 13
y 14
end
arch man
name office worker
x 13
y 14
unaggressive 0
end
arch chair_1.4
x 13
y 14
end
arch dungeon_floor
x 13
y 15

10
pup_land/nurnberg/castle_ud
View File

@ -344,7 +344,7 @@ y 7
connected 1
end
arch elf
name Chief
name Regular Army chief
Str 20
Dex 16
Con 20
@ -794,7 +794,7 @@ x 8
y 2
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -926,7 +926,7 @@ x 9
y 6
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -967,7 +967,7 @@ x 9
y 8
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10
@ -1016,7 +1016,7 @@ x 9
y 14
end
arch elf
name Regular army
name Regular Army soldier
Str 2
Dex 8
Con 10

8
pup_land/nurnberg/hq
View File

@ -8,7 +8,7 @@ enter_x 9
enter_y 17
msg
Created: 1996-04-03
Modified: 2015-04-13 Jason Zheng
Modified: 2015-04-17 Jason Zheng
endmsg
end
arch dungeon_floor
@ -1176,7 +1176,8 @@ x 9
y 1
end
arch warrior_1
name Lickmond, the general
name Lickmond
title the general
msg
@match eureca
We must save him from the Resistance!
@ -2645,8 +2646,7 @@ end
arch magic_mouth
name 4
msg
Lickmond, the general says:
What?!! You killed my sparring partner! Now YOU must do his job! C'mon... let's fight!
Lickmond says: What?!! You killed my sparring partner! Now YOU must do his job! C'mon... let's fight!
endmsg
x 20
y 1

8
pup_land/nurnberg/hq_training
View File

@ -8,7 +8,7 @@ enter_x 4
enter_y 6
msg
Created: 2000-12-24
Modified: 2014-11-13 Jason Zheng
Modified: 2015-04-17 Jason Zheng
endmsg
end
arch pstone_1
@ -1498,7 +1498,8 @@ x 6
y 4
end
arch ninja
name Slik, the ninja
name Slik
title the ninja
msg
@match partner|sparring
Lickmond's sparring partner can be found in the "hard" training section.
@ -1513,8 +1514,7 @@ Dex -19
hp 100
x 6
y 4
speed 0.001000
type 0
speed 0.001
weight 700000
randomitems none
move_type walk