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

2615 Commits (054058c980886079f5b5102cff1b4f07fc0cd396)

Author SHA1 Message Date
rjtanner e9005f37a8 Set floor tiles in the blacksmith area of Brest CVT (/brest/shops/brest.cvt) to shop tiles (type 68) in order for the conversion anvils to function properlly, also removed some unneeded double stacked slate floor tiles 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11445 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 19:36:16 +00:00
anmaster 499b7f770d Fix a case of "TabError: inconsistent use of tabs and spaces in indentation" in /python/IPO/receive.py 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11444 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 18:55:51 +00:00
anmaster 540ad17f62 Fix a case of "TabError: inconsistent use of tabs and spaces in indentation" in /python/IPO/say.py 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11443 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 18:42:54 +00:00
anmaster 945064b553 Fix a typo in /test/python.py that broke the exp test. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11442 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 12:49:47 +00:00
rjtanner e1ed299f38 Replace the very dangerous for new players (and multiplying) centipede with a Gnoll Champion in Beginners2 (/scorn/misc/beginners2) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11441 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 06:02:44 +00:00
rjtanner f579a29995 Make the King and Queen of Scorn (/scorn/misc/castle2) level 120 to prevent them from being charmed by players 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11440 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 05:59:06 +00:00
rjtanner 04b224a6ea Add a shop inventory sign to Ye ol' Home Depote (/navar_city/misc/buildshop) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11439 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 05:56:20 +00:00
rjtanner c3782abf12 Set quest items in Museum of Arms (/navar_city/magara/houses/museum) to no_pick to prevent pet theft abuse 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11438 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 05:54:00 +00:00
rjtanner c0adcceee6 Place no_spells (dungeon magic) tiles at the bottom most level in the stack 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11437 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 05:48:26 +00:00
rjtanner f03a0f93de Set quest items in Clem's Archery to no_pick to prevent pet theft abuse, also removed 'no_pretext 1' since this is no longer used or supported 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11436 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-11 05:45:32 +00:00
anmaster 6893e0a74d Unbreak exit from river map. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11417 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-09 18:54:17 +00:00
anmaster f904b45c15 Fix typo in message in /pup_land/rainbow/Lv1/hut3 (mistery -> mystery) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11416 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-09 18:22:08 +00:00
anmaster 2c529bbf06 Fix broken map in rainbow quest: Players got stuck in cage map due to arch on target having move_block all. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11415 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-09 18:14:33 +00:00
anmaster f7fc91ba12 Limit allowed range of stats for rings of Occidental Mages in /python/items/ring_occidental_mages.py 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11414 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-09 17:44:51 +00:00
anmaster 694b57694c Updated ChangeLog file using svn2cl. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11412 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-09 10:15:48 +00:00
anmaster 4354623217 Prevent the wagon outside scorn from being set to point to a broken random map when cfrhg is used. This happens because the wagon is unique. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11407 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-08 15:38:13 +00:00
anmaster 99e2e99a8e /HallOfDMs: Fix typo ("Wraith Hal of Selection" should be "Wraith Hall of Selection"). 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11406 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-08 15:36:55 +00:00
anmaster edb9d350f3 /test/python.py: Avoid deprecated syntax. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11405 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-08 15:34:26 +00:00
anmaster 39ac202b17 Add some missing dungeon_magic tiles to /scorn/shops/scorn.sale1. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11359 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 20:04:58 +00:00
anmaster 9461ca36e9 Fix mixed tab/space indention in some casino python scripts. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11349 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 16:34:58 +00:00
anmaster ed4a0d2b14 Fix part of bug 2457751 "Unpaid items work for some things...": Make diamondslots.py and imperialslots.py check that the object is paid for. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11348 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 16:32:36 +00:00
anmaster aaa7b7f0b9 Fix part of bug 2457751 "Unpaid items work for some things...": Make some floor in /brest/brest.scrolls.right shop floor. Also add some missing spell blocking tiles. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11347 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 16:01:54 +00:00
anmaster 43cbabaca4 Fix part of bug 2457751 "Unpaid items work for some things...": Make some floor in /scorn/shops/light_shop shop floor. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11346 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 14:05:00 +00:00
anmaster 2370079936 Fix /mlab/citydeclouds/cdcapart1: When going from player unique map to a shared map you have to use absolute paths, not relative ones. This will require updating of the maps stored for the player (if any). 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11345 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 13:53:13 +00:00
anmaster 752809ee66 Fix exit coordinates in /mlab/citydeclouds/villa/citydecloudsvillaC1 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11344 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 13:48:59 +00:00
anmaster 3adb52415f Fix part of bug 2457751 "Unpaid items work for some things...": Valkyrie altars no longer accepts unpaid items. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11343 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-06 13:33:39 +00:00
anmaster 6571131b4c Fix part 1 of bug 2369423 ("occidental mages weapons bugs"). Part 1 is weapon speed going the wrong way. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11337 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-04 17:08:57 +00:00
anmaster b4042eae5e Fix indentation in CFGamble.py 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11330 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-03 19:25:55 +00:00
anmaster 364f9f2d3c Try to be a bit more future compatible with Python 3 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11329 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-03 19:24:16 +00:00
rjtanner 99bbaf77a8 Cosmetic changes with Twin Towers maps - nicer merging with cwall (castle walls) and swall (fence) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11300 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-02-01 07:39:08 +00:00
rjtanner 42abb901c2 Typo correction on girdle of damage (was dammage) in Museum of Arms (/navar_city/magara/houses/museum) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11290 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-31 06:32:15 +00:00
rjtanner b681d14af5 Removed the cloud floor tile in the Fun Zone Obstacle Course 1 (/darcap/darcap/circus/fz_o1) in Darcap Circus, it was causing problems with the teleporter back to the Fun Zone Lobby 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11289 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-30 05:07:50 +00:00
rjtanner aa0082be02 Fix entrance from Castle Magara, floor 1 (/wolfsburg/magara/castle/floor_1) back to the world map (/world/world_128_109) 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11288 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-30 04:38:18 +00:00
anmaster 8ed8d77f9b Fix tabs in python/guilds/guild_dues.py 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11287 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-30 01:51:41 +00:00
anmaster 309e78e3e0 Correct small syntax error in CFGamble.py 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11286 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-30 01:45:22 +00:00
anmaster 3e5d3ee199 Set svn:eol-style on the python scripts in maps. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11285 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-30 01:38:39 +00:00
anmaster a1b802da6d Avoid features in the python scripts that are removed from python 3.0. This is confirmed to still work on at least python 2.5 and as far as I understand the docs also python 2.4 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11284 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-30 01:32:19 +00:00
anmaster fdbcb1b6ff Run whitespace cleanup script in maps/python. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11283 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-30 01:22:22 +00:00
anmaster aa0729ab16 Fix exit coords in /darcap/darcap/earthhouse 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11252 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-25 03:54:24 +00:00
anmaster d178f1db08 Fix destination of down stairs in /azumauindo/suno-yamatoshi/buildings/tatemonoA2. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11225 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-23 19:03:03 +00:00
rjtanner 658ddd6421 Make shop areas of Lord Byron's Castle (/santo_dominion/lord_byron/main) stand alone maps in order to support shop headers and inventory signs 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11221 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-23 06:23:53 +00:00
rjtanner 32566d4e1b Cosmetic wall changes for nicer merging 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11216 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-22 06:10:57 +00:00
rjtanner ff30e0ccb5 Restore descriptive name to stairway 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11214 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-22 05:41:46 +00:00
anmaster 808e7f570b Fix the type of stairs (should be stair2_down, was stair2_up) in /brest/pshops/pshopsinc2. 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11211 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-21 21:59:01 +00:00
rjtanner 262260a244 Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11149 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-17 08:58:03 +00:00
rjtanner e8cd09b3e1 Synch with Branches/1.x; Insert floor tiles beneath walls 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11146 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-17 07:54:17 +00:00
rjtanner 57d59351a8 Synch with Branches/1.x; Replace blocked (solid black square) arch with cave_15 (solid grey square) archetype 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11143 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-17 07:33:28 +00:00
rjtanner c4a7611906 Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11121 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-10 08:27:46 +00:00
rjtanner 6a86acae01 Restore shoprace human to map header 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11120 282e977c-c81d-0410-88c4-b93c2d0d6712
 2009-01-10 08:08:03 +00:00
rjtanner e41da7c4c8 Updated ChangeLog file using svn2cl 
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11107 282e977c-c81d-0410-88c4-b93c2d0d6712
 2008-12-24 09:16:18 +00:00