e0057f4c39
Apply (part of) patch #326 : Make sailing around the world cost money, by Kevin Zheng.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18659 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-06 10:21:13 +00:00
3becab75b8
Tentative fix for a Windows bug with 'include' in dialogs.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18568 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-01-29 19:39:04 +00:00
0b5409171d
Fix bug #3573119 : IPO help truncated in client. Merge lines for output.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18466 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-10-01 19:55:17 +00:00
18af2a807c
Use the wrapper move_to() function, remove unused function.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18354 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-07-08 16:19:43 +00:00
3c158c16a7
Clean debug statement.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18320 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-07-01 17:09:15 +00:00
ee50bbdeec
Remove 'print' used to debug.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18319 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-07-01 16:28:18 +00:00
bfc9f612ab
Remove debug statement.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18318 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-07-01 14:33:51 +00:00
5b1aa47402
Remove 'print' used to debug.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18317 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-07-01 14:30:53 +00:00
41c74b2c13
Use name, not object.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18256 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-06-17 10:35:07 +00:00
fd7f3fb07a
Don't redirect output.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18253 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-06-17 10:31:19 +00:00
53daa8b836
Quest: Witherspoon's ghost.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18202 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-06-10 15:47:38 +00:00
6fcfb9c565
Post-dialog script to give a knowledge item.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18143 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-05-20 17:50:22 +00:00
cc07cbaa84
Don't start a quest if the player can't read a book.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18128 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-05-19 15:43:19 +00:00
25b8d7adb4
Don't log the bell, it works.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18001 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-22 14:10:25 +00:00
56bf2a1322
Simplify script.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17963 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-15 16:06:34 +00:00
ca573b45e7
Enable the doors to be lockpicked.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17961 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-15 12:50:43 +00:00
fa4d205af9
Script for lockable doors.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@17958 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-04-15 10:19:05 +00:00
5ce8d01ed6
Script to record a list of players having done something great.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@16384 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-30 21:39:42 +00:00
a183694955
Fix probably broken crystal room price (12 jade instead of 2 platinum).
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15997 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-01 22:21:11 +00:00
fb2353fff7
Rewrite prices, fix inverted Thaumaturgy room and desk.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15996 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-01 22:20:35 +00:00
e3fcdc8f7c
Reduce the price of cards by a factor of 10.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15995 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-01 22:16:53 +00:00
fbb4326c14
Reformat to put cards at top.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15994 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-01 22:12:56 +00:00
5e7eb21faf
Clean script.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15543 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-06 21:28:56 +00:00
c1bee7911e
Decreased the number of fogs per seed fog
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15090 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-14 20:23:59 +00:00
fb0f1d5bab
Prevent actual reading of the panel.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14920 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-07-24 14:15:13 +00:00
36dcd6327b
Correctly advance quest when something happened with a spell.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14892 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-07-22 20:28:12 +00:00
9ad3927f51
Fix Jeweler's room coordinates preventing it from being bought.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14837 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-07-10 09:50:37 +00:00
a9da1ee77a
Remove stray files.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14726 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-28 19:24:29 +00:00
0ee9c8e617
Adapt to renamed face names.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14718 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-26 18:33:01 +00:00
17c619135f
Remove evil 'print'.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14676 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-21 21:11:18 +00:00
32553f2342
Don't cause an exception if it is not a player triggering.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14561 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-12 18:22:26 +00:00
68094029af
Add autojailing scripts for PK, activated by DMs.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14535 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-09 22:20:06 +00:00
43041fec06
Add 'disinfect' command for DMs, removing diseases on the current map.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14525 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-09 18:57:10 +00:00
0737416c01
Ensure items were removed.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14501 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 18:28:07 +00:00
955102cc66
Correctly handle items with nrof 0.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14500 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 18:27:46 +00:00
8870b46365
Quanties can be 0 for non merging, take that into account.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14497 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 17:50:39 +00:00
4ec2680733
Improve the 'buy' command, don't show already bought extensions.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14495 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 16:45:27 +00:00
4902fcb1c8
Fix accidental french :)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14120 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-22 22:19:18 +00:00
94fa00ed6a
Format 'info' result in a friendler way.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14119 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-22 22:00:51 +00:00
96352f761d
Slightly improve the list command. Fix misplaced newline.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14115 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-20 16:04:58 +00:00
a39439ab35
Do not attempt arresting things like traps, please.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14113 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-20 15:47:29 +00:00
9975403968
Fix script.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14112 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-20 15:25:35 +00:00
34dfc48087
Use actual deposit value instead of hardcoded value.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14107 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-20 11:17:06 +00:00
5eb8d7a926
Fix issue when message is not defined.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14106 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-20 11:16:44 +00:00
6763e0722f
Rewrite.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14089 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-11-14 14:21:37 +00:00
e69c74750e
Make explicit that the player must give a number.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14022 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-10-23 09:19:54 +00:00
6c61bc2244
White zone of Darcap's Manor.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14007 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-10-17 16:07:49 +00:00
8e59f89c8b
Darcap's Manor, brown zone, with hopefully a nice challenge.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14005 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-10-17 11:23:37 +00:00
e4e023979c
Darcap Manor, bases. More to come later.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13990 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-10-10 19:06:30 +00:00
2ce05da4a2
Display balance in a nicer way. Better 'buy' list.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13985 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-10-10 11:25:30 +00:00
1845253530
Fix /python/guilds/arrest.py, it just kept throwing errors into server stderr...
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13966 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-10-06 18:38:22 +00:00
89eff881a4
fixed problems caused by svn up.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13758 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 02:59:33 +00:00
bd21022abc
fixed syntax error.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13757 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 02:42:28 +00:00
6735bd2158
fixed synatax error
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13756 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 01:50:12 +00:00
14881dee18
fixed synatax error
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13755 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 01:34:44 +00:00
523b74b56a
changed syntax to support python 2.5.x
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13754 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 01:32:00 +00:00
e247b243c4
changed syntax to support python 2.5.x
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13753 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 01:29:07 +00:00
2b352a8e93
Changed syntax to support python 2.5.x
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13752 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 01:10:37 +00:00
ae753bff28
added a common clearance checker for the guilds and rewrote parts of the guild scripts. Also updated the guild maps to use the new scripts
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13751 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-07 00:38:39 +00:00
533fd732ab
Doors galore, by Khaleh.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13725 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-04 09:23:54 +00:00
0ad504bea7
Fix bug #2933502 : Valkyrie not working.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13704 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-03 16:05:25 +00:00
841596b4c3
removed unused text files and made Jack say how much money is needed to purchase something for the guild
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13703 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-02 19:36:49 +00:00
ec21a66dc6
one of the guild scripts got missed from being added by alestan
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13693 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-09-02 14:32:12 +00:00
b8df23ba4a
fine tuned fog duration and speed
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13638 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-17 23:37:34 +00:00
57f99c5e1d
Adjusted fog lifetime
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13636 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-17 22:01:40 +00:00
b96c83f823
Added script specific to moving fog
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13634 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-17 21:53:30 +00:00
7bd104454a
fixed bugs with guild scripts
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13629 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-16 22:55:32 +00:00
c41bb9c8df
un-redirecting stdout and stderr
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13623 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-16 07:05:17 +00:00
e0e54c995b
fine tuning of fog speed
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13622 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-16 01:50:23 +00:00
d3b6653a28
added temp_moving_fog and made steam bolt create it instead of temp_fog, adjusted script that handles temp_moving_fog
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13621 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-16 01:24:16 +00:00
08905d61ba
fixed bug in private shops
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13620 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 23:02:16 +00:00
d3cff35fd1
fixed bug in private shops
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13619 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 19:21:20 +00:00
ed609f8510
fixed bug in private shops
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13618 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 19:03:08 +00:00
f845e9ceda
updating how face is haneled.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13611 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 07:50:38 +00:00
a616cc15fd
removing no longer needed init script
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13610 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 07:48:42 +00:00
ca4950618c
improves banking
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13601 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-15 01:02:41 +00:00
cd77c8646c
added script to build dict of face numbers to names
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13584 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-13 04:09:03 +00:00
9fe1a2977c
finished scripts in maps/python/pshop for handling the new private shops
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13581 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-13 03:48:50 +00:00
7c9522f35a
Improve temple's bells.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13540 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-08-01 09:01:49 +00:00
c8f185bb3b
Let's ring some bells, it'll make it funnier for players to hear those :)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13515 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-07-25 18:18:57 +00:00
39ae6d7f86
Script to drop items only if a certain quest step is reached.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13411 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-19 15:06:29 +00:00
930183356e
Utility script to let an item be applied only for certain quest steps.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13389 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-12 16:51:54 +00:00
4d433955d8
Pre-condition script, checking for some archetype in the inventory.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13388 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-12 16:50:41 +00:00
934430945f
Hall of Heroes in Scorn castle, and script to support them.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13378 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-08 15:01:00 +00:00
6a23f2e22e
Improve the check for recording nobles
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13377 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-08 14:57:42 +00:00
83c7fcac20
Add a sage to scorn castle who will record the rank and title of the players who pass by.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13373 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-07 23:47:26 +00:00
2e1f919c58
Replace tabs with spaces
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13372 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-07 20:13:51 +00:00
5ecbcdb6d7
Fix comments.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13370 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-06 15:14:56 +00:00
88fc3f0db4
Script to check if a player knows (through the knowledge system) something or not.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13369 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-06 15:06:48 +00:00
ec18147f56
Fix exception syntax for Python 2.5.2.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13363 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-06-06 08:32:03 +00:00
287eb34c9e
Fix animation query.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13349 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 14:57:02 +00:00
27e16a4a78
Disable talking while the NPC is animated.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13345 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 14:28:30 +00:00
1ab27daf16
Hook to animate through cfanim.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13344 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 14:27:37 +00:00
764c046bdf
Add a 'questdone' precondition to vary dialogs.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13339 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 10:43:07 +00:00
e0538867c4
Add 'npctoken' and 'setnpctoken' pre and post conditions, to keep data in NPC instead of player.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13336 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-30 10:11:58 +00:00
38295fe7da
Force reply type to be an integer.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13328 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-29 21:51:55 +00:00
279478325d
Fix 'WriteKey()' needing a string, not an integer.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13327 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-29 21:44:05 +00:00
c3a992c3ef
Use the 'talked_to' key to make NPCs stop when talked to.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13326 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-29 21:22:45 +00:00
b5a0b9a37e
Script to punish a player from killing a NPC.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13320 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-29 19:54:58 +00:00
0559e8bc68
Fix import before comment.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13318 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-29 19:51:24 +00:00
1fe17f133c
Script to punish tring to sell a protected item.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13315 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-29 18:23:27 +00:00
4aa31a8f4d
Handle the Include rule subclass of Dialog class more sanely, this fixes an issue with include rules and pre-functions.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13264 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-17 13:10:11 +00:00
c011312943
Replace LOG messages with proper exception handling, ensure that a check which raises an exception causes a rule to fail, as well as being reported in the server log
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13238 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 21:42:10 +00:00
9ccec00729
Remove stub code, this is likely to be handled in a separate check
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13237 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 21:40:22 +00:00
ce3cf322eb
Make quest pre-conditions work correctly with ranges of stages
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13236 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 21:39:30 +00:00
8668e1a426
Fix dialog.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13222 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 11:26:25 +00:00
105879fcd2
Questify Lursendis's Unforgettable banquet.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13219 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 10:27:52 +00:00
54d593bf80
Add a check for the message length in dialogs and give a warning if it is exceeded (This should just result in truncation server-side)
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13218 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-15 01:32:16 +00:00
51a19486a4
Fix name of script in comments
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13183 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-13 19:08:41 +00:00
16804860a1
Fix the counting of rules, errors and warnings in included files
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13166 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 18:16:29 +00:00
ba77a3862f
Change the names of the recognised fields
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13165 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 18:15:16 +00:00
65daabb52a
Adjust quest to new dialog system.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13164 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 17:51:31 +00:00
0d07667c50
Add a 'prefunction' to rules to have special processing.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13163 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 17:50:57 +00:00
b66dcbeb89
Remove the requirements, assuming player can always say anything.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13162 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-10 17:20:36 +00:00
b5b9dfda24
Add 'replies' to the dialog system, to let the player know what she can say.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13158 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-08 13:16:13 +00:00
4f0c75aac3
Use Crossfire.NPCSay() to have NPCs talk after the player.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13157 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-08 12:28:49 +00:00
59ce1f64fa
Check multiple token conditions correctly
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13144 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-07 12:19:43 +00:00
39d497e747
New Script to enable map connections to be triggered depending on the state of a quest.
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13131 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 16:10:47 +00:00
49eedf7f5f
Fix parsing of stage numbers
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13130 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 15:02:44 +00:00
46f0d65cb7
Add useage note in comments
...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13129 282e977c-c81d-0410-88c4-b93c2d0d6712
2010-05-05 11:42:37 +00:00
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
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
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
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
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
ryo_saeba
alestan
akirschbaum
anmaster
meflin2
cavesomething
lalo
kbulgrien
bbotbuilder
rjtanner
gros
tchize