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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
anmaster
lalo
kbulgrien
bbotbuilder
ryo_saeba
rjtanner
gros
tchize