Commit Graph

201 Commits (67103506223c898f449212fd6fc8897f3e7210f0)

Author SHA1 Message Date
akirschbaum 772638b98d Run MapNormalizer script on all maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9176 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-30 07:32:24 +00:00
anmaster 6bd68f5e92 Resize some more maps with wasted empty space in the lower right part of the map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9166 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-29 11:27:09 +00:00
anmaster 4028f408e4 Add some more @question/@reply to some maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9153 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-25 13:38:15 +00:00
anmaster f4effab867 Even more fixes for redundant patterns in @match (it is case insensitive, but a lot of maps treated it as if it was case sensitive). Mostly done with grep + sed. Also add @question to two pupland maps and fix a typo on a lake country map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9147 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-23 22:30:19 +00:00
anmaster 01bbd348d3 The @match expression in npc dialog is case insensitive, but a lot of map treated it as if it was case sensitive, fixing a lot of them (there may be more left, that the grep didn't find).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9144 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-23 08:11:20 +00:00
anmaster 1da8d58ad9 Run the pshop_copier script to update the shops, some of the shops had small differences.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9138 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-22 21:45:23 +00:00
anmaster f19c9ca871 Update the script to make it work correctly, it assumed too much about the layout of the file, so it was broken. New script should be somewhat more robust.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9121 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-20 16:01:34 +00:00
qal21 59a5dc2d3b Add region info in Brest, courtesy of Arvid Norlander
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9106 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-05-18 19:46:53 +00:00
rjtanner 2e8bae5d4c Synchronize map changes between trunk, branches/1.x and branches/lalo-pupland
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8476 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-03-01 06:08:48 +00:00
kbulgrien 53f2b30307 Rename dwall3_3 to dwall_3_3 after removing incorrect Object in
arch/trunk/wall/dwall/dwall.arc.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@8208 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-01-19 00:56:11 +00:00
eracc f227cc4fd8 Add Zorn castle floor four.
Update all "shadow" creatures in Zorn castle to be disease immune even though
they are not undead.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7566 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-24 20:28:56 +00:00
eracc da810f1b29 Fixing the Zorn girls. They all had too low max hp.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7507 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-14 17:54:03 +00:00
rjtanner 8bc73d2b5d Modify NPC or magic_mouth dialogue to be generic in regards to player race; Fix for bug [825637] Some maps assume what race you are.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7486 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-06 05:46:36 +00:00
rjtanner 67ec8650a6 Update the guild maps to include map difficulty levels, ability to create an altar of valkyrie for 5 holy_shield, and altars are now level 120 (players are no longer able to reconsecrate them) which addresses bug [1824769] Players able to reconsecrate guild altars
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7481 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-05 01:50:51 +00:00
akirschbaum 0e39777161 Update spellcasting objects to use inventory objects.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7474 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-04 19:05:10 +00:00
akirschbaum d98265c0f0 Unify Created: and Modified: map headers.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7448 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-11-02 22:49:56 +00:00
akirschbaum 3b791f5cb5 Fix whitespace in text messages; reverts unwanted changes due to an editor bug.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7430 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-10-30 23:00:20 +00:00
rjtanner 0c12e4b464 Update maps to use the new potion name (invulnerability is now shielding)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7259 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-27 04:47:51 +00:00
rjtanner 346e648837 Additional corrections, replaced move_allow with move_block
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7249 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-26 20:22:27 +00:00
rjtanner 518ed0c8d6 Fix for bug# 1802171, Obsolete attributes in 2 maps in trunk. Replaced no_pass attributes with move_allow.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7247 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-26 19:32:52 +00:00
rjtanner d8f48fb6d5 Changes due to map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7136 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-11 04:15:13 +00:00
rjtanner b8e0d6efca Changes due to map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7131 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-09 04:37:45 +00:00
rjtanner 3bfe4cc009 Fixed a coordinate problem with the exit/entrance to the top floor map in pshop21 - now the stairs line up properly and no longer trap a player on the other side of the fence. Thanks to Meflin for pointing this out.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7122 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-07 05:01:01 +00:00
rjtanner b2e58cdc2a Map editor reformatting, attemtping to track down a problem with the exit/entrance on the top floor.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7121 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-07 04:56:42 +00:00
rjtanner 750a7b6a3e Changes due to map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7120 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-07 02:35:13 +00:00
rjtanner a73d6acb97 Cosmetic updates in regards to swall and cwall sections. Floor tile stacking re-arrangement. Added missing floor tiles in spots where floor tiles were missing. Update map names. Other changes are due to map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7118 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-06 05:10:05 +00:00
akirschbaum 5620b5ca59 Replace obsolete fields fly_on/walk_on with move_on.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7115 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-09-05 18:31:48 +00:00
rjtanner 7dbc5c17a7 Map name correction. Other changes are due to map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7088 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-31 01:42:52 +00:00
rjtanner 589ecb791b Cosmetic changes to improve the blending between swall_ and regular walls. Changes merged from trunk back in to branch.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7086 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-31 01:22:26 +00:00
rjtanner 6f828df4a8 Floor tile stacking tweaks and minor corrections to map names. Other changes are due to map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7084 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-31 01:11:38 +00:00
rjtanner 55446c4d65 Corrected map name typo, should be Enigme instead of E[M]igme
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7070 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-30 02:15:01 +00:00
rjtanner 45152cff27 Map editor reformatting
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7068 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-30 02:01:28 +00:00
rjtanner c1e0617ebd Minor cosmetic changes with walls and floor tiles, re-arranged the stacking order of floor tiles. Other updates are from map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7036 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-29 05:30:10 +00:00
rjtanner 1170a5cae4 Removed extra floor tiles, updates map names where necessary, minor cosmetic changes with walls and floor tiles. Other updates are from map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6991 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-27 05:01:46 +00:00
rjtanner e6dd5e86d1 Removed extra floor tiles, updates map names where necessary, minor cosmetic changes. Other updates are from map editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6987 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-26 07:10:02 +00:00
akirschbaum 7d210be75d Replace obsolete fields fly_on/fly_off/walk_on/walk_off with move_on/move_off.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6982 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-08-23 19:36:52 +00:00
ryo_saeba bfc943cd19 Remove obsolete fields. Other changes due to editor reformatting.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6254 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-13 13:30:15 +00:00
akirschbaum 45d36cb162 Spelling corrections.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6245 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-05-12 22:46:19 +00:00
eracc 513dd8e910 As these shops are in almost constant use I put a fixed reset on them.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5966 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-08 04:26:57 +00:00
eracc 2efb13dbab Add dialogue to the sage in the Brest Inn regarding the Zorn family.
Fix the Brest Seaside Tavern to block dimension door getting past
the exits.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5961 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-07 18:46:22 +00:00
eracc 400c3dd017 Try a new tactic with the "alarm system" on brest/zorn/castle.upper.floor.two
and made cosmetic changes to the map.

Put in a fixed reset (30 minutes) for the Scorn Battle Arena maps (exception
is the underground map which is not changed).


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5953 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-06 22:54:19 +00:00
akirschbaum ee878a0da1 Replace "no_pass" with "move_block".
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5940 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-04-05 21:37:01 +00:00
akirschbaum 8de8411641 Remove trailing whitespace.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5862 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-24 13:15:00 +00:00
eracc 0990917c4f Add yet another warning on castle.upper.floor.one about the danger on
castle.upper.floor.two of the Zorn Castle. If this is not enough warning I do
not know what would be enough.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5850 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-23 18:16:28 +00:00
eracc cea02eb850 Forgot to add a magic mouth under the Plaque. Cosmetic cleanup.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5848 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-23 17:49:22 +00:00
eracc 97abc49723 Move the "alarm system" inside the castle. Pseudo-randomize when the alarm will
go off.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5847 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-23 17:37:04 +00:00
akirschbaum 0597888502 Remove empty msg..endmsg values.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5834 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-21 10:43:51 +00:00
eracc 01a6bfd699 Remove extra space in some monster names. Fix all walls to look consistent.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5830 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-20 20:59:26 +00:00
eracc fcbf241fe8 It appears the mana charging crystal would *always* cause one's head to explode
in a fireball. This is not intended. Reduced the number of transferrence walls
to try to control this effect.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5826 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-19 17:15:50 +00:00
eracc d73b20d84f Trying to fix my "earth to dust" bullet wall that triggers when the alarm goes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5823 282e977c-c81d-0410-88c4-b93c2d0d6712
2007-03-18 21:58:42 +00:00