Commit Graph

379 Commits (84785d94cd35e475215a9b5c69fe5261bf7e7ab1)

Author SHA1 Message Date
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
rjtanner 6166035086 Cosmetic wall changes with how they merge with each other, especially swall (fence)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10240 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-02 07:03:14 +00:00
rjtanner daffc86c79 Convert platinum payment altars to accept payment of any coin type
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10238 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-02 06:36:36 +00:00
rjtanner b9883e9c59 Map name updates for the Gates in Scorn
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10226 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-30 01:48:20 +00:00
rjtanner d599ed06d1 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10210 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-29 00:34:13 +00:00
rjtanner 3ee4f83800 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10209 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-28 19:58:18 +00:00
rjtanner 984b5e3e7c (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10207 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-28 01:10:23 +00:00
rjtanner 3073b0db4c (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10205 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-27 05:14:45 +00:00
rjtanner 3b20798a3e (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10199 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-26 07:09:18 +00:00
rjtanner c36c5b3b33 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10198 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-26 06:35:49 +00:00
rjtanner 7b7e79ff05 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10197 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-26 02:06:25 +00:00
rjtanner 15edcb83cc (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10196 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-26 01:22:39 +00:00
rjtanner 15eb4bfa2f (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10185 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-25 06:24:13 +00:00
rjtanner 9928fe63a5 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10184 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-25 01:19:10 +00:00
rjtanner b347572a31 Cosmetic changes with how fences (swall) merges with nearby walls
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10183 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-25 01:04:28 +00:00
rjtanner 3fda522055 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10181 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-25 00:54:52 +00:00
rjtanner 7245c1ba6e Cosmetic changes with how fences (swall) merges with nearby walls
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10161 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-23 22:32:25 +00:00
rjtanner 9d7238c7c7 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10160 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-23 22:28:06 +00:00
rjtanner 7ff2728939 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10157 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-23 01:39:37 +00:00
rjtanner 005aeda064 Cosmetic wall (fence) changes
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10148 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-22 01:05:47 +00:00
rjtanner 05cd0be130 (Inprogress checkin) Update map names to make them unique and more descriptive
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10147 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-22 00:56:46 +00:00