Commit Graph

136 Commits (1a48cd300ad5bbd67fa918bb4be6b330f0b00c52)

Author SHA1 Message Date
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