Commit Graph

322 Commits (342ac2430a7dc2a85f781bc6ebe9834c1d4ad48c)

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