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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
cavesomething
alestan
meflin2
ryo_saeba
anmaster
lalo
kbulgrien