Commit Graph

6276 Commits (dad71b985b45a36b2c3420733c5ec43f5b932c72)

Author SHA1 Message Date
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
partmedia 971090a25b Updates to key sale house and related places.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18776 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-15 03:09:41 +00:00
partmedia fb33c76810 Add Stoneville ticket office.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18769 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-14 23:33:39 +00:00
partmedia 3ef3e1d652 Fix glaring typo in Scorn Port Ticket Office.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18768 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-14 23:33:27 +00:00
partmedia 96107bc2dc Clean up useless archetypes and improve master suite.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18767 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-14 23:33:16 +00:00
partmedia 1df8af6c58 Make dragon hangar entrance more difficult.
The new entrance prevents players from camping on the stairs. Now, they
have to actually fight the dragon without running away.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18766 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-14 23:33:06 +00:00
partmedia 02398bba74 Improve Hick's dialog and other minor fixes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18765 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-14 23:32:54 +00:00
rjtanner ecfe557f6f Cosmetic changes with Scorn Armour Shop (scorn/shops/armourshop) to correct a stacking issue resulting in the floor tile appearing above wall sections by the blacksmith. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18761 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-11 22:38:08 +00:00
partmedia 3aaa26c373 Remove $Id$ from README; this tends to confused Git clients and is the only file that uses it.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18755 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-07 19:05:03 +00:00
partmedia 74c8115257 Minor textual changes to Stoneville Dragon Hangar.
Use "Darcap" instead of "Dtabb" and improve NPC/sign dialog.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18754 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-07 18:49:40 +00:00
partmedia 3416a29e99 Patch #339: Add ship from Santo Dominion and link to world map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18753 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-07 15:03:55 +00:00
partmedia c525dae3ac Patch #338: Add ticket booth and Eliza's office to Santo Dominion City Hall
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18752 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-07 15:01:28 +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
rjtanner 844eeb191b Added more exits back to the world map from Mansion (wolfsburg/volcano/vvmansion) in Wolfbsurg.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18750 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 23:00:35 +00:00
rjtanner 34d6d980c8 Comsetic changes to Mansion (wolfsburg/volcano/vvmansion) in Wolfbsurg. Replaced white (wwall) with woodwalls. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18749 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 22:24:59 +00:00
rjtanner 8feabd3647 Part of Patch #337 Minor improvements to 'house with apartment' courtesy of Kevin Zheng. Prevent players from walking away with the free cauldron (400+ plat each!)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18748 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 20:49:57 +00:00
rjtanner 0b4e8488f4 Part of Patch #337 Minor improvements to 'house with apartment' courtesy of Kevin Zheng. Have housekeeper respond to 'greetings' in the same way as 'hello'.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18747 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 20:49:13 +00:00
rjtanner ef84957f1a Part of Patch #337 Minor improvements to 'house with apartment' courtesy of Kevin Zheng. Improved altar and payment text.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18746 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 20:48:26 +00:00
rjtanner d67540a610 Part of Patch #337 Minor improvements to 'house with apartment' courtesy of Kevin Zheng. Removed no longer used archetype attributes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18745 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 20:47:26 +00:00
rjtanner d50cb6a996 Patch #336 Archetype and exit cleanup in Santo Dominion Tavern, courtesy of Kevin Zheng. Floor archetype and exit correction and updates in The Golden Lion (santo_dominion/tavern).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18744 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 18:14:12 +00:00
rjtanner 17efd688e2 Patch #336 Archetype and exit cleanup in Santo Dominion Tavern, courtesy of Kevin Zheng. Removed mine2 archetypes in The Golden Lion (santo_dominion/tavern), cosmetic change - no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18743 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 18:07:15 +00:00
rjtanner d77dac3e60 Patch #335 Remove duplicate food items from the table in the Noble Rest, courtesy of Kevin Zheng. Removed duplicate food items on the table that don't need to be there.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18742 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-06-28 17:35:48 +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