Commit Graph

429 Commits (67ee1c62340e47a8c4bbcd9917a1695db4c28aa6)

Author SHA1 Message Date
alestan 08905d61ba fixed bug in private shops
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13620 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 23:02:16 +00:00
alestan d3cff35fd1 fixed bug in private shops
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13619 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 19:21:20 +00:00
alestan ed609f8510 fixed bug in private shops
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13618 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 19:03:08 +00:00
alestan f845e9ceda updating how face is haneled.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13611 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 07:50:38 +00:00
alestan a616cc15fd removing no longer needed init script
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13610 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 07:48:42 +00:00
alestan ca4950618c improves banking
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13601 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 01:02:41 +00:00
alestan cd77c8646c added script to build dict of face numbers to names
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13584 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-13 04:09:03 +00:00
alestan 9fe1a2977c finished scripts in maps/python/pshop for handling the new private shops
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13581 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-13 03:48:50 +00:00
ryo_saeba 7c9522f35a Improve temple's bells.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13540 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-01 09:01:49 +00:00
ryo_saeba c8f185bb3b Let's ring some bells, it'll make it funnier for players to hear those :)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13515 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-25 18:18:57 +00:00
ryo_saeba 39ae6d7f86 Script to drop items only if a certain quest step is reached.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13411 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-19 15:06:29 +00:00
ryo_saeba 930183356e Utility script to let an item be applied only for certain quest steps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13389 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-12 16:51:54 +00:00
ryo_saeba 4d433955d8 Pre-condition script, checking for some archetype in the inventory.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13388 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-12 16:50:41 +00:00
cavesomething 934430945f Hall of Heroes in Scorn castle, and script to support them.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13378 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-08 15:01:00 +00:00
cavesomething 6a23f2e22e Improve the check for recording nobles
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13377 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-08 14:57:42 +00:00
cavesomething 83c7fcac20 Add a sage to scorn castle who will record the rank and title of the players who pass by.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13373 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-07 23:47:26 +00:00
cavesomething 2e1f919c58 Replace tabs with spaces
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13372 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-07 20:13:51 +00:00
ryo_saeba 5ecbcdb6d7 Fix comments.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13370 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-06 15:14:56 +00:00
ryo_saeba 88fc3f0db4 Script to check if a player knows (through the knowledge system) something or not.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13369 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-06 15:06:48 +00:00
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
anmaster 84813f777d The casino code for major wins (in all the different slot types) was missing a cast to integer, this resulted in a traceback on Python 3.x.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11481 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-14 18:00:40 +00:00
anmaster fc2ac59b2c The exchange code in /python/IPO/banksay.py was missing a cast to integer, this resulted in a traceback on Python 3.x.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11477 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-14 17:09:40 +00:00
anmaster 0c4149180d Fix a bug causing tracebacks in /python/start/dragon_attune.py. If there was no player on the changer it ended up as None which resulted in a traceback.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11460 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-12 09:28:12 +00:00
anmaster ae645b58e3 Make /python/CFDataFile.py work on both Python 2.x and Python 3.x with no need to run 2to3 for the python 3.x users.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11459 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-12 08:11:48 +00:00
anmaster d037e074c6 Replace deprecated string.split() amd string.lower() in /python/*/*.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11453 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:52:51 +00:00
anmaster c589e07ec3 Replace deprecated string.find() amd string.lower() in /python/*.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11452 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:47:17 +00:00
anmaster f312f10445 Replace deprecated string.split() and string.join() in /python/CFDataFile.py. Also open in text mode instead of binary mode to make the script work under python 3.x
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11451 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:39:10 +00:00
anmaster f813901342 Replace deprecated string.split() calls in /python/CFDialog.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11450 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:36:27 +00:00
anmaster d18ea5543e Fix tab error in CFGamble.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11449 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:20:20 +00:00
anmaster 60b5e31445 Replace deprecated string.split() calls in /python/IPO/*.py.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11448 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:08:00 +00:00
anmaster f117ef543f Fix division error in /python/items/banquet.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11447 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:02:23 +00:00
anmaster 499b7f770d Fix a case of "TabError: inconsistent use of tabs and spaces in indentation" in /python/IPO/receive.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11444 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 18:55:51 +00:00
anmaster 540ad17f62 Fix a case of "TabError: inconsistent use of tabs and spaces in indentation" in /python/IPO/say.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11443 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 18:42:54 +00:00
anmaster f7fc91ba12 Limit allowed range of stats for rings of Occidental Mages in /python/items/ring_occidental_mages.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11414 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-09 17:44:51 +00:00
anmaster 9461ca36e9 Fix mixed tab/space indention in some casino python scripts.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11349 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-06 16:34:58 +00:00
anmaster ed4a0d2b14 Fix part of bug 2457751 "Unpaid items work for some things...": Make diamondslots.py and imperialslots.py check that the object is paid for.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11348 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-06 16:32:36 +00:00
anmaster 3adb52415f Fix part of bug 2457751 "Unpaid items work for some things...": Valkyrie altars no longer accepts unpaid items.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11343 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-06 13:33:39 +00:00
anmaster 6571131b4c Fix part 1 of bug 2369423 ("occidental mages weapons bugs"). Part 1 is weapon speed going the wrong way.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11337 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-04 17:08:57 +00:00
anmaster b4042eae5e Fix indentation in CFGamble.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11330 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-03 19:25:55 +00:00
anmaster 364f9f2d3c Try to be a bit more future compatible with Python 3
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11329 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-03 19:24:16 +00:00
anmaster 8ed8d77f9b Fix tabs in python/guilds/guild_dues.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11287 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-01-30 01:51:41 +00:00
anmaster 309e78e3e0 Correct small syntax error in CFGamble.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11286 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-01-30 01:45:22 +00:00
anmaster a1b802da6d Avoid features in the python scripts that are removed from python 3.0. This is confirmed to still work on at least python 2.5 and as far as I understand the docs also python 2.4
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11284 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-01-30 01:32:19 +00:00
anmaster fdbcb1b6ff Run whitespace cleanup script in maps/python.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11283 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-01-30 01:22:22 +00:00
lalo 44cd2d4c93 oops, committed some debugging code! Sorry :-)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10701 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 08:37:17 +00:00
lalo e22f56ee72 follow-up to last commit "allow player dragons to pick metabolism focus": also change player title. And I forgot to make the sea tiles blocking.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10700 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 07:30:55 +00:00
lalo fd95d90953 giving starting player dragons a slightly less short stick by letting them choose a metabolism focus
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10693 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 06:08:35 +00:00
kbulgrien 1bb1e16719 - Reformat for readability. No functional change.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10637 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 07:46:17 +00:00
kbulgrien cb381c6b26 - More clearly document how to write JSONs when pre or postconditions are not
needed by a particular rule.  For the inexperienced, this was a showstopper.
- Dispense with the user defined exception and replace the old handling with a
  more effective debug log message combined with a generic exception.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10636 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 07:43:24 +00:00
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
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 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 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
bbotbuilder 5fba0abedb python/items/ring_occidental_mages.py:
* fixed typo (thanks goes to buzzsaw)


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9729 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-08-11 05:56:51 +00:00
anmaster bded519fea Fix wrong price of objects in help for IPO.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9136 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-22 21:26:18 +00:00
ryo_saeba d35ac5a295 Add a new professor to the university, and associated scripts (only Lorkas lore, for now). Fix some lights and wrong desks.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9127 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-20 22:02:01 +00:00
ryo_saeba c011e3cc99 Fix bugs #1958325 and #1958326.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8903 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-07 18:25:12 +00:00
rjtanner 5fbcb1027b New guild storage hall map based of the patch, [ 1854556 ] New Guild Storage Building (for laughing skulls guild), with included feature of using Python scripts for management and ownership
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8702 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-04-07 01:31:47 +00:00
ryo_saeba d1e9a82abd Part of patch #1677738: Purple worm (with pythonscript and map), by Mike B.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8691 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-04-05 07:46:32 +00:00
gros 071028da15 Introduced Part I of the Brewery Quest, replacing Newbie Tower.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8638 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-03-26 18:15:15 +00:00
rjtanner ee41ba1844 Implemented, with changes backported from svn trunk, python guild hall patch: [ 1782975 ] Python guilds template. - applied, needs to check all is ok
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8579 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-03-22 06:28:26 +00:00
ryo_saeba e8e7424399 End of the Witherspoon ghost quest, some more fun.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8261 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-01-24 22:56:28 +00:00
gros 6573ac0db9 Add support for the "give" command, that allows a player to show an item to an NPC.
Useful when coupled with scripts to write "bring me back something" quests.
Add support for the "give" command to the Mad Mage, with a generic "show me and
I'll talk" kind of system.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8018 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-12-23 01:19:42 +00:00
tchize fb457124b3 Make the gork's treasure quest use python for npc dialog. It's now mandatory to go throught full dialog to get the treasure key, knowing password is not enough
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8009 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-12-22 13:44:37 +00:00
tchize 0f8c2e86ab Update match rules of CFDialog, add a script to use it
easily in maps, update newbie house so the wise sigmund
can provide more interactive support to players



git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7968 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-12-18 22:29:42 +00:00
ryo_saeba f160ec0d3a Small quest, that may be expanded later. New manor outside Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7939 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-12-16 22:10:28 +00:00
tchize cfa5773ef8 Add a simple to use script that make use of NPC dialog
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7930 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-12-16 15:15:41 +00:00
tchize 0e5dbc2d13 Add a "go to sleep" script based on time of day
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7928 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-12-16 12:52:24 +00:00
ryo_saeba d546bf6a8e Fun item Eracc can use for his maps :)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7570 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-24 23:28:05 +00:00
tchize 4510e0ab0b time of day script modified to use python, and simplified in use.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7562 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-22 22:29:06 +00:00
tchize 42656ed898 timeofday based python script
updated existing script to use JSON notation
added a "replace in all map" script
added a test map
updated test maps to JSON notation
added helper tools: CFTimeOfDay and CFMapTransformer
fixed warnings in gridarta


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7546 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-19 23:21:00 +00:00
gros f57f3a6895 Corrected a glitch in IPO Colette's answer.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7532 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-18 18:52:50 +00:00
tchize 9335e0f4d2 add a werebeast script and demo
The demo "werebeast" is based on beholder transforming into black dragon
Updated sage opening door message


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7519 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-17 17:38:05 +00:00
qal21 9d449dde5b Fix filename comments
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7510 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-17 00:14:49 +00:00
tchize 91a9bf913d Add Timeofday generic scripts and a demo map
Those 4 script can be used as filter or triggerer based on current time. 
See test/tod for a demo map (conditionnal magic mouth, weapons that
attack only at day/night, grates that open in morning and close at dusk)


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7509 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-16 13:27:03 +00:00
tchize d0f032623a Modified all print of script to calls to Crossfire.Log(Crossfire.Log(Debug|Error|Info|Monster),message)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7496 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-08 23:36:22 +00:00
ryo_saeba 21b86eeaa0 Add callbacks to even more customize the rules.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7421 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-10-28 14:54:24 +00:00
lalo be265d8082 documenting the intent of Valkyrie's altar
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7307 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-10-08 18:30:07 +00:00
rjtanner 0c12e4b464 Update maps to use the new potion name (invulnerability is now shielding)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7259 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-27 04:47:51 +00:00
ryo_saeba c20242d682 Improve IPO help, give prices and max weight. Clean code some.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6782 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-07-16 22:15:30 +00:00
ryo_saeba 58defe2894 Fix damage getting really big, more fun effects.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6733 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-06-30 21:58:54 +00:00
ryo_saeba 3f9e90d075 Experience rewarder script.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6415 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-06-04 18:38:35 +00:00
ryo_saeba d366678c26 Final steps and scripts for the Lursendis quest.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6405 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-06-03 16:02:23 +00:00
ryo_saeba 3ccfe258be Create utility library for movement.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6364 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-29 21:18:04 +00:00
ryo_saeba 369769316a Wrong name ordering.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6363 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-28 21:13:54 +00:00
ryo_saeba 89b3bef6e2 Typo.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6332 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-24 18:51:30 +00:00
ryo_saeba 9ec02092c0 Small farm, with special chicken - don't bother'em.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6331 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-24 18:19:11 +00:00
akirschbaum 45d36cb162 Spelling corrections.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6245 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-12 22:46:19 +00:00
gros 0aa089654c Added dialog utility classes, to help creating scripted dialogs.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6212 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-08 10:01:23 +00:00
ryo_saeba 841806b2a4 Force sync so file is valid.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6201 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-07 18:25:02 +00:00
ryo_saeba 0dc753ac81 Smoking pipe script.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6182 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-05 16:56:02 +00:00
ryo_saeba 5f1609c4f9 Wagon that should facilitate player's moving between towns.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6148 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-29 16:21:23 +00:00
ryo_saeba a4cb2ddb5a Adapt scripts to latest Python plugin.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6087 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-21 22:44:30 +00:00
ryo_saeba 93ee7c5d4b Scripted house (in Navar), first version.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6063 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-18 20:46:51 +00:00
ryo_saeba 8e6bdd1c89 Make script more robust if enemy changes, only process players.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5951 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-06 20:32:18 +00:00
ryo_saeba b9b9e56026 Script: greeting message to enemy.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5949 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-06 19:58:53 +00:00
ryo_saeba f866c12b64 Script to have critters say things when they die.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5920 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-02 20:00:11 +00:00
akirschbaum 8de8411641 Remove trailing whitespace.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5862 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-24 13:15:00 +00:00
ryo_saeba 9cc6be1815 Windows requires binary mode to work correctly (newline issues).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5606 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-24 11:08:57 +00:00
ryo_saeba bc8bf40ba3 Fix slot machines.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5546 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-15 20:15:53 +00:00
rjtanner d354b24d97 Major updates to the guild (map) templates - fixed many of the altars, exits and other features. Updated the README file to summarize these changes. RJT, Feb-12-2007
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5528 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-13 02:03:01 +00:00
ryo_saeba d7f17e1e6b Fix joining script. Non members can't use the guild oracle.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5524 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-12 22:39:10 +00:00
ryo_saeba 49d9a8c40c Fixed typos, it's now possible to buy guilds, and manage through the Oracle.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5521 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-12 22:20:48 +00:00
aaron_baugher 2c48a84283 New package arch and image for IPO
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5476 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-11 03:56:14 +00:00
aaron_baugher 704b698a20 New carton arch and images for IPO
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5411 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-09 01:11:34 +00:00
aaron_baugher 1abd8198b4 Improved look of IPO package system
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5409 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-02-09 00:18:23 +00:00
qal21 e5bb0bd8c0 Spelling correction in comment in CFWorld.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5001 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-06 18:44:09 +00:00
qal21 4505f8df6e Add Rhyzian amulet quest.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5000 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-06 18:40:46 +00:00
qal21 3370818173 Remove tabs from multi-line string in python/IPO/banksay.py. Fixes bug #1551381.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4971 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-24 15:38:00 +00:00
qal21 59c3fa1f29 Minor cleanup of slot code. Seperated payout values from logic. Still need to clean code up further and eliminate duplicated code.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4929 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-16 04:07:07 +00:00
qal21 a9e82d0988 Fix minor win jackpots on plat, imperial, and diamond slot machines. Courtesy of the anonymous submitter of tracker item #1559643.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4928 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-16 03:29:53 +00:00
lalo c2bcf26d79 changing the altar of Valkyrie to use flesh exp if available
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4903 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 16:59:07 +00:00
lalo af11015768 new god: Valkyrie, of warriors, scourge of magic
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4890 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-06 20:56:44 +00:00
ryo_saeba 488f56d370 Patch #1550744 (Python scripts should not hardcode timezones) courtesy Mark Kidder
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4861 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-02 14:26:26 +00:00
ryo_saeba f35b57e7d7 Talking fireplace scripts.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4826 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-08-21 21:48:14 +00:00
ryo_saeba df4912aa7f Needed to avoid polluting
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4734 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-07-31 22:14:43 +00:00
ryo_saeba 98637096b5 Remove obsolete files
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4398 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-01-15 14:56:48 +00:00
ryo_saeba 2ec3b7dc93 Check if path exists to not display an error message
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4316 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-01-08 10:21:47 +00:00
ryo_saeba 0839462784 Remove obsolete files
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4315 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-01-08 09:31:39 +00:00
ryo_saeba d8108b3fa3 Split event files, make subdirs.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4311 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-01-07 23:44:05 +00:00
ryo_saeba 2e41e003cc Force binary mode to avoid newline madness
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4083 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-12-04 11:20:34 +00:00
akirschbaum 8faeb88028 Properly set plural names of delivered objects.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4060 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-28 21:12:03 +00:00
akirschbaum 305639ac33 Fix syntax error in script.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4029 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-11 07:14:32 +00:00
akirschbaum 35c3d0fc93 Make it work with with new Python plugin; remove debug output; make source-code formatting consistent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4028 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-10 22:20:56 +00:00
akirschbaum a4251b7005 Bug fixes: make it work with with new Python plugin, do not make it talk to itself, prevent abuse with out of range amounts; make source-code formatting consistent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4026 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-10 21:41:28 +00:00
akirschbaum 82aeffd187 Bug fixes: make it work with with new Python plugin, add 'yes' for help message, do not make it talk to itself.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4025 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-10 20:16:27 +00:00
akirschbaum 0a48aa8c1e Lots of bug fixes: make it work with new Python plugin, fix truncated help message, set plural names of created objects, reword messages, prevent re-use of already sent packets, add safeguards for array-access; make source-code formatting consistent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4024 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-10 19:28:00 +00:00
akirschbaum d198652a0b Disallow player name '#' since this key is used for the file head line.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4023 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-10 19:21:15 +00:00
akirschbaum 528fe2e638 Fix spelling errors.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4022 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-10 19:17:44 +00:00
akirschbaum b69e3f48d4 Fix misnamed method names; fix looping over inventories.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3999 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-06 20:45:49 +00:00
ryo_saeba 60cc3fa85d Fix case
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3981 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-11-05 10:40:24 +00:00
bbotbuilder fbb05257b8 Prevent more warnings
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3910 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-19 20:45:03 +00:00
bbotbuilder bac5af7626 Adding to prevent the server from giving a warning about it being
missing, which was resulting in lots of spam to the console.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3909 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-19 20:12:15 +00:00
gros 044d3851de Update of the Global Events scripts to the new 2.0 CFPython.
Update of the Guild-related scripts to the new 2.0 CFPython.
Update of the remaining scripts to the new 2.0 CFPython.
Gros - 18/10/2005


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3901 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-18 18:53:37 +00:00
gros 098e3e2016 Adapted the casino-related scripts to CFPython 2.0.
Gros - 18/10/2005


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3900 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-18 18:45:23 +00:00
gros 3b77421609 Update of the maps for CFPython version 2.0.
Update of the IPO-related scripts.
Gros - 18/10/2005


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3899 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-18 18:13:28 +00:00
ryo_saeba 1b4bfe0c53 GPS script
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3840 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-10-08 09:47:06 +00:00
ryo_saeba 6f459478b5 Improved post office, can now send/receive items
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3742 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-09-30 20:00:30 +00:00
ryo_saeba f294079e74 Log, then check mail - if mail fails, log is still written.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3498 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-07-22 19:32:16 +00:00
ryo_saeba c698b65fcb Removed unused file, marked as 'don't use' since august
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3240 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-05-03 18:36:47 +00:00
akirschbaum 849cba5a48 Fix spelling errors.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3192 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-04-09 12:00:30 +00:00
ryo_saeba d1d8b472f0 Applied patch #1145089 (cavesomething) to add region support
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3142 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-03-15 21:44:56 +00:00
akirschbaum 148649ceac Fix deposit option.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3121 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-03-09 22:24:47 +00:00
akirschbaum 61a317db6b Fix spelling error.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3110 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-03-09 20:12:45 +00:00
akirschbaum c30b65ab9e Fix spelling error.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3101 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-03-06 21:29:43 +00:00
temitchell 657874fe28 Add README doc for python scripts
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3064 282e977c-c81d-0410-88c4-b93c2d0d6712
2005-02-11 16:39:51 +00:00
temitchell 29b0e49a49 - add (brief) readme for python guilds.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3004 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-12-06 05:47:37 +00:00
temitchell 32e9cfab2c - remove item scripts long ago moved into items
- update scripts to remove path (init script does it for us)


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3003 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-12-06 04:48:06 +00:00
temitchell 8eff925ffa - updates to datafile for guild scripts
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3002 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-12-06 04:45:17 +00:00
temitchell 7cf2013a82 - remove python path bootstrapping - init script not appends module path
for us.
- add guild functions to init and remove scripts


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3001 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-12-06 04:42:58 +00:00
temitchell 054dbeace8 Adding Python Guild framework.
Initial (and not usable as yet) commit of guild templates and guild
scripts for new more automated guild system. - requires Python 2.1 or
better.
TODO - guild maps need finishing, lots more work and much debuging.
Guild points system needs some work (a good formula).


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3000 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-12-06 04:02:10 +00:00
akirschbaum 7836fd619b Add script for bootstrapping code. The script runs right after the python plugin is loaded.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2971 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-10-21 18:57:42 +00:00
temitchell ebb8e5dbe8 - fix help message - add info command which dumps the record.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2917 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-09-19 05:56:52 +00:00
temitchell d185c2a08a - fix tiny bug where player logging in has no record gets a record
made.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2903 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-09-01 03:08:04 +00:00
temitchell 6a517e7fe6 - add new CF module - classes CFDataFile and CFData
- replace crossfirelog shelf with plain text datafile (less efficient
but more accessable) - add logging for kick and muzzle
- add more dm commands for seen (chicken oracle, guy in goths...)
- make sure you make a datafiles dir in var/crossfire or have make
install do it for you.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2902 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-09-01 02:03:26 +00:00
temitchell bbfcc09ebd - move arch item scripts to their own folder
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2892 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-08-28 00:57:30 +00:00
temitchell 16d1e0224e - change path finding to use os.path - hopefully this will fix these
scripts for the (new) windows server
- CFgetPaths is now dead and will be removed - change your scripts if
you use it.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2891 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-08-28 00:19:39 +00:00
temitchell 4dda2986e3 - oops fix long stnading error preventing bank accounts being deleted
when player quits.. (blush)


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2868 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-08-03 02:02:27 +00:00
temitchell 4b57ac9506 - move event scripts into their own directory
- add README
- add disguise script (warning usage still subject to bug 878949)


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2867 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-08-02 23:38:50 +00:00
mwedel 91ae0535c9 commit modified ring of occidental mages, which reduces the stats.
This should balance the item - much harder to get it to have 30 stats
now.
Updated version by Lalo Martins, applied by Mark Wedel
2004-04-17


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2731 282e977c-c81d-0410-88c4-b93c2d0d6712
2004-04-18 06:50:45 +00:00
temitchell 55d9353f1c - fixed issue with slotmachines where items created reset number of
existing items in the same space.
(using itemborker to set number of items add or remove as a safer way to
manage this.)
- touched up bank dialogue (and incorporated itembroker code)


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2413 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-10-25 02:20:08 +00:00
temitchell 10663a71db - oops forgot the decimal that made the serbice charges work.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2386 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-10-09 04:28:09 +00:00
temitchell 7ad3e359d6 -fix banksay.py (was a small issue with a missing =)
-add reusable script for adding/removing items
-add two new slotmachines
-add an insult generator


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2376 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-10-06 03:41:36 +00:00
temitchell cd7c8c7da5 - fixed this stupid mistake (added quotes around bank DB name)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2358 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-09-28 22:13:15 +00:00
temitchell 3f638c3192 - minor change to allow multiple bank databases
(not advising that happen, but the bank class should be as
modular as possible IMHO) and so I did it.
Added README from unlinked with changes


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2357 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-09-28 21:49:46 +00:00
temitchell 1c179567fc - touchups for banking system
Bank now uses imperials (1000 gold) for withdrawls and can do enchanges
of currency to platinum.  Added a cleanup routine in the
python_remove script to delete account when players quit.
A transaction fee was implemented for deposits (default 5%)
requires use of new arch "imperial" (bank notes with no
intrinsic value)


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2350 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-09-28 16:49:09 +00:00
temitchell f20666f7fc - add in DM check so that seen script gives DM the last IP used by the
player they are asking about.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2277 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-08-01 02:24:28 +00:00
temitchell 42c4b9eb73 - breaking out seen into it's own script, the bank stuff into it's own
script and removing the part if the seen command that hands out players
IP addresses to other players.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2269 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-07-25 05:27:20 +00:00
temitchell 16f371200d - small fix to make the slots deal with plurality
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2173 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-06-09 03:50:32 +00:00
temitchell 9dcd72efa0 - move the ImperialPost python files to the python directory, unclude system pathfinding from CFPython
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@1992 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-02-02 20:05:42 +00:00
temitchell 0f7f451615 - using new directory getting functions in the Plugin, makes python more better
- converted the slots over, now easier to install
- added a script that returns the directories for easy use


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@1990 282e977c-c81d-0410-88c4-b93c2d0d6712
2003-02-02 07:50:10 +00:00
mwedel 575cf6d5a8 Various updates -
scorn/oldcity/oldcity2: Add some missing floor tiles.
scorn/temples/gnarg: Link in with with new maps.
world/world_105_116, world/world_127_114: Updated with gnard and
   cd maps.
python: added directory - same as in old maps.
quests/cd/* - move over fro old maps, just new directory.
styles: Added directory - same as in old maps.  Used for random maps.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@1694 282e977c-c81d-0410-88c4-b93c2d0d6712
2002-09-04 06:49:14 +00:00