Commit Graph

429 Commits (67ee1c62340e47a8c4bbcd9917a1695db4c28aa6)

Author SHA1 Message Date
partmedia a33156dfca Finish moving commands to separate functions.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18864 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:27:00 +00:00
partmedia c0f1d72783 Implement common utility methods.
Reimplment 'balance' and 'withdraw' using the new utility methods. Move
'deposit' into its own function but don't touch it yet.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18863 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:26:50 +00:00
partmedia 0528e6f203 Correctly close bank and fix 'profits' display.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18862 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:26:39 +00:00
partmedia e1777f2cb3 Correctly close bank file in CFBank.py.
Open bank file with writeback set to false (default); setting it to True
was not needed and caused a mysterious bug on my system. The Python
reference manual recommends closing the database after writing data, so
remove all sync() calls and instead force a close() in the end.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18861 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:26:30 +00:00
partmedia f37051dcda Use more intuitive variable names.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18860 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:26:20 +00:00
partmedia b8483cdb67 Trim source file header and whitespace formatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18859 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:26:10 +00:00
partmedia 0c76ba7826 Implement new withdrawal command.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18858 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:26:00 +00:00
partmedia 342ac2430a Offload trivial commands to their separate functions.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18857 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:25:47 +00:00
partmedia 75a5fcd61c Stick help message in separate function.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18856 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:25:37 +00:00
partmedia f87de491cd Split deposit box code into separate functions.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18855 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:25:23 +00:00
partmedia a11526d65f Clean up unused variables and comment the rest.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18854 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:25:07 +00:00
partmedia 2f7bd9cc2d Whitespace and formatting changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18853 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:24:54 +00:00
partmedia f4ce687d13 Remove executable flag.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18849 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-29 03:04:17 +00:00
kstenger 5eb73d7cbf Using the new Crossfire.AttackMovement.PETMOVE constants.
Reduce the affected area to the surrounding 10x10 square.



git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18831 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-23 19:53:32 +00:00
kstenger a253caa600 New item: magic pet's whistle.
Why this item:
    In some cases pets may get angry at their owner and attack him.
    This whistle intends to give the player a chance to make his pets friendly again.
    This won't prevent the pet from getting angry again for whatever reason, which
    is ok.

Including: archetype, image, treasure list (for the whistle inventory to work 
           properly), python script which makes the "real work".

Hope to add a map soon to make this available to the players.

A    maps/trunk/python/items/magic_whistle.py
A    arch/trunk/misc/magic_whistle.trs
A    arch/trunk/misc/magic_whistle.arc
AM   arch/trunk/misc/magic_whistle.base.111.png


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18827 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-23 18:56:37 +00:00
partmedia 82f00e3526 Patch #332: Add Eliza chatterbot script for Crossfire
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18751 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-07 14:57:47 +00:00
ryo_saeba f6e102ee42 Change employee dialog. Part of patch #333: Attitude change to IPO employees, by Kevin Zheng.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18741 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-23 10:01:26 +00:00
ryo_saeba 533b711d5a Adjust mailscroll price. Part of patch #333: Attitude change to IPO employees, by Kevin Zheng.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18740 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-23 09:54:26 +00:00
ryo_saeba 7d0bbade44 Fix typo.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18735 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-09 16:54:22 +00:00
ryo_saeba d79e37fcb4 Display the guild status and a member's status, give more information on what is valid.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18734 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-09 16:51:55 +00:00
akirschbaum 5e430c833f Remove trailing whitespace.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18703 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-05-09 11:08:11 +00:00
kstenger 8aae10354b Minor fixes to do_pay(): 'type' was used as a variable name but it's a reserved word, length check was wrong, check for zero amount, plural message improved.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18700 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-30 19:47:41 +00:00
kstenger a32ef59ae4 Fixing python indentation. Using elif when apropriate.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18699 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-29 19:31:50 +00:00
kstenger 5313de3438 Fixing python indentation
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18698 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-29 02:58:46 +00:00
kstenger beb58156f7 Fixing python indentation
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18697 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-29 01:11:11 +00:00
kstenger 5a613c9162 Fixing python indentation
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18696 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-28 22:23:28 +00:00
ryo_saeba 3ed36dd261 Display valid status.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18695 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-28 18:27:52 +00:00
ryo_saeba aa9637d3aa Try to not generate errors.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18693 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-28 17:45:04 +00:00
ryo_saeba e3ac67f897 Initialize variable, if access is denied.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18692 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-28 17:43:59 +00:00
ryo_saeba 1f625a1c90 Prevent traps from showing.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18691 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-04-28 17:17:03 +00:00
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
alestan 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
akirschbaum 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
akirschbaum 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
anmaster 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
Alestan 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
Alestan 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
Alestan 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
Alestan 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
Alestan 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
Alestan 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
Alestan 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
Alestan 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
ryo_saeba 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
ryo_saeba 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
Alestan 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
meflin2 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
Alestan 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
Alestan 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
Alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
alestan 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
cavesomething 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
cavesomething 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
cavesomething 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
cavesomething 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
cavesomething 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
cavesomething 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
cavesomething 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
cavesomething 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
ryo_saeba 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
ryo_saeba 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
cavesomething 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
cavesomething 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
cavesomething 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
cavesomething 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
ryo_saeba 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
cavesomething 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
cavesomething 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
cavesomething 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
cavesomething 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