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
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
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
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
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
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
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
cfbaf38455
Update churchtower map with a unique (and more descriptive) map name
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10388 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-11 03:02:52 +00:00
20edc561ad
Revert stand_still that was added per bug #1930002 , since it's apparently supposed to be the right behaviour.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10321 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-09 17:24:33 +00:00
c1895a29d9
Updated ChangeLog file using svn2cl
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10301 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-08 07:27:30 +00:00
6341fe8c9a
Update entrance coordinates from World map to Pygmy Forest
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10277 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-08 00:03:17 +00:00
c15865b464
Added map entrance x & y coordinates
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10276 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-07 02:14:17 +00:00
1298b9c66c
Add map difficulty level
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10274 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-07 02:10:56 +00:00
3ad234cbb9
Added map entrance x & y coordinates, updated map exits/entrance coordinates so they lined up properly
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10273 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-07 02:08:20 +00:00
3701ac8ad4
Update map with entrance x & y coordinates (missed in previous commit)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10269 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-06 02:43:22 +00:00
bfe6152bba
Update map with entrance x & y coordinates
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10267 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-06 02:40:34 +00:00
37b90c4394
Correct y entrance coordinate typo (121 -> 21)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10264 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-06 01:38:25 +00:00
4920997b4d
Restore darkness setting to str-tunnel map
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10262 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-06 01:01:42 +00:00
2f529bed48
Convert silver 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@10252 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-04 21:07:55 +00:00
ee1139fb24
Updated ChangeLog file using svn2cl
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10250 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 06:24:45 +00:00
6e562575bd
Update conversion tables 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@10249 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 06:11:44 +00:00
295930a80a
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@10248 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 06:06:25 +00:00
bd6ad73434
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@10247 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 06:02:16 +00:00
b9f1e91b5a
Update conversion tables 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@10246 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 05:54:07 +00:00
801d4a5a8e
Convert gold 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@10245 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 05:44:22 +00:00
60c0442308
Missed in earlier commit, updated payment altar to accept all coins
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10244 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-03 00:23:27 +00:00
76158c3c75
Update conversion tables 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@10241 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-02 07:29:04 +00:00
6166035086
Cosmetic wall changes with how they merge with each other, especially swall (fence)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10240 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-02 07:03:14 +00:00
bf15342458
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@10239 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-02 06:53:54 +00:00
daffc86c79
Convert platinum payment altars to accept payment of any coin type
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10238 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-02 06:36:36 +00:00
5033cc7cba
Missed a replacement (biglake -> sea) in the previous commit
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10236 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-01 04:12:34 +00:00
83187c20be
Cosmetic changes - replaced Lake graphics with Sea graphics - now the water blends together nicer (with the exception of the rivers, which still use the classic graphics)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10235 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-01 04:09:25 +00:00
91a297c248
Apply scorncounty region to some of the maps surrounding Scorn
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10231 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-31 01:16:59 +00:00
f72cf0fb7e
Apply regions to relevant world maps
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10230 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-31 01:01:59 +00:00
501f0d1d71
Made the structure names generic and similar since their is intent for the player to explore the entire area as part of the storyline and quest
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10229 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-31 00:40:42 +00:00
bb66e527bf
Unique map names and made area name and references consistent (Narcopia -> Narcopin)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10228 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-31 00:39:39 +00:00
7404b0c1a4
New description for Port Joseph
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10227 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-31 00:13:27 +00:00
b9883e9c59
Map name updates for the Gates in Scorn
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10226 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-30 01:48:20 +00:00
6ac28ed5cc
Additional map name syntax changes (Fortress of Lord Butakis, Prison * -> Fortress of Lord Butakis Prison, *)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10225 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-30 00:33:39 +00:00
d9640e347f
Map name syntax change, Lord Butakis' Fortress -> Fortress of Lord Butakis
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10224 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-30 00:15:29 +00:00
63e25f336d
Apply new region (butakisfortress) to relevant maps
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10223 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-29 23:57:21 +00:00
2b6ccfe869
Added (long) description to Lake Country region
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10222 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-29 23:28:08 +00:00
c1ee31bdc0
New region, butakisfortress (Fortress of Lord Butakis), for maps located in /lake_country/Butakis/
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10221 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-29 23:24:56 +00:00
20ec3860e2
Updated ChangeLog file using svn2cl
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10220 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-29 17:43:45 +00:00
059b4c193c
Apply new region (marksel) to relevant maps
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10219 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-29 01:30:00 +00:00
8e4b99fefb
Apply new region (threesisters) to relevant maps
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10218 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-10-29 01:29:40 +00:00
kbulgrien
rjtanner
ryo_saeba