Commit Graph

7421 Commits (master)

Author SHA1 Message Date
kstenger d51a0e1146 Fix map's tiling to avoid server crash. (related to bug #756)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18888 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-04 18:36:28 +00:00
partmedia bc33ca3fde Create checks instead of template-making them.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18887 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-04 12:56:28 +00:00
partmedia e9217fa751 Fix checking by adding template to IPO storage.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18886 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-04 12:56:15 +00:00
ryo_saeba de60ca2d56 Fix script, frypan and stove had changed positions.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18883 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-04 11:10:52 +00:00
partmedia 206c0842b3 Re-implement strAmount() as a wrapper to standard function.
Thanks to Nicholas for pointing this out!

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18882 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-04 10:35:05 +00:00
partmedia 565f3ecc62 Don't mark as outdoor map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18881 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-04 10:34:53 +00:00
partmedia 28dede0354 Remove obsolete guild files.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18880 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:29:45 +00:00
partmedia b9a0925bae Put Valriel church and quest in separate folder.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18879 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:29:34 +00:00
partmedia e3adf55a50 Various improvements to Valriel's Church.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18878 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:29:22 +00:00
partmedia 61f8b77429 Remove extra trees.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18877 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:29:10 +00:00
partmedia 8c51e8144c Add darkness and correctly block lower level.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18876 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-08-03 00:29:00 +00:00
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
partmedia 822dcb4a99 Remove duplicate tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18848 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-29 03:03:58 +00:00
partmedia 7cbcf575b6 Remove 'race' property in Scorn Food Shop.
In addition, pay somewhat well for flesh (this is a food shop, take into
account races such as dragons). Also improve lighting and add a special
place for players to sell stuff.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18847 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-29 03:03:43 +00:00
partmedia f6bb1377d4 Use map tiling for Wolfsburg Twin Towers (level 1).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18846 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-28 14:46:43 +00:00
partmedia 64b5d96bf3 Cosmetic cleanups to Sages' Tower.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18844 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-28 04:53:27 +00:00
partmedia 9fdd489132 Fix stairs and other minor issues.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18843 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-28 04:53:12 +00:00
partmedia fad0f00bed Fix downstairs exit for Grumms Inn.
Take this opportunity to improve the upstairs, fix the archetypes, and
correct/improve NPC dialogue.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18842 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-28 04:53:01 +00:00
partmedia e063e247c4 Don't require dimension door to win Troll Canyon.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18840 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-26 10:49:58 +00:00
partmedia 7f35d1ccbb Fix capitalization of "Fierce Troll".
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18839 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-26 10:49:43 +00:00
partmedia 80f7db44ce Fix troll canyon map tiling.
It's not a good idea to have tiles overlap each other; this tends to
confuse the client. Move the tile below the other tile onto a separate
map to solve this problem. Also fix tiles for entire map.

Take this opportunity to better connect elements of the map.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18838 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-26 10:49:25 +00:00
partmedia e65292d15f Do not tile Troll Canyon entrance.
The entrance (32x64) is less than a single world map tile (50x50).
Tiling does not have an advantage, and trolls only attack when a player
is nearby anyways. This makes the map less confusing for map editors and
DMs trying to reset the map.

Also take this opportunity to correct capitalization and make the bridge
troll actually say something (was broken due to typo).

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18837 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-26 07:50:53 +00:00
partmedia 732ead98c2 Fix up text in/near Navar High Court.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18836 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-26 07:50:41 +00:00
partmedia 1aec28bf1b Fix several exit paths in Chadfire.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18835 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-25 00:51:13 +00:00
rjtanner 1e3935c11d Assembled task list for working on and updating the chadfire maps found in this directory.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18834 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-24 23:43:04 +00:00
rjtanner 6c750deebe Patch #281 chad's unfinished island maps. Initial import of the map set available from the patch.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18833 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-24 23:35:45 +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