Commit Graph

7421 Commits (master)

Author SHA1 Message Date
partmedia 7945d560b8 Reorganize Scorn
- Move Barracks and Mess Hall to castle keep
- Move Fun House and Random House to southeast near arena
- Move Wizard Workshop to row of crafting buildings
- Remove closed buildings in central Scorn
- Adjust other buildings to fill in gaps

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20460 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-29 19:40:28 +00:00
partmedia b6f456c365 Move deposit box code to separate file
Give deposit boxes their own script and update all the banks.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20450 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-27 06:35:26 +00:00
partmedia 739ca3508b Restore original CFBank API
Moving accounts to player files added unnecessary complexity. Restore
original API and add code to migrate accounts back from player files.

While here, wrap CFBank with a context manager so it can be used with
the Python 'with' statement.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20449 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-27 06:35:06 +00:00
partmedia 45f873736b Remove unused imports
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20448 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-27 06:34:58 +00:00
partmedia da5bba2708 Abolish bank fees
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20419 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-10 05:30:53 +00:00
partmedia 62ff56d29c Remove unlinked copies of linked Greyshield maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20411 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-09 05:37:49 +00:00
partmedia cc436d1a8e Replace hole with ladder going up
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20410 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-09 00:05:43 +00:00
partmedia ad9064ee4d Replace portals with stairs
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20409 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-07-09 00:05:33 +00:00
rjtanner c664a99e78 New dungeon in the wilderness - Voragray's Gauntlet.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20403 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-06-30 23:10:05 +00:00
rjtanner 62369dee3e Correct plural names for strange flower and Gold Bug found in Tower of Sorcery, Wizards (lake_country/Mwizard/MwizardG) in Lake Country.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20402 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-06-30 22:01:02 +00:00
partmedia 158ac2b4e9 Correctly display hint using magic mouth
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20394 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-06-24 05:27:47 +00:00
partmedia ff097cdb12 Rotate bookshelves
While here single-space after period.

Submitted by:   Jason Zheng

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20380 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-06-04 18:12:14 +00:00
partmedia 10b364c353 Fix king's initial face
Reported by:    Jason Zheng

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20379 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-06-02 16:49:35 +00:00
partmedia c5cf283439 Minor grammatical fixes
Submitted by:   Jason Zheng

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20377 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-06-02 15:43:45 +00:00
partmedia 5ea3b77d95 Make stairs up symmetric
Submitted by:   Jason Zheng

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20369 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-06-01 17:48:37 +00:00
rjtanner bcc740fccc Layout and cosmetic updates to Royal Blacksmith (lake_country/Butakis/blacksmith) in the Fortress of Lord Butakis (lake_country/Butakis/Butakis0). No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20368 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-05-31 08:31:32 +00:00
rjtanner c7729b6478 Capitalize ali's name to Ali's Turban in related quest maps in Navar.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20345 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-05-01 04:40:01 +00:00
rjtanner c1abeb9b45 Update and expand Museum of Arms (navar_city/magara/houses/museum) in Navar to include shields and other new additions. Also updated the Navar world map (world/world_122_117) for entrance coordinate changes in the Museum.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20344 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-03-29 06:02:33 +00:00
rjtanner fc656be778 Correct what material the Floe Shield is made of in Glacier Keep, Frost Lair (whalingoutpost/misc/castleb3), it now correctly identifies as made of iron and ice.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20343 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-03-27 04:55:19 +00:00
rjtanner 0451ed7f0b Updated displayed weapons in Museum of Arms (navar_city/magara/houses/museum) in Navar to include recently added weapons. Requires archetype update r20340 or newer.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20341 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-03-26 05:58:05 +00:00
rjtanner 6511065aba New cave themed temple map, Shrine to Gnarg (wolfsburg/temple/shrine_to_gnarg) found in Wolfsburg (world/world_128_109).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20337 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-03-01 05:54:35 +00:00
rjtanner e03d6d9701 Cosmetic changes to Temple to Ixalovh (santo_dominion/temples/ixalovh-temple) in Santo Dominion. World map (world/world_102_107) entrance coordinates updated due to size change of the temple map. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20331 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-01-31 22:05:17 +00:00
rjtanner c859372505 Correct wrong exit coordinates from Temple to Ixalovh (santo_dominion/temples/ixalovh-temple) in Santo Dominion to the world map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20325 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-01-16 23:49:47 +00:00
rjtanner 611049069f Correct a typo in the region setting to the Valkyrie and Ixalovh temple maps in (santo_dominion/temples/) in Santo Dominion.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20323 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-01-03 07:09:39 +00:00
rjtanner a1f1040a3c New temple map, Temple to Valkyrie (santo_dominion/temples/valkyrie-temple) just outside of Santo Dominion (world/world_102_108).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20322 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-12-31 04:22:12 +00:00
rjtanner f6d161b335 New temple map, Temple to Ixalovh (santo_dominion/temples/ixalovh-temple) north of Santo Dominion (world/world_102_107).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20321 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-12-31 03:05:38 +00:00
rjtanner b9348cb9ed New temple map, Shrine of Ruggilli (wolfsburg/volcano/temples/ruggilli) near the Volcano in Wolfsburg (world/world_129_108).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20320 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-11-30 22:57:58 +00:00
rjtanner 3772e2e781 Additional mini chapel maps for the remaining cult altars
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20317 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-09-28 06:41:38 +00:00
rjtanner 40cf5985df New maps, Temple of Gnarg (lake_country/temples/gnarg-temple) and related dungeon, Foul Smelling Cave (lake_country/dungeons/foul-smelling-cave) in Lake Country. Map entrance created in the world map (world/world_109_127) as well.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20316 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-08-31 22:47:54 +00:00
rjtanner b09d7c2638 Updated and modified Beginners 2 (scorn/misc/beginners2) and modified Scorn world map (world/world_105_116) to make use of the mini-quest of Beginners 2 Entry map. Requires update r20294.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20295 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-07-31 19:17:35 +00:00
rjtanner bf5b23bd9d New map, Beginners 2 Entry (scorn/misc/beginners2_entry) in Scorn. Offers quest rewards like the Beginners map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20294 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-07-31 19:14:35 +00:00
rjtanner 722b05a51f Ground changes to Beginners Entry (scorn/misc/beginners_entry) so that it matches the nearby terrain in the world map. Cosmetic change only, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20291 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-07-29 05:25:39 +00:00
rjtanner be49158654 Bug 817, Cloud Word Castle not accessible. City de Cloud map updates to link stairs and other entrances and exits to the recently added maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20290 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-30 23:26:32 +00:00
rjtanner 3d86c74852 Bug 817, Cloud Word Castle not accessible. Significant technical cleanup and inappropriate content purge before the initial import of missing maps cdccotgf1 and cdccotgf2 (mlab/citydeclouds/cdccotgf*).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20289 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-30 23:24:14 +00:00
rjtanner 6c83fe745a Placed Darcap Orc Pits (darcap/darcap/circus/fz_orcpit) in to darcapcircus region.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20288 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-30 05:15:16 +00:00
rjtanner aa564ddb9f Give maps unique names again, update references to Pup Land for consistency. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20287 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-26 04:58:42 +00:00
akirschbaum c018d89c01 Remove redundant semicolons.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20286 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-19 15:19:52 +00:00
akirschbaum 2fc8c10923 Do not use mutliple statements in one line.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20285 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-19 15:13:49 +00:00
akirschbaum 591b77cb83 Do not mix spaces and TABs for indentation.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20284 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-19 15:12:01 +00:00
akirschbaum 8a34bc3d67 test/newmaps/madness_maze/scripts/madnessmaze1.py: Fix syntax error.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20283 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-06-19 15:00:31 +00:00
silvernexus 15b2dfef01 Prevent setting of start numbers from affecting the generation seed.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20281 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-25 03:43:26 +00:00
silvernexus bb9dd56fa6 Add very high mountains to land.c map generation algorithm.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20280 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-25 02:56:49 +00:00
silvernexus 81829617db Updated land generator tool to use high mountains instead of wasteland, generate beaches at low altitude, and not generate compiler warnings.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20279 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-24 16:32:30 +00:00
silvernexus 274e5264ca Found some more public books to make start identified like the other public books.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20276 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-22 20:01:02 +00:00
silvernexus a874adeb8a Replace two uses of dict.has_key() in python dialog scripts with use of "in" operator.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20269 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-21 03:50:17 +00:00
silvernexus dad71b985b Made the default books lying around Scorn start identified.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20256 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-17 21:32:52 +00:00
rjtanner b7ce9e02eb Added entrance coordinates and difficulty level to Lake Temple of Ixalovh (lake_country/temples/ixalovh-temple) in Lake Country.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20242 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-06 23:17:12 +00:00
rjtanner 38f614ca3e New map, War Temple of Valkyrie (lake_country/Butakis/temples/valkyrie-temple) in Fortress of Lord Butakis (lake_country/Butakis/Butakis0).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20241 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-06 23:14:58 +00:00
rjtanner 691ff7640c Added elevation tiles around the building structure of Lake Temple of Ixalovh (lake_country/temples/ixalovh-temple) in Lake Country. Cosmetic change, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20240 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-05-06 00:10:59 +00:00
rjtanner 0b43c3be52 Added base content for Barracks (brest/dungeons/kolmtak-mine/kolmtak-barracks*) in Kolmtak Mine area (under_world/uworld_110_123).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20236 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-04-30 18:05:14 +00:00