Commit Graph

340 Commits (b9a0925bae0bbac4738e37afc29136aa80a5025a)

Author SHA1 Message Date
partmedia 98b82a1de2 Do not display the decimal point if it is not necessary.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18875 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:28:50 +00:00
partmedia 84764f325b Implement and use new silver-to-string function.
Also take this opportunity to fix the bank profit calculations.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18874 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:28:40 +00:00
partmedia eba15f3400 Update messages and TODOs.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18873 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:28:30 +00:00
partmedia 58f73d4414 Update explanatory comment in CFBank.py.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18872 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:28:21 +00:00
partmedia 04d5b13678 Temporarily disable the broken ATMs.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18871 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:28:11 +00:00
partmedia c5ae44f735 Attempt to fix 'checks' command.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18870 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:28:02 +00:00
partmedia d32cc6b138 Improve deposit command.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18869 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:27:52 +00:00
partmedia d929037033 Reimplement depositing money.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18868 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:27:40 +00:00
partmedia b1c420da44 Rename profit resetting command to make more sense.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18867 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:27:30 +00:00
partmedia 611bfca465 Add TODOs.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18866 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:27:21 +00:00
partmedia 584da84ab8 Improve 'balance' output.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18865 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:27:10 +00:00
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