Commit Graph

2707 Commits (926eebe72c2c6a0325b2e7df99f8d5502148f9fb)

Author SHA1 Message Date
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 afdce81ffb Add quest events to the sword that the lord spectre carries
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13186 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:27:20 +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 d6550db2b7 Add final map handling for the non-city based royalty quests
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13184 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:17:11 +00:00
cavesomething 51a19486a4 Fix name of script in comments
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13183 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:08:41 +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
ryo_saeba ed07318ed6 Remove useless detector and marker.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13178 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 18:26:15 +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 ba54fd3d54 Add Events to trigger updates to the royalty quests on entering the appropriate caves
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13174 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 16:59:56 +00:00
cavesomething a3fb324070 Rename Hermes' Inn to make it easier to refer to in directions
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13173 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 16:58:18 +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
cavesomething 16804860a1 Fix the counting of rules, errors and warnings in included files
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13166 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 18:16:29 +00:00
cavesomething ba77a3862f Change the names of the recognised fields
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13165 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 18:15:16 +00:00
ryo_saeba 65daabb52a Adjust quest to new dialog system.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13164 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 17:51:31 +00:00
ryo_saeba 0d07667c50 Add a 'prefunction' to rules to have special processing.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13163 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 17:50:57 +00:00
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