crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,222 Commits
1 Branch
0 Tags
108 MiB
Commit Graph

2222 Commits (5308835604167e000da0ca1514942d2689d78163)

Author SHA1 Message Date
kbulgrien 5308835604 - Document how to successfully create rules that do not need any pre or post 
conditions (by supplying and empty list).
- Add exception handling to matchConditions() and setConditions() and output
  a debug log message to facilitate debugging broken dialogs when the rules
  contain malformed condition lists.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10635 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-21 07:30:14 +00:00
kbulgrien 9fbc7d83ea - Add a comment noting that when debugging, a server restart is needed to put 
code changes into effect.
- No functional changes.
- Whitespace changes.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10634 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-21 07:02:53 +00:00
rjtanner 9aea156b4b Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10633 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-21 03:07:32 +00:00
rjtanner 319b4d2a2d More descriptive names to the Darcap Circus maps 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10632 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-21 02:58:32 +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 40b06c1c0a Remove no longer used name_pl tags from objects (terrain, buildings and ships) in the world maps 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10627 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-21 01:40:13 +00:00
akirschbaum 3f7dd81011 Make editor scripts work with latest Gridarta. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10625 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-20 21:58:48 +00:00
rjtanner b6db99ca2b Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10556 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-19 02:17:04 +00:00
rjtanner cde03c5ba0 Map header update and reformatting - no functional changes 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10546 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-19 01:30:46 +00:00
kbulgrien 7464daa57f Replace hut named lighthouse with one of the archetypes that actually looks 
like a lighthouse with a glow radius.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10521 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-18 07:14:16 +00:00
kbulgrien a5c2e1259f Minor dialog rework: Remove mid-sentence line breaks and break at possible 
paragraphs instead; fix capitalization/grammar/spelling; give fatman a name.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10520 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-18 05:36:54 +00:00
rjtanner 9f289802cb Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10519 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-18 03:25:04 +00:00
rjtanner 52a977a713 Apply region (whalingoutpost) to map 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10518 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-18 03:06:49 +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 3c2f52f25f Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10505 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-17 06:31:23 +00:00
ryo_saeba 9c6e4faf99 Turning boat example map. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10490 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-16 18:59:26 +00:00
akirschbaum 28850717eb Fix typo. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10484 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-16 08:53:45 +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 2db9e437fd - Reinstate an comment accidental deletion that occurred in revision 10421. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10471 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-15 09:08:11 +00:00
kbulgrien 9977b1298f - Add in a comment that was edited into the CFDialog page on the wiki. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10470 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-15 08:43:40 +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 0e01ae159d Add a comment that references ../scorn/kar/gork.msg as an example of how an 
npc_dialog.py conversation can be made player friendly by using multiple
precondition flag values.  Without using this capability, conversation paths
can tend to be too linear or rigid and therefore produce unnecessary player
frustratation.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10467 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-15 05:04:45 +00:00
kbulgrien 5f6869717a Comment the code, convert a few odd tabs to spaces, and make a couple minor 
formatting changes to improve the consistency of the class structure.  No
functional changes made.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10466 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-15 04:52:11 +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
kbulgrien 1da5f75c92 Add an OR function to the CFDialog prefunction as it presently only supports 
AND.  To follow precedent of using "|" in the match string (in both CFDialog
and @match), use it as a delimiter inside the prefunction value.  The value
add is particularly that one can design conversations to loop back into
prior states without requiring the conversation to reset and start back
at the beginning.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10428 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-14 06:28:19 +00:00
kbulgrien 5b1661b029 Avoid DeprecationWarning: raising a string exception is deprecated by making 
a user-defined exception handler.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10423 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-14 04:44:17 +00:00
kbulgrien 7e26094865 - Documentation improvements and an additional example. No functional changes. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10422 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-14 02:45:07 +00:00
kbulgrien 5ca76c340c Like the @match system, CFDialog now converts both match strings and things 
the player says to lowercase before checking for a match.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10421 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-14 01:28:30 +00:00
rjtanner b311c17606 Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10420 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-13 02:51:04 +00:00
rjtanner aa76370219 Text correction in map name (LEvel -> Level) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10403 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-12 03:15:46 +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 cfbaf38455 Update churchtower map with a unique (and more descriptive) map name 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10388 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-11 03:02:52 +00:00
ryo_saeba 20edc561ad Revert stand_still that was added per bug #1930002, since it's apparently supposed to be the right behaviour. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10321 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-09 17:24:33 +00:00
rjtanner c1895a29d9 Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10301 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-08 07:27:30 +00:00
rjtanner 6341fe8c9a Update entrance coordinates from World map to Pygmy Forest 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10277 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-08 00:03:17 +00:00
rjtanner c15865b464 Added map entrance x & y coordinates 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10276 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-07 02:14:17 +00:00
rjtanner 1298b9c66c Add map difficulty level 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10274 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-07 02:10:56 +00:00
rjtanner 3ad234cbb9 Added map entrance x & y coordinates, updated map exits/entrance coordinates so they lined up properly 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10273 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-07 02:08:20 +00:00
rjtanner 3701ac8ad4 Update map with entrance x & y coordinates (missed in previous commit) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10269 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-06 02:43:22 +00:00
rjtanner bfe6152bba Update map with entrance x & y coordinates 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10267 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-06 02:40:34 +00:00
rjtanner 37b90c4394 Correct y entrance coordinate typo (121 -> 21) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10264 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-06 01:38:25 +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 ee1139fb24 Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10250 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-11-03 06:24:45 +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