Commit Graph

677 Commits (6fa85e1d21d1746c9ff39bc94b61985ec2bdf59b)

Author SHA1 Message Date
ryo_saeba ca580f557a Fix potions names for guild altar basements.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13800 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-11 13:18:39 +00:00
Alestan 18ba9f4c19 fixed details in guild_hq
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13762 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 18:16:19 +00:00
Alestan e5b753478e fixed a bug where a square was unique that shouldn't have been
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13761 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 16:37:39 +00:00
alestan e362ff749b fixed a bug where a square was unique that shouldn't have been
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13760 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 16:28:57 +00:00
Alestan ae753bff28 added a common clearance checker for the guilds and rewrote parts of the guild scripts. Also updated the guild maps to use the new scripts
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13751 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 00:38:39 +00:00
ryo_saeba c84809dba9 Fix guilds.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13737 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-04 10:56:25 +00:00
ryo_saeba 11809e6608 Remove invalid attribute.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13728 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-04 09:59:20 +00:00
ryo_saeba 533fd732ab Doors galore, by Khaleh.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13725 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-04 09:23:54 +00:00
ryo_saeba 9d22f05370 Fix Navar destination coordinates in guilds.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13696 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-02 16:46:18 +00:00
Alestan deab9490aa added script to auto configure guild halls and install them, made python guild halls the default for existing guilds
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13664 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-24 07:10:01 +00:00
alestan d18a47601b fixed bug in private shops
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13617 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 18:54:33 +00:00
alestan 7203d5060c added 4 private shops to scorn, replacing the level 0 random map houses
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13609 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 07:23:37 +00:00
alestan b382395362 added 4 private shops to scorn, replacing the level 0 random map houses
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13608 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 07:17:31 +00:00
alestan 8c564b2451 added 4 private shops to scorn, replacing the level 0 random map houses
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13607 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 07:10:48 +00:00
alestan cea0ec49fa added private shop
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13599 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-14 20:07:13 +00:00
alestan 085afc688e updated bank script to handle checks and added a startup script to build a list of face number to face name
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13582 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-13 03:53:28 +00:00
kbulgrien 0b4ca79037 - Grammar police on patrol ;-) Capitalize proper names. Replace use of
passive voice from the Getting out of Scorn description to better match the
  style of other descriptions (but leave other occurances alone).  Replace
  contractions (won't).  past --> pass.  Change use of "you" to "me" to
  improve consistency with the rest of the file.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13456 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-13 02:17:35 +00:00
ryo_saeba 5a7a2147ab Move map to misc folder, remove empty folder.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13453 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:35:35 +00:00
ryo_saeba d238d08f29 Move training center to misc folder.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13451 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:31:09 +00:00
ryo_saeba 27660b7b01 Fix missing lower Devourers level.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13450 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:27:18 +00:00
ryo_saeba 493ca6ffd6 Move Gorokh's final maps to Scorn subdirectory and region.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13449 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:24:13 +00:00
ryo_saeba c6e7795bdf Fix accidentally patched depth.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13448 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:19:05 +00:00
ryo_saeba 536d26f940 Move Valriel's final and treasure maps to Scorn subdirectory and region.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13446 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:16:11 +00:00
ryo_saeba 9f617d4acd Move Lythander's temple to the correct folder.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13444 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:10:52 +00:00
ryo_saeba be04df70e7 Move Devourers's temple to the correct folder.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13443 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-10 10:08:40 +00:00
ryo_saeba fa3b0028f3 Fix guild location.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13429 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-26 07:59:40 +00:00
rjtanner 7c642948ae Added region scorn to Tyl's house map header
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13421 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-20 05:56:22 +00:00
kbulgrien 4b250ad7cd - Improve the response when you do not know the name.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13401 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-13 22:27:59 +00:00
ryo_saeba 8edb405338 Add missing quest definition for mad mage tower.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13392 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-12 17:22:13 +00:00
ryo_saeba 11e00d24a7 Revamp the Mad Mage tower. Now to gain access you need to be a knowledgeable character. Remove gate pass in tower top (moved to lighthouse top).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13390 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-12 16:56:15 +00:00
ryo_saeba ac1bf8fc2f Add the port pass that is/was at the top of Mad Mage's tower.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13383 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-12 14:32:19 +00:00
cavesomething 934430945f Hall of Heroes in Scorn castle, and script to support them.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13378 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-08 15:01:00 +00:00
cavesomething 83c7fcac20 Add a sage to scorn castle who will record the rank and title of the players who pass by.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13373 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-07 23:47:26 +00:00
ryo_saeba e71b3376ad Convert the Mad Mage's tower to a lighthouse, add a specific top.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13366 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-06 13:19:08 +00:00
ryo_saeba adf555924a Fix typos.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13362 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-03 20:52:32 +00:00
ryo_saeba d56dd8f33d Fix tag mistake.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13360 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-03 20:31:57 +00:00
cavesomething 91b2098e35 Use setwhen conditions to advance the aristocracy quest line rather than setting it explicitly
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13356 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 20:36:31 +00:00
cavesomething e8a61943ea Use setwhen conditions to advance these quests rather than lots of checkinvs binding to questadvance scripts
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13355 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 20:35:19 +00:00
cavesomething 2f7f7a3711 Remove full stop that was causing issues for CRE
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13354 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 20:33:44 +00:00
cavesomething ed9c4c81b7 Add parent relationships to the scorn aristocracy quests
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13304 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-25 19:13:28 +00:00
ryo_saeba f489db0dc7 Give a hint about the head.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13298 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-24 14:43:12 +00:00
ryo_saeba 83a14a41a0 Fix suspicious tag.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13290 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-22 15:40:16 +00:00
kbulgrien 57077486e3 - Remove spaces from front of text lines.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13263 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-17 02:48:32 +00:00
kbulgrien cd54262fda - Fix syntax error.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13261 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 19:01:28 +00:00
kbulgrien ac931b8804 - Fix syntax error.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13260 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 18:58:04 +00:00
kbulgrien d29ba7d647 - Fix syntax issue.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13259 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 18:55:30 +00:00
cavesomething bc5f5da8a2 Clear the treasure list from the extra spellbook
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13245 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 01:04:41 +00:00
cavesomething e8e991c96e Add Alfalfa quest
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13244 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 00:46:15 +00:00
cavesomething 52a82c5aea update fran to cope with alfalfa quest
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13243 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 00:44:52 +00:00
cavesomething 48216c05e2 Add new Alfalfa's house
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13242 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 00:44:02 +00:00
cavesomething 9222a7d366 Move Alfalfa's house and turn it into eric's house
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13241 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-16 00:43:36 +00:00
ryo_saeba 4b45fe5b30 Fix JSON.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13235 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 21:13:59 +00:00
ryo_saeba d0d9ec4c45 Fix JSON.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13234 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 21:11:24 +00:00
ryo_saeba 3efc5bbdae Fix JSON.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13233 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 21:08:28 +00:00
ryo_saeba 4ee9764e75 Use blank lines instead of \n.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13224 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 13:36:12 +00:00
kbulgrien 22684057c7 - Add a little "easter egg" that can be developed into a more significant
map, but that serves to introduce the new "manhole" arch.  The cistern
  is boring at present, and could use some interesting content.  Anyone?


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13217 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-14 04:35:09 +00:00
kbulgrien 14639ff5db - Fix up the anchor name per prior commit that renamed the head object.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13215 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 22:31:30 +00:00
kbulgrien 6f4b6b20f5 - Remove unneeded or duplicate no_magic or floor tiles.
- Add no_magic to the portions of the counter at the top of the map.
- Add a ships wheel as a decorative item since the room looks so bare.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13213 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 22:15:53 +00:00
ryo_saeba bc860654be Make exits coherent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13209 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 21:52:19 +00:00
ryo_saeba 10d53c30fb Make exits coherent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13206 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 21:43:29 +00:00
ryo_saeba a860e3737f Make exits coherent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13203 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 21:39:22 +00:00
ryo_saeba 270dbd9109 Make exits coherent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13202 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 21:29:51 +00:00
ryo_saeba 5e39a77b26 Change doors to need to apply them.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13200 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 21:23:06 +00:00
ryo_saeba 9c54f94229 Change doors.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13198 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 21:19:20 +00:00
ryo_saeba 3b836a02f5 Make kind 'no_damage', and remove other flags.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13196 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 20:19:44 +00:00
cavesomething 3b2982b23e Detect status of aristocracy quest rather than hero of scorn marker in order to open the gate
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13191 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:50:53 +00:00
cavesomething dc766720d8 Trigger the gate on aristocracy quest status rather than the hero of scorn marker
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13190 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:42:44 +00:00
cavesomething 3298c48600 Use quest state rather than markers to handle access to the various suites
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13189 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:41:06 +00:00
cavesomething c1aa1d2b3c Remove quests from the hall of quests, the magistrate and king are now the starting points for these.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13188 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:34:14 +00:00
cavesomething 926eebe72c Add dialog for the king of scorn, make castle2 use this dialog
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13187 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:33:08 +00:00
cavesomething 3e4a0e6a18 Add quest handlers for city-based final maps for royalty quests
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13185 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:20:58 +00:00
cavesomething b0d94cb385 Change the lower floor of the castle to use the new magistrate dialog
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13182 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 18:58:54 +00:00
cavesomething 25daf7f319 Dialog rules for the scorn magistrate
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13181 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 18:55:50 +00:00
cavesomething dd2fc7c03d Fix syntax errors in .msg file
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13180 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 18:44:50 +00:00
cavesomething 17f338436d Add a dialog file for the servant in the temple of gaea, one of the scorn royalty quests will involve speaking to her.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13179 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 18:42:42 +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 b267c61faf Trigger quest update on finding entrance to Animator's lair
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13176 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 17:04:23 +00:00
cavesomething ec02e7730b Improve wording of one of the stage descriptions
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13175 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 17:01:21 +00:00
cavesomething 8438d425a0 Quest Definitions for Aristocracy Quests
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13172 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 16:50:35 +00:00
cavesomething 97b04aafe9 Add replies to the gate guard dialog
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13171 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 16:36:09 +00:00
cavesomething 9df360f4c6 Add Replies for the portguard
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13170 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 16:32:35 +00:00
cavesomething 7f00ebb782 Add Replies to the Gork quest dialogs
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13169 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-11 23:49:13 +00:00
kbulgrien 921f3656bf - Fix movement block for the office counter so that you cannot get the passes
by just walking over it.
- Add some scenery.  Put an old anchor in the corner of the room.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13168 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-11 04:39:15 +00:00
kbulgrien 08b27fb27e - Make the portgate view of the portoffice more consistent with the current
inside of the office.
- Turn smoothing off on some floor pieces to make sure grass does not invade
  the interior of the office.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13161 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 03:25:56 +00:00
cavesomething bf66a9910b Add a connected value to the rule that gives the key, so that another door in the south east of the map opens at the same time.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13149 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-08 09:07:58 +00:00
cavesomething 0ebb42f625 Tidy up wall tiles to look right
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13148 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-08 09:07:02 +00:00
cavesomething 4176cdb0a3 Fix stage numbers in these dialogs
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13147 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-07 23:55:13 +00:00
cavesomething 95b5b8bb02 Fix syntax errors
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13128 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:38:26 +00:00
cavesomething 1ff377c3e7 Fix include paths
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13127 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:36:22 +00:00
cavesomething f662143e23 Fix syntax errors in dialog files
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13126 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:35:08 +00:00
cavesomething c4ffa01239 Break out the smith .msg file into two separate files
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13125 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:33:46 +00:00
cavesomething 1422f597ae Correct some errors in dialog script
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13123 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:04:29 +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 e97c633c67 Fix the paths to npc_dialog.py so that this script actually gets called.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13045 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-30 07:58:48 +00:00
cavesomething ab373f8fca Add wheelbarrow to cornerbrook
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13011 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 22:02:26 +00:00
cavesomething 5ca4a0f0ce Merge the dialog rules for the gate guards into a common .msg file that both
can include.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13009 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 17:15:07 +00:00
cavesomething a0aa175a40 Fix Typo in quest include
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13006 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 16:01:52 +00:00
cavesomething 40c9018f38 Add the gorks quests file to the includes for the scorn file so it is picked up properly.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13003 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 14:43:47 +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 f43e69e18e Questify the 'Esmeralda the goose' quest.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13000 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 14:10:29 +00:00
cavesomething ff2e587c25 Quest handling for Terry's farm. This commit includes some quest definitions that are not implemented on the maps yet.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12999 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 12:59:06 +00:00
cavesomething ea59e266e7 Questify Gramps Malone's two fedex quests.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12997 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 12:40:09 +00:00
cavesomething 36aa6f7a5b Questify Gork's treasure hoard.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12996 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 10:58:22 +00:00
cavesomething 2e7afab411 Add a 'quest' to get armour custom-made by the smith in scorn armour shop.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12995 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 10:22:43 +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 bd67e52ee6 Add region.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12869 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-07 22:14:21 +00:00
ryo_saeba 54b8b0932c Rename cauldron as to not confuse players, per anonymous suggestion on tracker.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12622 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 09:46:57 +00:00
ryo_saeba 054058c980 Have the priest give (almost) free restorations, if the player knows the answers.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12527 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-02-28 11:53:13 +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
ryo_saeba 5aaea4f03f Apply patch 'Added exit lever to Devourer's temple lower level' courtesy Otto J. Mäkelä.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12354 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-01-18 22:54:00 +00:00
ryo_saeba 96cd28b6b1 Small house, with books to read.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12295 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-12-05 16:57:56 +00:00
akirschbaum b5487f6465 Remove redundant attributes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12238 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-11-07 15:07:19 +00:00
akirschbaum 20f5408c4d Adapt exit coordinates to server r12199.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12200 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-10-22 23:06:07 +00:00
anmaster a2dd4e4dc7 Fix tables in /scorn/houses/wizardw to render below books that are supposed to be placed on top of them.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12198 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-10-15 12:29:19 +00:00
kbulgrien 20f781ce95 - Rework some grammar and remove linebreaks from a message.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12132 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-08-04 01:14:42 +00:00
akirschbaum 72e393f00f Fix #2816641 (/scorn/misc/library pay mat broken).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12068 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-07-14 19:56:08 +00:00
akirschbaum 3e616eb104 Run MapNormalizer editor script on all map files.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12060 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-07-12 14:47:05 +00:00
kbulgrien 8fa77454ef - Re-orient the armourshop to have the door inside the building match the
location on the world map by rotating the map 180 degrees and fixing up
  walls and fences.  To keep the door style the same, the door was moved
  over by one.  To make the player exit on the world tile that has the
  door on it, the target coordinate was also adjusted.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11980 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-06-23 03:50:05 +00:00
akirschbaum 6fe030872a Remove 'rod' shopitems specifications; these have been merged into 'horn'.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11922 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-06-17 09:05:54 +00:00
akirschbaum 16898b2df9 Replace obsolete attributes can_use_rod, can_use_wand, and can_use_horn with can_use_range.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11778 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-06-08 22:26:59 +00:00
kbulgrien 97f78ec644 - Add a few more legitimate replies to the key question to avoid reset of the
conversation that would be aggravating.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11670 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-05-03 22:50:54 +00:00
kbulgrien 3ef00d358b - Remove duplicate floor pieces and duplicate monsters stacked on top of each
other.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11669 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-05-03 20:58:09 +00:00
rjtanner 38379114b7 Removed duplicate passes (set the qty to 1) for theservant_ found in /scorn/temples/ruggilli2
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11446 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 20:54:20 +00:00
rjtanner e1ed299f38 Replace the very dangerous for new players (and multiplying) centipede with a Gnoll Champion in Beginners2 (/scorn/misc/beginners2)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11441 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 06:02:44 +00:00
rjtanner f579a29995 Make the King and Queen of Scorn (/scorn/misc/castle2) level 120 to prevent them from being charmed by players
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11440 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 05:59:06 +00:00
anmaster 39ac202b17 Add some missing dungeon_magic tiles to /scorn/shops/scorn.sale1.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11359 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-06 20:04:58 +00:00
anmaster 43cbabaca4 Fix part of bug 2457751 "Unpaid items work for some things...": Make some floor in /scorn/shops/light_shop shop floor.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11346 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-06 14:05:00 +00:00
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
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
rjtanner 58f47a9fec Cosmetic wall update
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10138 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-21 01:41:41 +00:00
rjtanner 07b63b1a37 (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@10137 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-21 01:40:00 +00:00