Commit Graph

2237 Commits (e22f56ee72c96afae3ace561b3d3c96455f98438)

Author SHA1 Message Date
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
rjtanner f66bc0e569 Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10698 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 07:18:07 +00:00
rjtanner 42f7f89e96 Update maps with x & y entrance coordinates and difficulty level
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10696 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 07:02:18 +00:00
rjtanner 317a03e333 Redesign Bob's Bakery in darcap/town2
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10695 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 06:52:05 +00:00
rjtanner 2980deaf81 Redesign of sages tower in darcap/town2 to make them individual maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10694 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 06:27:46 +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
rjtanner 24ae9f651b Redesign of fisherhouses to make them individual maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10691 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 05:39:32 +00:00
akirschbaum e1229f31f6 Fix incorrect face name.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10688 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-23 15:55:24 +00:00
rjtanner 2a994a2eba Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10675 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-22 02:04:52 +00:00
rjtanner 597659d3c6 Restore resist_physical 30 stat to the training demon
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10671 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-22 01:49:14 +00:00
rjtanner 2aa08b82a5 Reformat map header syntax - no functional changes
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10663 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-22 01:27:08 +00:00
kbulgrien 6da4348d23 - Remove a redundant rule from the NPC dialog.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10639 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 08:15:05 +00:00
kbulgrien 97a884773d - Add a new NPC in Goths that uses an npc_dialog.py message file to drive a
CFDialog.py driven conversation (the conversation was created before the
  author knew about CFDialog or how to use it, but it was too large to put
  into @match as it caused a server crash).  This dialog is structured, but
  state is not tracked due the informational nature of the conversation.
  The NPC drops some hints about things in Scorn that a new player might
  want to check out.  There are no spoilers, but it may serve to help a new
  player find out about some things about scorn that the author did not
  discover for ages.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10638 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 08:09:46 +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
rjtanner 9aea156b4b Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10633 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 03:07:32 +00:00
rjtanner 319b4d2a2d More descriptive names to the Darcap Circus maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10632 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 02:58:32 +00:00
rjtanner f9f4972aa6 Convert platinum payment altars to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10631 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 02:37:29 +00:00
rjtanner 40b06c1c0a Remove no longer used name_pl tags from objects (terrain, buildings and ships) in the world maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10627 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 01:40:13 +00:00
akirschbaum 3f7dd81011 Make editor scripts work with latest Gridarta.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10625 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-20 21:58:48 +00:00
rjtanner b6db99ca2b Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10556 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-19 02:17:04 +00:00
rjtanner cde03c5ba0 Map header update and reformatting - no functional changes
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10546 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-19 01:30:46 +00:00
kbulgrien 7464daa57f Replace hut named lighthouse with one of the archetypes that actually looks
like a lighthouse with a glow radius.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10521 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 07:14:16 +00:00
kbulgrien a5c2e1259f Minor dialog rework: Remove mid-sentence line breaks and break at possible
paragraphs instead; fix capitalization/grammar/spelling; give fatman a name.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10520 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 05:36:54 +00:00
rjtanner 9f289802cb Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10519 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 03:25:04 +00:00
rjtanner 52a977a713 Apply region (whalingoutpost) to map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10518 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 03:06:49 +00:00
rjtanner 21ff951cf8 Fix broken conversion table
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10517 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 03:05:42 +00:00
rjtanner 3c2f52f25f Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10505 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-17 06:31:23 +00:00
ryo_saeba 9c6e4faf99 Turning boat example map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10490 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-16 18:59:26 +00:00
akirschbaum 28850717eb Fix typo.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10484 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-16 08:53:45 +00:00
rjtanner 65fccfc7f5 Additional lever to prevent players from being trapped in the map, as pointed out by kbulgrien
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10473 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-16 05:56:21 +00:00
kbulgrien b6726a40ea Gork should not reset the conversation just because you say the wrong
word!


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10472 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 23:08:27 +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 dc000da14c Difficulty 1 for spiders seems way too low. Other maps with spiders are set
to difficulty 5, so changing this one to 5.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10468 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 07:34:57 +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 2c008d88cd Fix, and improve, the Gork dialog in the scorn/kar Gorks Quest. Add some new
content, and make the conversation a lot more flexible so it is not necessary
to reset from the beginning so much.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10432 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-14 06:34:06 +00:00
kbulgrien aa8f1309f9 Fix spelling and remove spurious blank lines from within the JSON.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10430 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-14 06:31:31 +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
rjtanner b311c17606 Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10420 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-13 02:51:04 +00:00
rjtanner aa76370219 Text correction in map name (LEvel -> Level)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10403 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-12 03:15:46 +00:00
ryo_saeba 6d9f94ba01 Apply patch #2133038: scorn kitchen steak fix.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10391 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-11 10:47:58 +00:00