Commit Graph

53 Commits (b09efe736bd35479e6fd76cb15a10b4b4da03903)

Author SHA1 Message Date
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
ryo_saeba 12161b3e08 Replace stairs up with stairs down, since it's a higher level.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15039 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-04 08:27:28 +00:00
rjtanner 4a24723e9a Redesigned the entrance level to Friendly Giant's Tower in Scorn. Map now reflects a tower (aka round.) Map considered an outdoor map so darkness or time of day is visible when inside; added light sources. Updated world map for new map entrance destination. Updated level 2 since the stairs on level 1 have moved.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14998 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-08-24 04:36:13 +00:00
ryo_saeba 15380baffd Remove invalid attribute.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14351 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-03-20 09:28:02 +00:00
ryo_saeba ebaebbf5a0 Merge split lines.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14350 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-03-20 09:25:21 +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 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
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 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 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 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
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
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
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
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 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
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 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 e9318a4576 Re-correct creation dates
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9941 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-09-28 22:46:55 +00:00
rjtanner 698c17f022 Map header updates: Correct creation date in map header that was changed in r7448, it was using the wrong month; 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@9940 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-09-28 06:59:26 +00:00
rjtanner 747136191f Context correction in magic mouth messages, replaced parish (church community) with perish (to destroy)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9365 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-06-24 17:33:23 +00:00
anmaster 0f7decfa1d Add missing floor arches under walls in /scorn/kar/creepy.house and /scorn/kar/creepy.house2.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9273 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-06-06 14:02:24 +00:00
akirschbaum 772638b98d Run MapNormalizer script on all maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9176 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-30 07:32:24 +00:00
anmaster d96ee67454 Yet more fixes for redundant patterns in @match (it is case insensitive, but a lot of maps treated it as if it was case sensitive). Mostly done with a script.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9146 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-23 10:52:18 +00:00
kbulgrien 53f2b30307 Rename dwall3_3 to dwall_3_3 after removing incorrect Object in
arch/trunk/wall/dwall/dwall.arc.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8208 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-01-19 00:56:11 +00:00
tchize fb457124b3 Make the gork's treasure quest use python for npc dialog. It's now mandatory to go throught full dialog to get the treasure key, knowing password is not enough
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8009 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-12-22 13:44:37 +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
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
rjtanner b40118ffca Renamed maps (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. Renamed the cannery map to Animal Quarantine because that is how it's referred in the world map. Renamed the dtabb/cave outside of Scorn to Gnolls Grotto - since it's often confused as part of the goblin chief / royalty quest map. Renamed dtabb/cave3 to Goblin Den. Other changes are due to Map Editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5586 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-23 03:21:14 +00:00
kbulgrien d70d507401 - Capitalization on Gork's name, remove line break from sign message.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5515 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-12 03:52:39 +00:00
kbulgrien 6915e8ddb1 - Gork conversation adjustments. Match strings are now regular expressions.
Reduce redundant use of keyword.  Spelling/punctuation tweaks.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5014 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-08 02:41:08 +00:00
kbulgrien 58b3227f11 - Minor punctuation and case adjustment.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5013 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-08 02:21:06 +00:00
kbulgrien 44bc61f263 - Minor punctuation and case tweaks.
- Mork match strings updated to regular expressions.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5012 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-08 02:19:42 +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
akirschbaum e6839878a8 Hide invibisle exits, magic mouths, and buttons below floor to prevent detection by show invisible.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3636 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-09-15 18:19:57 +00:00
ryo_saeba d1d8b472f0 Applied patch #1145089 (cavesomething) to add region support
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3142 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-03-15 21:44:56 +00:00
akirschbaum 5bd48d9600 Remove surplus dot from end of key name.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3114 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-03-09 20:42:17 +00:00
temitchell 558ebd8c85 - minor fix so the magic-ear is more reliable - BUG 977265
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2848 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-07-04 15:48:22 +00:00
temitchell 1ea8516bd0 - fix maps with old image notation (storing more than head).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2721 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-04-11 00:33:45 +00:00
mwedel 8f14c92525 Fix bug in Mork's speech - he should be asking about Gork,
not himself.
MSW 2003-10-05


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2375 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-10-06 03:14:10 +00:00