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

Fix downstairs exit for Grumms Inn. 

Take this opportunity to improve the upstairs, fix the archetypes, and
correct/improve NPC dialogue.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18842 282e977c-c81d-0410-88c4-b93c2d0d6712
master
partmedia 2013-07-28 04:53:01 +00:00
parent e063e247c4
commit fad0f00bed
2 changed files with 78 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
marksel/grumms_inn
View File

@ -8,7 +8,7 @@ enter_x 9
enter_y 15
msg
Created: 2002-10-27 Todd Mitchell
Modified: 2012-06-15 Rick Tanner
Modified: 2013-07-28 Kevin Zheng
endmsg
outdoor 1
end
@ -538,9 +538,13 @@ y 3
end
arch dwarf_priest
name Ingo
title the innkeeper
msg
@match reasonable
Sure, where else are you going to find a place to sleep all the way out here? With the dwarves? Ha!
@match *
I would be happy to assist you. You will find my prices quite reasonable.
I would be happy to assist you. You will find my prices quite reasonable.
@question reasonable You call this REASONABLE?
endmsg
x 5
y 3
@ -589,11 +593,11 @@ arch thief_1
name quiet man in corner
msg
@match signal|tower|bandits
Aye, those scum make rotten robbers. I had a good life until they chased off those merchants.
Aye, those scum make rotten robbers. I had a good life until they chased off those merchants.
@match merchants
I hope someone kills those bastards so that the caravans will come here again.
@match yes
Well & good then. I think some strong mead may help take my mind off those stupid bandits.
Well & good then. I think some strong mead may help take my mind off those stupid bandits.
@match *
Are you buying this round?
endmsg
@ -682,7 +686,7 @@ arch chair_1.1
x 6
y 7
end
arch light2
arch light4
x 6
y 7
end
@ -818,12 +822,12 @@ arch fighter
name Samar
title the quick
msg
@match hi|hello
@match hi|hello|greet
Good day for it eh?
@match it?
@match it
Kicking up and having a pint.
@match dwarves|mine
Ya, I hired on to guard the mine. Good work if you get along with dwarves. Funny, they don't let on where they really live. They surely don't live in that dingy mine.
Ya, I hired on to guard the mine. Good work if you get along with dwarves. Funny, they don't let on where they really live. They surely don't live in that dingy mine.
endmsg
x 7
y 8
@ -1428,13 +1432,13 @@ arch dwarf_wiz
name Grumm
msg
@match chicken|garden
@question priest What priest?
Damn priest!
His chickens are always in my garden!
@question priest What priest?
@match priest
Veratin, the priest of the small church next door.
@match *
Greetings I am Grumm, welcome to my inn. Rooms and worship facilities for Mostrai are available upstairs for a modest price of 50 gold. You get a full 28 hours for that by the way.
Greetings I am Grumm, welcome to my inn. Rooms and worship facilities for Mostrai are available upstairs for a modest price of 50 gold. You get a full 28 hours for that by the way.
endmsg
x 13
y 4
@ -1463,7 +1467,7 @@ arch chair_1.1
x 13
y 7
end
arch light2
arch light4
x 13
y 7
end
@ -1586,10 +1590,10 @@ end
arch greater_dwarven_guard
name Rudyard
msg
@match hello|hi
Good day!
@match harlon
He's mad because he lost his pay in a game of Orc Knuckle.
@match *
Good day!
endmsg
exp 20
x 14
@ -1884,14 +1888,14 @@ arch c_man
name Frank
msg
@match travelers
@question bandits What bandits?
Who would risk the south road with those bandits?
@question bandits What bandits?
@match bandits
My brother used to help station the signal tower. Now, I fear he's dead...
<sob>
@match *
@question travelers Why are there so few travelers?
Sigh, it's so boring when so few travelers come.
@question travelers Why are there so few travelers?
endmsg
x 17
y 5
@ -1993,8 +1997,6 @@ x 18
y 5
end
arch booze_table
name Drop 6 gold for booze
food 6
x 18
y 5
end
@ -2084,10 +2086,17 @@ x 19
y 3
end
arch c_woman
name Kalana the bar maid
name Kalana
title the bar maid
msg
@match darcap
Really? I hear it's pretty dangerous to go there...
@match navar
Ahh, so you've seen the big city!
@match scorn
Wow, that's very far away from here.
@match *
Hiya cutie! Where're you from?
Hiya cutie? Whereya from?
endmsg
x 19
y 3
@ -2105,6 +2114,10 @@ arch woodfloor2
x 19
y 5
end
arch food_table
x 19
y 5
end
arch woodfloor2
x 19
y 6
@ -2118,7 +2131,7 @@ arch chair_1.1
x 19
y 7
end
arch light2
arch light4
x 19
y 7
end
@ -2207,9 +2220,7 @@ arch woodfloor2
x 20
y 5
end
arch food_table
name Drop 10 gold for food
food 10
arch waybread_table
x 20
y 5
end
@ -2233,8 +2244,10 @@ end
arch c_man
name Riakus
msg
@match visitors
Yes, few people dare venture on the road to the south.
@match *
Hello stranger. Please tell us news from other lands. We get so few visitors..
Hello stranger. Please tell us news from other lands. We get so few visitors...
endmsg
x 20
y 8

127
marksel/grumms_inn2
View File

@ -8,9 +8,8 @@ enter_x 20
enter_y 3
msg
Created: 2002-10-27 Todd Mitchell
Modified: 2008-10-28 Rick Tanner
Modified: 2013-07-28 Kevin Zheng
endmsg
outdoor 1
end
arch woodfloor2
end
@ -100,18 +99,10 @@ arch woodfloor2
x 1
y 4
end
arch firepot
x 1
y 4
end
arch woodfloor2
x 1
y 5
end
arch firepot
x 1
y 5
end
arch woodfloor2
x 1
y 6
@ -240,10 +231,6 @@ arch table
x 3
y 1
end
arch light2
x 3
y 1
end
arch woodfloor2
x 3
y 2
@ -284,10 +271,6 @@ arch table
x 3
y 8
end
arch light2
x 3
y 8
end
arch woodfloor2
x 3
y 9
@ -446,7 +429,7 @@ arch woodfloor2
x 6
y 1
end
arch barrel
arch table
x 6
y 1
end
@ -454,7 +437,7 @@ arch woodfloor2
x 6
y 2
end
arch chair_1.2
arch chair_1.3
x 6
y 2
end
@ -478,37 +461,37 @@ arch woodfloor2
x 6
y 7
end
arch barrel
x 6
y 7
end
arch woodfloor2
x 6
y 8
end
arch barrel
x 6
y 8
end
arch woodfloor2
x 6
y 9
end
arch woodwall_2_1_2
x 6
y 9
end
arch woodfloor2
x 7
end
arch woodwall_2_1_2
x 7
end
arch woodfloor2
x 7
y 1
end
arch chair_1.1
x 6
y 7
end
arch woodfloor2
x 6
y 8
end
arch table
x 6
y 8
end
arch woodfloor2
x 6
y 9
end
arch woodwall_2_1_2
x 6
y 9
end
arch woodfloor2
x 7
end
arch woodwall_2_1_2
x 7
end
arch woodfloor2
x 7
y 1
end
arch chair_1.2
x 7
y 1
end
@ -516,18 +499,10 @@ arch woodfloor2
x 7
y 2
end
arch chair_1.2
x 7
y 2
end
arch woodfloor2
x 7
y 3
end
arch firepot
x 7
y 3
end
arch woodfloor2
x 7
y 4
@ -540,10 +515,6 @@ arch woodfloor2
x 7
y 6
end
arch firepot
x 7
y 6
end
arch woodfloor2
x 7
y 7
@ -552,7 +523,7 @@ arch woodfloor2
x 7
y 8
end
arch barrel
arch chair_1.2
x 7
y 8
end
@ -652,10 +623,6 @@ arch woodfloor2
x 9
y 2
end
arch chair_1.4
x 9
y 2
end
arch woodfloor2
x 9
y 3
@ -796,7 +763,7 @@ arch woodfloor2
x 11
y 1
end
arch light2
arch table
x 11
y 1
end
@ -840,10 +807,6 @@ arch table
x 11
y 8
end
arch light2
x 11
y 8
end
arch woodfloor2
x 11
y 9
@ -862,6 +825,10 @@ arch woodfloor2
x 12
y 1
end
arch chair_1.2
x 12
y 1
end
arch woodfloor2
x 12
y 2
@ -1018,10 +985,6 @@ arch woodfloor2
x 14
y 6
end
arch firepot
x 14
y 6
end
arch woodfloor2
x 14
y 7
@ -1283,10 +1246,6 @@ arch table_2
x 18
y 8
end
arch light2
x 18
y 8
end
arch woodfloor2
x 18
y 9
@ -1365,8 +1324,8 @@ y 3
end
arch stair_down_2
slaying grumms_inn
hp 20
sp 3
hp 21
sp 5
x 20
y 3
end
@ -1378,10 +1337,6 @@ arch woodfloor2
x 20
y 5
end
arch firepot
x 20
y 5
end
arch woodfloor2
x 20
y 6