Commit Graph

2717 Commits (270dbd91097b4a919b1338cd9893659552bc531a)

Author SHA1 Message Date
cavesomething 9f159a519a Add dialog_check.py - a script to check dialog files for common errors.
Add ## DIALOGCHECK blocks to all existing action scripts
Allow the pre 'quest' check to express ranges of stages or an exact 
stage to be at


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13124 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:11:23 +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 e87c74ad9a Change the .msg files for the test map to use a mixture of absolute and relative paths
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13122 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 10:48:10 +00:00
cavesomething 96d5f0fd05 Allow include blocks to use either relative or absolute paths to reference other .msg files.
Maps still need to specify a full path in the slaying field of an event say.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13121 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 10:46:35 +00:00
cavesomething 1c6503f49c Allow include rules to contain a "pre" block which will be evaluated to decide
whether to allow the file(s) to be included. This is treated in exactly the same
way as the "pre" blocks for all other rules.
A test map demonstrating this in use is included.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13049 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-30 17:19:34 +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 bb1f5d66cf Break out the CFDialog python script into a dispatcher for a number of smaller, action oriented scripts.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13014 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 23:43:20 +00:00
cavesomething c5899c93a0 Change the timer condition to match what the sign says.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13013 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 23:30:37 +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 30f469526c Updates to the quest test map and a number of .msg files that demonstrate
how to use include to source rules from different files.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13008 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 17:13:03 +00:00
cavesomething 22e874afb9 Change the npc_dialog.py file to allow message files to include other message
files.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13007 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 17:04:29 +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 b796238d0e Change the custom name of the red dragon mail to Red Dragon Mail
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13005 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 14:59:53 +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 60f70e48b7 A Simple introductory quest in the newbies house.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12998 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 12:48:36 +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 37493397cf Update test map to use new dialog syntax
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12994 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 09:10:07 +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
cavesomething a2fe1ab50d Updates to the dialog handling files to support more powerful syntax
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12992 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 08:43:11 +00:00
cavesomething 52549351f5 Move npc_dialog.py to the dialog directory rather than misc/
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12991 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 08:40:30 +00:00
cavesomething c99ff23ca6 Revert the files added in commit 12790, these will be created from the original versions instead.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12990 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-27 08:39:14 +00:00
cavesomething ea55424150 Quest definition files using the new quest definition syntax
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12983 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-26 20:08:02 +00:00
cavesomething 9cd4cc6697 Add the two quests referenced in the test map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12973 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-26 15:54:37 +00:00
cavesomething b136289de6 A test map and associated .msg files that demonstrate the things that can
be done with the test scripts and extended dialog files. The signs describe
what should happen at each place, this map is intended to also track buggy 
behaviour and regressions.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12972 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-26 15:40:18 +00:00
cavesomething caf5e12e1c Two scripts which can be used to handle quest interaction with maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12971 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-26 15:35:12 +00:00
cavesomething 1ceafbb899 Add CFNPCDialog.py and the wrapper script dialog/npc_dialog.py, a wrapper script for advanced dialog handling.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12970 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-26 15:34:26 +00:00
mwedel b42aba51ef Add breaks to mark different versions, add 1.50.0 break.
MSW 2010-04-25



git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12956 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-26 04:43:28 +00:00
alestan 2037a72ac6 Added CFDataBase for handling generic python objects
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12874 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-08 18:04:05 +00:00
kbulgrien 380955f9f1 - Give the keys to the House of Treasure reasonable names other than key1,
key2, and key3.  These aren't secret keys anyway and there are far too
  many keys that are generically named anyway.  Add descriptions too.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12872 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-08 02:18:50 +00:00
alestan de8ebe64df added dir to /python for handling the private shops
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12871 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-07 22:18:35 +00:00
alestan 05cb47d794 added newmaps dir to test, for testing new maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12870 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-04-07 22:14:36 +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
cavesomething b49b83fa35 Change the quest definition to conform to the new standard.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12746 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-29 23:16:46 +00:00
meflin2 acee4824da more python guild updates
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12727 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-25 17:33:10 +00:00
ryo_saeba 2608ede68c Entrance to the random map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12630 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 13:10:10 +00:00
ryo_saeba ec466dcc46 Fix exits to the various elemental houses, get ready for a new map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12629 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 13:09:37 +00:00
ryo_saeba 2a064bef31 Add lights, tweak initial speed.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12628 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 12:38:53 +00:00
ryo_saeba b0cbe2f011 Implement the water house.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12627 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 12:37:36 +00:00
ryo_saeba a53b7eecdb Implement the earth house.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12626 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 12:32:58 +00:00
ryo_saeba 9b4f3a6129 Implement the air house.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12625 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 12:26:14 +00:00
ryo_saeba 0d51ad3158 Totally revamp the elemental houses, so they are now exhibits (work in progress).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12623 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-03-13 12:09:30 +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