Commit Graph

6542 Commits (54f8ec403b6e190620dba378261711760aa78c71)

Author SHA1 Message Date
ryo_saeba 54f8ec403b Explicitly convert to int.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21650 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-27 16:31:47 +00:00
ryo_saeba 93c80bd357 Fix script conditions, round 3.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21649 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-27 13:24:26 +00:00
ryo_saeba 02f585973c Fix script conditions, round 2.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21648 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-27 13:07:28 +00:00
ryo_saeba 9dbb9fdaa9 Fix script conditions not working with Python3.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21647 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-27 12:38:58 +00:00
ryo_saeba 68e659dc84 Use Valkyrie's temple instead of a generic church.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21646 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-27 12:04:24 +00:00
ryo_saeba 204bfc8ee7 Change face to match animation.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21645 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-27 09:17:55 +00:00
silvernexus 08e61721bb Remove duplicate very high mountain tile hiding under another very high mountain tile at (43, 5).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21632 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-23 01:51:27 +00:00
silvernexus 3149b77f6e Remove brush tile hiding under a shallow sea tile.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21631 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-23 00:57:38 +00:00
silvernexus a05c8eb384 Fix potential for NoneType as player if Owner is null on non-player activator.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21627 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-20 03:54:58 +00:00
ryo_saeba d10fdbe1a7 Replace Temple of Valkyrie by Church of Valkyrie, adjust walls around.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21622 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-17 16:46:06 +00:00
ryo_saeba 1efa0d02f6 Fix stairs coordinates.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21621 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-17 16:20:42 +00:00
ryo_saeba 35c8592208 Move exit under an extra grass column on the right, for coherence.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21615 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-17 14:37:28 +00:00
partmedia f9d08be1af Remove duplicate dialog
These guards are positioned close enough that only one guard needs
dialog to be able to hear the player.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21607 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-12 20:43:30 +00:00
ryo_saeba 1c045b242c Fix some conversions.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21606 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-12 20:02:45 +00:00
ryo_saeba 8d8bbdcb39 Use 'Cast' instead of 'CastAbility'.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21604 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-12 16:44:09 +00:00
ryo_saeba 4318122384 Add spell casting script for arrows, adapted from patch https://sourceforge.net/p/crossfire/patches/364/
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21599 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-12 16:12:36 +00:00
ryo_saeba 8d9a295239 Add chest style map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21586 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-12-02 16:27:38 +00:00
rjtanner 244452735e Layout changes to A Small Shop (brest/shops/a_small_shop) to add more cosmetic changes to the map exterior, teleporter adjustments and world map entrance (world/world_107_123) update
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21571 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-11-29 07:58:27 +00:00
rjtanner a96dc6d3df Update Rainbow Islands (pup_land/rainbow/islands) map to have the same width and height as Pup Land world map for proper alignment and tiling in Mapper, no functional changes
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21570 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-11-29 06:49:16 +00:00
rjtanner 769c5ae4ce New maps related to Undermountain of Brittany, added to give more sense of underground depth. Still unlinked from the world map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21528 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-31 22:17:57 +00:00
rjtanner 7bdd8a1347 Minor cosmetic updates to numerous Undermountain of Brittany maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21527 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-31 22:16:04 +00:00
silvernexus b5943ff60b Fix handling in autojail when a player is killed by starvation.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21519 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-20 18:37:10 +00:00
silvernexus d0debad84d Prevent attempt to dereference None player in QuestAdvance.py.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21518 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-20 18:14:35 +00:00
silvernexus d01ba7fa68 Fix flagstone tile in entrance area of Scorn Tannery that allowed spells to be cast.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21517 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-20 18:01:46 +00:00
silvernexus dde894bb8a Improve utilization of creator arch for hint from the semi-gods creation.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21499 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-13 01:33:55 +00:00
silvernexus c4e44a4667 Fix House of Treasure only producing the "You are lucky" note and not the accompanying ring/amulet.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21494 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-11 17:43:03 +00:00
silvernexus f1b63255c3 Add additional floorstyles to random maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21481 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-07 02:17:19 +00:00
silvernexus 57e400a442 Fix museum of arms to correctly show white and balck leather cloaks.
while here, fix a mispalced magic_mouth message on a shield.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21480 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-06 17:29:33 +00:00
silvernexus 3a5338e543 Add missing map corrections for pupland tiling.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21479 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-06 17:28:09 +00:00
rjtanner e81facdc80 Remove incorrect reference to 'artifact Port Joseph Bank' in world/world_101_114 map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21470 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-01 17:41:23 +00:00
silvernexus 06e7390729 Use map tiling between pup_land/world and pup_land/rainbow/islands. Update exit references to reflect subsequent repositioning of map data.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21468 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-10-01 15:48:15 +00:00
silvernexus f254fc82a0 Update sword of Souls python code to reflect movement of handling exp scaling to caller in r21461
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21462 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-28 00:28:48 +00:00
rjtanner 2d7a1b6376 Added a description summary for Nurnberg in the regions.reg file
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21456 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-23 19:46:22 +00:00
rjtanner 6609b1d8ef Added a description summary for Ancient Pup Land in the regions.reg file
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21455 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-23 05:58:06 +00:00
rjtanner 4610f94b64 Added a description summary for Pup Land in the regions.reg file
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21454 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-23 05:39:36 +00:00
rjtanner a341eb304e Added a description summary for Brest in the regions.reg file
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21453 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-22 23:20:22 +00:00
rjtanner d25122c0e3 Added a description summary for Lone Town in the regions.reg file
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21452 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-22 22:29:02 +00:00
crowbert 6542204434 Minor English cleanup
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21389 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-09 23:14:21 +00:00
ryo_saeba 5971f28e04 Use archetypes for converters instead of custom ones.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21365 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-09 17:46:17 +00:00
ryo_saeba 27416c9746 Use 'warlock' instead of mage, which is being removed.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21362 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-09 13:40:56 +00:00
silvernexus 647022710c Adjust weapon of Souls python code to use TotalExp field instead of PermExp
Requires server r21321, recommended to use server r21326 with this change. Some builds produce a barfing cfpython plugin in r21321, while some don't. All should work in r21326.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21327 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-09-02 01:32:14 +00:00
rjtanner a9ce8b82df Numerous cosmetic, design and functional changes to Astral Vault (planes/astral-vault) to prevent players from using the map as free transportation
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21311 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-25 19:09:48 +00:00
partmedia 3e555cb5a7 Fix exit coordinate
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21310 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-24 19:11:58 +00:00
partmedia 3febd25ae7 Unmark unique exit from Astral Plane to Suno-yamatoshi
The Suno-yamatoshi uses an intermediate map before exiting to
Azumauindo. Marking the intermediate map breaks the relative path to the
bank exit, trapping players in the Astral Plane.

While here, fix capitalization.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21309 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-24 18:34:43 +00:00
partmedia 5edab52b8a Use absolute paths for exits to the Astral Vault
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21308 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-24 18:34:38 +00:00
silvernexus 7ecd9c667a Add condition to make item reset in lose_buffs_on_drop.py only occur if the items has been used since last time it was reset.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21301 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-23 02:39:00 +00:00
silvernexus 219e1b9049 Make water dipped into a fountain be identified, so as to prevent infinite alchemy experience from repeated drinking of the water and re-dipping.
Still working out how to prevent the same with smithery on the empty bottle.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21300 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-22 23:40:52 +00:00
rjtanner 5523e35dad Update trunk maps ChangeLog
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21299 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-21 19:18:00 +00:00
rjtanner 8870f2c9d1 Added the world map tile (world_120_110) south of Hamlet of Lord Marksel to the Marksel region
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21274 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-16 05:30:17 +00:00
silvernexus a7bc3f9a75 Make Rune of Sparking appear in random map traps in place of Rune of Marking, which did nothing.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21270 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-08-14 15:39:19 +00:00