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

210 Commits (e71b3376adbccfaa5180a0eb1f24471379ddb521)

Author SHA1 Message Date
ryo_saeba ec18147f56 Fix exception syntax for Python 2.5.2. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13363 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-06-06 08:32:03 +00:00
ryo_saeba 287eb34c9e Fix animation query. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13349 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-30 14:57:02 +00:00
ryo_saeba 27e16a4a78 Disable talking while the NPC is animated. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13345 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-30 14:28:30 +00:00
ryo_saeba 1ab27daf16 Hook to animate through cfanim. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13344 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-30 14:27:37 +00:00
ryo_saeba 764c046bdf Add a 'questdone' precondition to vary dialogs. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13339 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-30 10:43:07 +00:00
ryo_saeba e0538867c4 Add 'npctoken' and 'setnpctoken' pre and post conditions, to keep data in NPC instead of player. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13336 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-30 10:11:58 +00:00
ryo_saeba 38295fe7da Force reply type to be an integer. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13328 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-29 21:51:55 +00:00
ryo_saeba 279478325d Fix 'WriteKey()' needing a string, not an integer. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13327 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-29 21:44:05 +00:00
ryo_saeba c3a992c3ef Use the 'talked_to' key to make NPCs stop when talked to. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13326 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-29 21:22:45 +00:00
ryo_saeba b5a0b9a37e Script to punish a player from killing a NPC. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13320 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-29 19:54:58 +00:00
ryo_saeba 0559e8bc68 Fix import before comment. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13318 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-29 19:51:24 +00:00
ryo_saeba 1fe17f133c Script to punish tring to sell a protected item. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13315 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-29 18:23:27 +00:00
cavesomething 4aa31a8f4d Handle the Include rule subclass of Dialog class more sanely, this fixes an issue with include rules and pre-functions. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13264 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-17 13:10:11 +00:00
cavesomething c011312943 Replace LOG messages with proper exception handling, ensure that a check which raises an exception causes a rule to fail, as well as being reported in the server log 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13238 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-15 21:42:10 +00:00
cavesomething 9ccec00729 Remove stub code, this is likely to be handled in a separate check 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13237 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-15 21:40:22 +00:00
cavesomething ce3cf322eb Make quest pre-conditions work correctly with ranges of stages 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13236 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-15 21:39:30 +00:00
ryo_saeba 8668e1a426 Fix dialog. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13222 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-15 11:26:25 +00:00
ryo_saeba 105879fcd2 Questify Lursendis's Unforgettable banquet. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13219 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-15 10:27:52 +00:00
cavesomething 54d593bf80 Add a check for the message length in dialogs and give a warning if it is exceeded (This should just result in truncation server-side) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13218 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-05-15 01:32:16 +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 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
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 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 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 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 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 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 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 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 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
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
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
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 054058c980 Have the priest give (almost) free restorations, if the player knows the answers. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12527 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-02-28 11:53:13 +00:00
meflin2 ff54b9d8b3 alestan python guild updates 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12514 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-02-27 19:14:29 +00:00
meflin2 b0682c5cea alestan python guild updates 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12511 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-02-26 23:04:32 +00:00
meflin2 614e64549c alestan python guild updates 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12510 282e977c-c81d-0410-88c4-b93c2d0d6712
 2010-02-26 18:14:37 +00:00
anmaster a8cab01c4b Minor code cleanup in some python modules (removing unused variables, cleaning up some if tests, removing import statements for some modules that were then never used. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12197 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-10-14 16:13:29 +00:00