Commit Graph

2549 Commits (a3fa729ae81fdff88ea906b4abb2f7dc9806fba7)

Author SHA1 Message Date
akirschbaum a3fa729ae8 Suppress some 'cannot load map file' error messages in MapValidator editor plugin script.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11680 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-05-14 20:21:26 +00:00
kbulgrien 97f78ec644 - Add a few more legitimate replies to the key question to avoid reset of the
conversation that would be aggravating.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11670 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-05-03 22:50:54 +00:00
kbulgrien 3ef00d358b - Remove duplicate floor pieces and duplicate monsters stacked on top of each
other.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11669 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-05-03 20:58:09 +00:00
kbulgrien df53937827 - Add some invisible exits along the front of the yard so you can walk off
the map there as well as along the sides.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11668 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-30 02:45:16 +00:00
kbulgrien 3726774dec - Block movement over the bar so the barkeep doesn't attack guests unless
they come back behind the bar.
- Take line breaks out of NPC messages, and tweak some of the content.
  The waitress now has a match all.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11667 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-30 00:57:17 +00:00
kbulgrien 5d3bc0d46e - Fix spelling on statue; fix wall piece in entry area.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11666 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-29 04:05:08 +00:00
kbulgrien ca3995058b - Remove extra sand tiles under grass tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11664 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-25 23:32:04 +00:00
mwedel 3ac7e824c1 Test map to test pickup of thrown objects. Map contains 2 thrown
objects (that that name), each holding one object like a normal thrown
object.  One of the objects on this map is very heavy so tests code where
object is too heavy to pick up.
MSW 2009-04-07



git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11634 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-08 06:45:24 +00:00
rjtanner 65e19c8ca8 Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11631 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-06 21:01:26 +00:00
rjtanner c3abe6b55f Final checkin of patch 'fun zone updates - ID: 2650371'; limit the number of players that can enter to eight (8)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11625 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-04 05:18:17 +00:00
rjtanner 78551dd1ca Partial checkin of patch 'fun zone updates - ID: 2650371'; enlarged the 'death area' to prevent trapping players in the map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11624 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-04 05:14:55 +00:00
rjtanner bdffb0f98e Partial checkin of patch 'fun zone updates - ID: 2650371'; enlarged the 'death area' to prevent trapping players in the map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11623 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-04 05:10:06 +00:00
rjtanner e96784370e Partial checkin of patch 'fun zone updates - ID: 2650371'; made it impossible for more than 1 to enter the obstacle course, enlarged the 'death area' to prevent trapping players in the map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11622 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-04 05:07:40 +00:00
rjtanner c8cc74ad8c Partial checkin of patch 'fun zone updates - ID: 2650371'; made it impossible for more than 2 to enter sumo wrestling, removed the clouds that conflicted with the teleporters, enlarged the 'death area' to prevent trapping players in the map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11621 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-04 05:04:00 +00:00
akirschbaum 3bd03a431a Remove duplicated floor tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11619 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-03 18:16:17 +00:00
akirschbaum 350b797d5c Fix LegacySpellConverter and MapNormalizer editor plugin scripts.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11618 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-04-02 22:09:15 +00:00
anmaster e3c5a27df5 Fix broken floor in /quests/mcz/castle_water which was using glue that was supposed to look like water (and making it a floor). Replace it with a walkable water floor with same slowdown as glue.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11596 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-03-04 19:50:06 +00:00
anmaster face5e6001 Add missing floor under wall in /quests/mcz/castle_low1
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11595 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-03-04 19:47:36 +00:00
anmaster 1f7a6d3a2c Add more altars to the indoor pickmap.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11557 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-19 23:48:12 +00:00
anmaster a82c7b1e79 Fix broken connections in the basement maps of all pshops in Brest. This may require updating unique server maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11540 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-15 15:44:32 +00:00
anmaster acd7e1b1cf Sync pshop maps with script
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11539 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-15 15:40:10 +00:00
anmaster f952a3e588 Fix some bugs in the pshop_copier script for the brest pshops.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11538 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-15 15:37:56 +00:00
anmaster 84813f777d The casino code for major wins (in all the different slot types) was missing a cast to integer, this resulted in a traceback on Python 3.x.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11481 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-14 18:00:40 +00:00
anmaster fc2ac59b2c The exchange code in /python/IPO/banksay.py was missing a cast to integer, this resulted in a traceback on Python 3.x.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11477 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-14 17:09:40 +00:00
anmaster 0c4149180d Fix a bug causing tracebacks in /python/start/dragon_attune.py. If there was no player on the changer it ended up as None which resulted in a traceback.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11460 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-12 09:28:12 +00:00
anmaster ae645b58e3 Make /python/CFDataFile.py work on both Python 2.x and Python 3.x with no need to run 2to3 for the python 3.x users.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11459 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-12 08:11:48 +00:00
anmaster d037e074c6 Replace deprecated string.split() amd string.lower() in /python/*/*.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11453 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:52:51 +00:00
anmaster c589e07ec3 Replace deprecated string.find() amd string.lower() in /python/*.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11452 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:47:17 +00:00
anmaster f312f10445 Replace deprecated string.split() and string.join() in /python/CFDataFile.py. Also open in text mode instead of binary mode to make the script work under python 3.x
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11451 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:39:10 +00:00
anmaster f813901342 Replace deprecated string.split() calls in /python/CFDialog.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11450 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:36:27 +00:00
anmaster d18ea5543e Fix tab error in CFGamble.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11449 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:20:20 +00:00
anmaster 60b5e31445 Replace deprecated string.split() calls in /python/IPO/*.py.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11448 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:08:00 +00:00
anmaster f117ef543f Fix division error in /python/items/banquet.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11447 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 21:02:23 +00:00
rjtanner 38379114b7 Removed duplicate passes (set the qty to 1) for theservant_ found in /scorn/temples/ruggilli2
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11446 282e977c-c81d-0410-88c4-b93c2d0d6712
2009-02-11 20:54:20 +00:00
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