Commit Graph

65 Commits (2d73cbd974037b0ed66f4148710c1396b66b8596)

Author SHA1 Message Date
Kevin Zheng b3964c2f05 Use new '@identify' keyword 2022-06-25 13:08:52 -07:00
Kevin Zheng 269d455da8 Add replies to make dialogs more discoverable 2022-06-25 12:32:08 -07:00
DraugTheWhopper 288b6287d5 Adjust more dialogue affected by the recent grammatical changes.
Some reversions, some additional adjustments. Overall, I've tried to make things more natural, at least for American English.
2021-11-01 18:22:23 -04:00
Nicolas Weeger 78448c41a3 Limit the booze a player can buy for each money drop to one bottle
This is nicer for new players.

See https://sourceforge.net/p/crossfire/bugs/901/
2021-10-23 12:55:17 +02:00
tannerrj 88700149be Grammar and spelling corrections to NPC dialog 2021-10-04 00:43:43 -05:00
Nicolas Weeger c72c9d38ba Rename 'Scorn Royalty Quest' to 'scorn/ScornHero', add developer comment 2021-09-21 20:42:12 +02:00
Andreas Kirschbaum f6ada1f307 Reformat and fix spelling of messages 2021-07-25 23:44:39 +02:00
rock808 32128f1751 Slight re-work of the CoffeeGoose quest
- Fill in some clue/storyline gaps, give some NPCs a little better responses
- In Oled's cafe, remove coffee converter and extra floor
2021-07-24 21:03:57 -07:00
partmedia 64cd84c4b7 Fix invalid object attributes.
While around, fix text capitalization and a few dialogs.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19290 282e977c-c81d-0410-88c4-b93c2d0d6712
2014-03-30 14:25:34 +00:00
akirschbaum dd472884c9 Run MapNormalizer editor script on all map files.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18817 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-19 13:26:30 +00:00
akirschbaum 5e430c833f Remove trailing whitespace.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18703 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-05-09 11:08:11 +00:00
rjtanner 20cba383eb Update syntax to Pup Land reference (was Pupland and pupland) in message text to Goth's Tavern (navar_city/dragon_hangar/hangar) in Navar. Old reference of pupland still works in matching text for NPC dialogue.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17795 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-02 06:06:01 +00:00
rjtanner dcff771eff Removed forced line breaks and punctuation corrections in message text to Goth's Tavern (scorn/taverns/goths) in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17736 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-03-29 04:54:29 +00:00
rjtanner 9bdaa2148f Removed forced line breaks in message text to Goth's Tavern (scorn/taverns/goths) in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@16690 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-01-17 06:22:17 +00:00
rjtanner b4f49c972a Typo correction to Dilek the Drunk's dialogue (dont -> don't) in Goth's Tavern in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@16159 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-15 00:34:51 +00:00
rjtanner 30845c5dc3 Grammar correction to Drachnak the Priest dialogue (Its -> It's) to Goth's Tavern in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@16158 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-15 00:32:37 +00:00
rjtanner 92fd827e4b Typo correction (locat -> locate) and added more key words to the dialogue for the location of the Valley of the Three Sisters to Goth's Tavern in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@16157 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-15 00:30:40 +00:00
ryo_saeba 275e96000c Replace handler with specific one. Requires arch revision 15303.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15304 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 10:56:21 +00:00
ryo_saeba fb8deaa7e7 Replace handler with specific one. Requires arch revision 15294.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15299 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 10:11:11 +00:00
rjtanner c668292f54 Update or correct entrance x and y coordinates in the map headers.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15169 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-09 19:56:01 +00:00
rjtanner 0487248b1f Updated Goth's Taven in Scorn so that the map exterior matches it's placement in the world map. Updated world map for new entrance destination to the Tavern. Updated stair coordiantes on the upper and lower level of the Tavern so that they line up with the other levels.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15088 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-13 04:41:07 +00:00
rjtanner 2524b29ea1 Floor layout changes to Goth's Tavern in Scorn. Door moved to left side of the map and added windows to match the building exterior. Added a cloak room near the entrance. Moved the gate password hint so players should stumble upon it more easily. Updated world map for new entrance coordinates.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15087 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-13 04:23:52 +00:00
rjtanner da41a4fe4f Removed NPC from the floor tile inventory and placed them on top of the tile.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15086 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-13 03:56:39 +00:00
cavesomething 6c888aba77 Add a dialog for the dragon emissary in goth's tavern
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13177 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 17:19:21 +00:00
cavesomething 96f4ed3945 Fix a substantial number of other script paths that I had missed previously.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13046 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-30 09:55:06 +00:00
cavesomething ee9382a5cb Support for the various quests that track passage through the gates of scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13002 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 14:40:43 +00:00
cavesomething 622c1bd45f Amendment to goths tavern needed for the coffeegoose quest
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13001 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 14:28:07 +00:00
cavesomething b7ff8f7936 Update existing dialog files to use the new dialog syntax
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12993 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 09:04:21 +00:00
ryo_saeba 1079540801 Try to give more information for the quests.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12392 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-02-11 22:47:13 +00:00
rjtanner ffe60afa9e Replace rocks with a wooden table (longtable) for the booze to sit on in the bar
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11048 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-21 06:55:33 +00:00
rjtanner 2fb05012b7 Replace recently updated oakdoors with new archetype and recycled graphic. Requires archetype r10798 or newer.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10821 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-03 02:42:51 +00:00
rjtanner 6544ff797a Replace and phase out the (old) oakdoor graphic with something different
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10791 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-01 06:00:40 +00:00
kbulgrien 97a884773d - Add a new NPC in Goths that uses an npc_dialog.py message file to drive a
CFDialog.py driven conversation (the conversation was created before the
  author knew about CFDialog or how to use it, but it was too large to put
  into @match as it caused a server crash).  This dialog is structured, but
  state is not tracked due the informational nature of the conversation.
  The NPC drops some hints about things in Scorn that a new player might
  want to check out.  There are no spoilers, but it may serve to help a new
  player find out about some things about scorn that the author did not
  discover for ages.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10638 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 08:09:46 +00:00
rjtanner 101c92e662 Map header updates: Update maps with entrance x & y coordinates, adjust map level difficulty to something slightly more realistic
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9947 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-09-29 05:54:11 +00:00
anmaster f50ad2d7aa Move some magic_ear under floor in /scorn/taverns/goths.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9280 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-06-06 23:13:49 +00:00
ryo_saeba fdd015e4c2 Link the Scorn Royalty maps together.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8609 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-03-24 09:04:38 +00:00
akirschbaum d98265c0f0 Unify Created: and Modified: map headers.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7448 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-02 22:49:56 +00:00
ryo_saeba e5a5e13ade Fix broken dialogue.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7417 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-10-28 10:44:00 +00:00
rjtanner 159bf8a609 Changes due to map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7127 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-08 21:36:34 +00:00
akirschbaum ee878a0da1 Replace "no_pass" with "move_block".
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5940 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-05 21:37:01 +00:00
akirschbaum f8c923aa70 Add explicit 'move_type walk' to all monsters.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5864 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-24 14:31:35 +00:00
rjtanner d3b9619df9 Massive checkin. Went through many, many maps and updated their names (which were either unnamed, used the actual file name or tweaked their spelling and capitilization). Corrected wall sections there were 'incorrect' and obvious when next to doorways or similar openings - basically using the wrong wall sections. Minor cosmetic updates to maps as well. Other changes are due to Map Editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5574 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-19 05:44:55 +00:00
kbulgrien 67c439b1b6 - Tags reordered due to reordering caused by save in CFJavaEditor.
- Furniture and characters moved throughout map so that standing by
  one NPC and talking only gets a response from the NPC closest to
  the player.  Previously several NPCs answered when they were not
  the closest NPC to the player.
- Character msg/endmsg text changes: redundant match strings removed;
  line wrapping removed.  Minor formatting/spelling/grammar changes.
- Dilek:  msg/endmsg refers to empty booze bottle on table, but none
  was there.  Added an empty booze bottle to Dilek's table.
- BRAGH O'LEARY: Add match strings job and name to make it more likely
  that someone can eke conversation out of him.  By default he was so
  standoffish you might not keep trying to chat with him.  His booze
  is fixed to now render on top of, instead of under, the table.
- West-wall wizard in red garb: One of his hints relates to the Pirate
  Den that moved to Wolfsburg.  Adjusted the "easy" magic ear message
  to mention Wolfsburg in that part of the text.  Also added name and
  job match strings.
- Wizard with an aura of great power:  Added match string message for
  job and name.
- Slot machines had "slaying" without a target value.  CFJavaEditor
  removed the lines.
- Bingo room table/altar on same coordinates were split up to put the
  table back in the middle line of tables.
- Dwarf lumberjack:  Now has a "name".
- Mark, 1st Tier warrior, dwarf miner, beholder, dwarf lumberjack,
  wounded fighter, pirate, pupland elves, conjurer, emissary:  Added
  name and/or job matches.
- Reworked pupland elf's conversation a bit.
- Brum talked about the Black Ice mountains, but there are no other
  references to them by that name, so now he tells you where they
  are.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5031 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-19 05:27:09 +00:00
k_ahlers 7480efb4bd Added patch #1531289 from the sf.net-Patchtracker
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4735 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-08-01 10:13:20 +00:00
cavesomething add599b4ca change the scale on world maps to one chain per tile
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4414 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-02-01 14:47:10 +00:00
eracc 6cbe7669c1 Fix Bragh to give hints of what keywords to use.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3972 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-03 00:47:09 +00:00
gros 3b77421609 Update of the maps for CFPython version 2.0.
Update of the IPO-related scripts.
Gros - 18/10/2005


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3899 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-18 18:13:28 +00:00
eracc 622d97b55f Add buttons to stop players getting trapped behind the iron gate that leads
to the basement of Goths. The buttons are on the inside of the area behind
the gate and one under the gate. Still have to pay booze from the tavern
side to get in.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3868 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-14 17:36:57 +00:00
akirschbaum 86c9f02d5e Fix destination coordinates of stairs going up/down. One did end in a wall, the other was off by one.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3666 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-09-17 12:10:08 +00:00
akirschbaum cb142e745e Dragon Emissary now demands exactly emeralds of great value.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3645 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-09-15 22:14:54 +00:00