crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,098 Commits
1 Branch
0 Tags
108 MiB
Commit Graph

6098 Commits (10b3568832edbc19c03669917dca7af6c8fb141d)

Author SHA1 Message Date
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
ryo_saeba e6249ddf84 Add AttackMovement test. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18830 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-23 19:25:49 +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 b5768561fd Unwrap text to let the client do it instead. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18826 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-22 13:06:59 +00:00
partmedia 0de56ebc99 Casino Infernal is no longer unlinked. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18825 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-22 13:06:39 +00:00
partmedia a6f38fcb96 Terrain fixes near world_115_100 (patch #292). 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18824 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-22 02:18:52 +00:00
akirschbaum dd472884c9 Run MapNormalizer editor script on all map files. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18817 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-19 13:26:30 +00:00
akirschbaum 927add0868 Run MapNormalizer editor script on all map files. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18816 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-19 10:23:00 +00:00
akirschbaum 1809611966 Adapt MapNormalizer editor script to changed Gridarta. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18815 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-19 09:54:42 +00:00
partmedia ace31bb58b Fix spelling and punctuation. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18814 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-19 03:55:19 +00:00
partmedia da76208a6a Remove House of Healing script from Navar Temple of Healing. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18813 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-19 03:55:00 +00:00
partmedia 6c32f059ee Correct spelling and remove invalid attributes. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18812 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-19 03:54:44 +00:00
rjtanner c88a3447c8 Cosmetic update to Lone Town Tavern (pup_land/lone_town/tavern) by replacing afloor_left tiles with woodfloor2 tiles. No functional changes. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18811 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 23:03:07 +00:00
rjtanner e162fc127b Added a black dragon mail anvil/creator to Gunther's Smith (navar_city/misc/city1smith) in Navar. Requires archetype update r18803 or newer. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18810 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 21:35:57 +00:00
rjtanner 2c3071af73 Enlarged the floor plan to Gunther's Smith (navar_city/misc/city1smith) in Navarby one row of tiles. Updated world map (world/world_122_117) for changes to the entrance coordinates. Cosmetic change, no functional changes. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18809 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 21:22:14 +00:00
rjtanner 4e114b2915 Re-arranged armour placement to make room for black dragon mail to Museum of Arms (navar_city/magara/houses/museum) in Navar. Cosmetic update, no functional changes. Requires archetype update r18803 or newer. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18808 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 20:31:41 +00:00
rjtanner b626b4d12a Anvil placement re-arrangement and added a black dragon mail anvil to Nethack in Crossfire Entrance (quests/peterm/Nethack_in_crossfire_entrance) map so players can craft black dragon mail. Requires archetype update r18803 or newer. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18806 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 19:31:34 +00:00
rjtanner fd9418e2d5 Added an anvil to Brest CVT (brest/shops/brest.cvt) so players can craft black dragon mail. Requires archetype update r18803. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18804 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 19:15:02 +00:00
partmedia 309550f1a1 Give more light to Darcap Fun Zone. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18802 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 09:07:12 +00:00
partmedia f4d0a48677 Remove empty "match *" statement. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18801 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 09:06:42 +00:00
partmedia 860635dd22 Remove invalid attributes. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18800 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-18 09:06:23 +00:00
partmedia 718f55440f Make cart indestructible as a workaround to bug. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18786 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-16 01:46:34 +00:00
kstenger e736679b83 Added no magic under fences: maps/trunk/darcap/darcap/temples/valkyrie 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18785 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-15 20:08:46 +00:00
partmedia 020ea2656f Reformat all region descriptions on one line. 
This allows region descriptions to be line broken by the client instead
of at inconveniently-placed spots.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18784 282e977c-c81d-0410-88c4-b93c2d0d6712
 2013-07-15 13:09:52 +00:00