Commit Graph

2683 Commits (b66dcbeb8945481bd1906c4a7cc7cfdcee48c4fc)

Author SHA1 Message Date
ryo_saeba b66dcbeb89 Remove the requirements, assuming player can always say anything.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13162 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 17:20:36 +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
ryo_saeba b5b9dfda24 Add 'replies' to the dialog system, to let the player know what she can say.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13158 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-08 13:16:13 +00:00
ryo_saeba 4f0c75aac3 Use Crossfire.NPCSay() to have NPCs talk after the player.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13157 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-08 12:28:49 +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 59ce1f64fa Check multiple token conditions correctly
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13144 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-07 12:19:43 +00:00
cavesomething d3c7e5d24f Change location description on sign to point to where the building actually is.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13133 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-06 11:18:29 +00:00
cavesomething 39d497e747 New Script to enable map connections to be triggered depending on the state of a quest.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13131 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 16:10:47 +00:00
cavesomething 49eedf7f5f Fix parsing of stage numbers
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13130 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 15:02:44 +00:00
cavesomething 46f0d65cb7 Add useage note in comments
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13129 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:42:37 +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 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