Commit Graph

399 Commits (52b8c91f49b67e530b7515672a1bf1815e40e88d)

Author SHA1 Message Date
rjtanner 1f8b123234 Insert floor tiles underneath the exits
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11049 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-21 06:57:25 +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 a4adbdfa98 Cosmetic wall changes for nicer merging
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11047 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-21 06:51:50 +00:00
kbulgrien e5b940e57a Fix typo and remove mid-sentence line breaks.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11030 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-20 10:17:09 +00:00
rjtanner 45cc18862b Restore unique name on the exit from Scorn Magic Shop to world map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10992 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-16 23:47:37 +00:00
rjtanner 6b30b61a67 Restore farewell message on the exit from Scorn Sale Shop to world map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10991 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-16 23:45:40 +00:00
rjtanner ae90c0bd99 Restore unique name on the exit from Scorn Bowshop to world map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10990 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-16 23:42:19 +00:00
rjtanner d5f8296cb9 Moved /scorn/anthony/prison.1 to /scorn/misc/prison.1, updated map paths to use prison.1 where necessary
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10983 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-16 07:21:02 +00:00
rjtanner 27ab36d689 Rename /scorn/anthony/prison to prison.1 before moving it to the same directory (/scorn/misc/prison) as the other half of the map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10982 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-16 07:14:50 +00:00
rjtanner 569ba1b7d8 Add more no_spell tiles under the fence around Scorn City Hall to help prevent players from using dimension door spell to access areas they shouldn't
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10980 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-16 06:54:29 +00:00
rjtanner 1a02218943 Per web forum post and IRC discussion - attempt to make things somewhat easier for low level players - reduced the detect curse altar cost from 25gp to 25sp
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10969 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-14 07:22:14 +00:00
rjtanner ab7821af2e Change altars and gates in Mercenaries house so that players can't trap themselves inside the rooms - the gate stay permanently open (or until the next map reset) after hiring one of the mercenaries
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10967 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-14 06:47:31 +00:00
rjtanner 4d225e1403 Cosmetic wall change with how swall (fence) merges with nearby walls
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10966 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-14 06:17:25 +00:00
rjtanner 2cbb49235d Update wall sections to match nearby walls or styles, requires archetype update r10841 or newer
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10946 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-13 09:24:51 +00:00
rjtanner 90e3203c8f Replace blocked (solid black square) arch with cave_15 (solid grey square) archetype, requires archetype update r10843 or newer
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10943 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-13 08:57:45 +00:00
rjtanner 46aad5d674 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@10839 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-05 00:57:53 +00:00
rjtanner fdb9d72725 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@10838 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-05 00:56:01 +00:00
rjtanner 2d14bb60dd Cosmetic layout changes and updates. Requires archetype r10798 or newer.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10832 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-04 06:57:14 +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 a66b1c21db Add no_spells tiles underneath the fences to prevent players from using dimension door to access city hall or areas not meant for player access
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10820 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-03 02:05:01 +00:00
rjtanner b71349dc08 Cosmetic wall changes for smoother merging
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10794 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-01 06:13:51 +00:00
rjtanner acc84a640e Cosmetic change with how fences (swall) merge with nearby walls
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10793 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-01 06:10:29 +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
rjtanner 8eb38dc972 Replace and phase out the (old) oakdoor graphic with something different
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10787 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-30 07:31:16 +00:00
rjtanner efb267fc36 Redesign House of Healing so the interior somewhat matches the building exterior
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10741 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-27 01:23:12 +00:00
lalo 7e5b35bd79 at long last, the tample of Valkyrie :-)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10738 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 19:48:36 +00:00
rjtanner 70de3859b9 Cosmetic change, inserted a floor tile (vs lava) underneath the dwarven blacksmith
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10729 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 02:03:31 +00:00
rjtanner 0c25575779 Move Puddings Place map to the Scorn Harbor - the acid using monsters in this map are too deadly and crual to new and unprepaired players
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10711 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 03:22:37 +00:00
rjtanner e50e10fb4b Added missing plural names to the balms and potions
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10710 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 03:09:18 +00:00
rjtanner d4f4e390df Changes to the shop layout - more item types for sale (all levels of Potions of Life, balm of cure poison, balm of minor healing) in slightly different locations to make room for the new inventory
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10709 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 03:03:20 +00:00
rjtanner 92b8058d65 Cosmetic change with how swall (fence) merges with nearby walls
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10708 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 02:40:16 +00:00
kbulgrien 6da4348d23 - Remove a redundant rule from the NPC dialog.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10639 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 08:15:05 +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 f9f4972aa6 Convert platinum payment altars to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10631 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 02:37:29 +00:00
rjtanner 21ff951cf8 Fix broken conversion table
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10517 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 03:05:42 +00:00
rjtanner 65fccfc7f5 Additional lever to prevent players from being trapped in the map, as pointed out by kbulgrien
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10473 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-16 05:56:21 +00:00
kbulgrien b6726a40ea Gork should not reset the conversation just because you say the wrong
word!


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10472 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 23:08:27 +00:00
kbulgrien ba2f19f2dc Modify CFDialog.py to use a list of strings for the keywords instead of the "|"
delimited string for consistency and to reduce the need to specially parse the
string.  There seems no particular reason to stay with the "|" delimiter (and
@match use of it does not seem compelling enough to override the benefit of
removing the oddball parameter from both CFDialog.py and npc_dialog.py scripts.
This commit also updates every known dialog that is affected.  Also updated
are the comments in both dialog scripts to reflect the change.  In CFDialog.py
also pluralize some identifers to better reflect that they are used for lists.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10469 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 07:55:59 +00:00
kbulgrien dc000da14c Difficulty 1 for spiders seems way too low. Other maps with spiders are set
to difficulty 5, so changing this one to 5.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10468 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 07:34:57 +00:00
kbulgrien dcecb2b60d The prior modification to CFDialog used "|" as a delimiter for multiple
precondition values and overlooked the fact that the precondition syntax was
already defined to be a list that could contain multiple values without
resorting to packing them into a single string.  This modification dispenses
with the prior un-pythonic enhancement to CFDialog, and establishes a format
that is more consistent with the rest of the rule structure.  As a result of
this change, Gork's conversation is also updated to work with the new version.
A dependent script ./misc/npc_dialog.py remains unaffected by this change.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10465 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 04:07:05 +00:00
kbulgrien 2c008d88cd Fix, and improve, the Gork dialog in the scorn/kar Gorks Quest. Add some new
content, and make the conversation a lot more flexible so it is not necessary
to reset from the beginning so much.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10432 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-14 06:34:06 +00:00
kbulgrien aa8f1309f9 Fix spelling and remove spurious blank lines from within the JSON.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10430 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-14 06:31:31 +00:00
ryo_saeba 6d9f94ba01 Apply patch #2133038: scorn kitchen steak fix.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10391 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-11 10:47:58 +00:00
rjtanner 4920997b4d Restore darkness setting to str-tunnel map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10262 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-06 01:01:42 +00:00
rjtanner 2f529bed48 Convert silver payment altars to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10252 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-04 21:07:55 +00:00
rjtanner 6e562575bd Update conversion tables to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10249 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 06:11:44 +00:00
rjtanner 295930a80a Convert platinum payment altars to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10248 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 06:06:25 +00:00
rjtanner bd6ad73434 Convert platinum payment altars to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10247 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 06:02:16 +00:00
rjtanner 801d4a5a8e Convert gold payment altars to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10245 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 05:44:22 +00:00
rjtanner 76158c3c75 Update conversion tables to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10241 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-02 07:29:04 +00:00