Commit Graph

657 Commits (d22dd44c8d77ba144ab06a4bc9bdeaf159a04363)

Author SHA1 Message Date
ryo_saeba 1b2910991f Format using CRE.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15663 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-11 10:05:11 +00:00
ryo_saeba c51d622b04 Fix dialog.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15662 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-11 10:04:29 +00:00
ryo_saeba 2e679424ca Reformat with CRE.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15661 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-11 09:52:26 +00:00
ryo_saeba 68b69d1148 Take Esmeralda when completing the quest.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15660 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-11 09:52:06 +00:00
rjtanner 790df85118 Merge in changes from the guild template (r14506) to fix the connection to the inventory check for the Guild Tannery Token and the gate. Update applied to all guild maps secondfloor.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15455 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-06 00:36:14 +00:00
akirschbaum 97af5a7175 Adapt to renamed archetype names.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15452 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-05 22:37:30 +00:00
rjtanner 909f9b839a Update Scorn Sale Shop name (was shop) - world map already matched the name.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15406 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-04 04:32:52 +00:00
rjtanner ec6e563562 Name update to the Scorn General Store (was store, now Store.)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15400 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-04 00:34:43 +00:00
rjtanner 5b542db01c Added the sorcery grimoire Sparkshower as one of the books for sale at Mosely's Magic Books in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15382 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-11-02 03:58:22 +00:00
rjtanner 91c0350456 Removed duplicate floor tiles and also corrected wall sections around some of the gates to all Guild HeadQuarters maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15313 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-30 20:42:47 +00:00
ryo_saeba 7a4a1b93a8 Replace handler with specific one. Requires arch revision 15306.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15307 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 11:34:02 +00:00
ryo_saeba 275e96000c Replace handler with specific one. Requires arch revision 15303.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15304 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 10:56:21 +00:00
ryo_saeba 94432d691b Replace handler with specific one. Requires arch revision 15300.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15301 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 10:25:59 +00:00
ryo_saeba fb8deaa7e7 Replace handler with specific one. Requires arch revision 15294.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15299 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 10:11:11 +00:00
rjtanner 6f403b09a0 Add missing region (scorn) to the Guild of Mailed Fist, Master's Lounge.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15290 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 03:35:17 +00:00
rjtanner b36367bf38 Give unique and descriptive names to the Mailed Fist Guild maps in scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15289 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-29 03:34:17 +00:00
rjtanner d9cb0d25a8 Moved no_spell tiles to the bottom of the stack order to Wizard's Workshop in Scorn. Technical change, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15255 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-24 05:04:24 +00:00
rjtanner 0842ebd6a2 Removed references to name_pl Ice Illusion and name_pl Fractured Obsidian to the Wizard's Workshop in Scorn. The entries are no longer used. Technical change, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15254 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-24 05:01:43 +00:00
rjtanner 1d4b6b85b8 Changes to Wizard's Workshop in Scorn. Update map title to match reference in the world map (Wizard's Workshop instead of Wizards Workshop.) Removed double stacked wall sections.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15253 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-24 04:56:31 +00:00
rjtanner fd5bf043b3 Cosmetic changes to Wizard's Workshop in Scorn. Added outer perimeter to the original map to match the building exterior. Updated entrance/exit coordinates in world map back to the workshop.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15252 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-24 04:54:49 +00:00
rjtanner 1ad89f7a66 Remove line breaks in book text located in the Wizads Workshop in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15249 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-23 04:59:18 +00:00
rjtanner f25e6fa9bb Update walls surrounding Tannery entrance gate to Guild Hall and template second floor maps. Additional stone wall section on nearby fence. Cosmetic change only.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15238 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-22 04:03:07 +00:00
rjtanner 8aad19711a Update walls surrounding door entrances to Guild Storage Maps. Cosmetic change only.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15226 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-22 02:44:13 +00:00
rjtanner bb51a748fc Map name correction for Guild Houses Inc in Scorn, should be Inc and not Iinc.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15213 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-20 23:28:38 +00:00
ryo_saeba 03f360e23d Make the books harder to get at.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15198 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-16 12:44:28 +00:00
rjtanner 90364b010a Removed line breaks in the signs for the Dragon Guilds in Scorn and Navar. Capilization changes on the sign (dragon guild -> Dragon Guild.)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15186 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-15 03:26:01 +00:00
rjtanner 4a5f161796 Added windows to the Dragon Guild of Scorn. Also placed radius 2 light sources beneath the windows to give the windows a glowing effect at night. Cosmetic change only.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15185 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-14 03:49:21 +00:00
rjtanner 0bdcc01504 Update or correct entrance x and y coordinates in the map headers.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15174 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-10 05:16:22 +00:00
rjtanner c668292f54 Update or correct entrance x and y coordinates in the map headers.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15169 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-10-09 19:56:01 +00:00
rjtanner 5fe112b66d Update the Private Shop maps in Scorn so that each map has a unique name and added region setting (scorn) for each map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15141 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-26 02:44:15 +00:00
rjtanner 8a33b57adc Added 'blessed 1' setting to the random food items in Beginners2 of Scorn so new players do not encounter poisonous food.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15138 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-25 05:28:51 +00:00
rjtanner c3c43e9893 Place light sources under floor tiles in Medieval Kitchen in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15111 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 07:19:36 +00:00
rjtanner cf5ee4eee8 Remove line breaks in npc dialog and instruction books for the crafting shops (bowyer, smithery, tannery, kitchen, jeweler) in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15110 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 07:03:43 +00:00
rjtanner 8af0b859eb Changes to the Metal Smith's Workshop. Added some windows. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; added light sources.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15109 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 02:28:51 +00:00
rjtanner ccf4e421c9 Changes to the Metal Smith's Workshop in Scorn. Enlarged the shop so the hallways allow for multiple players to pass by each other. Expanded outside the shop to add grass tiles and cobblestone to visually match the shop's placement in the world map. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15108 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 02:19:32 +00:00
rjtanner a027f48718 Another update to Metal Smith's Workshop in Scorn. Changed the stacking order of the columns so they are above the fence (swall) corners for cosmetic purposes and to make it consistent with other maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15107 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 02:01:26 +00:00
rjtanner c24de17b56 Moved no_spell tiles beneath the floor tiles to the Metal Smith's Workshop in Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15106 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 01:59:04 +00:00
rjtanner 89e8f7153f Cosmetic changes to Scorn Tannery. Wall columns no longer block player line of sight. Additional fence (swall) sections for nicer merging with nearby walls.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15105 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 01:55:19 +00:00
rjtanner 95a241dbf1 Changes to the Scorn Tannery. Moved no_spell tiles under the floor tiles for the fenced area. Placed no_spell tiles under the invis exits outside the door - forgot to add them.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15104 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 01:49:57 +00:00
rjtanner 2905725fc5 Cosmetic update to the Scorn Tannery. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; added light sources. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15103 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 01:47:08 +00:00
rjtanner 9f46447b89 Layout changes to the Scorn Tannery house. Removed the empty (blocked) rows on the right side of the map, expanded the size of the entrance area by another row of tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15102 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-18 01:20:41 +00:00
rjtanner 041d926b2a Cosmetic update to the Bowyer's Workshop of Scorn. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; added light sources. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15095 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-17 03:06:24 +00:00
rjtanner 99e97612a2 Cosmetic update to the Jeweler's Workshop of Scorn. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; light sources already in place. Entrance area fence (swall*) re-arranged to make that area larger. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15094 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-16 04:21:18 +00:00
rjtanner 068d7193bc Place no_spells tiles under the floor tiles in the Jeweler's Workshop of Scorn.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15093 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-16 04:07:06 +00:00
rjtanner 9c242a55f3 Make the pillars in the kitchen area no longer block character line of sight. Moved no_spell tiles beneath the floor tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15092 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-15 06:02:26 +00:00
rjtanner e656900242 Updates to the Medieval Kitchen in Scorn. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; added light sources. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15091 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-15 06:00:25 +00:00
rjtanner b8083bfeb9 Updates to Jacob's Lighting Emporium in Scorn. Floor plan now similar to building exterior. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; added light sources. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15089 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-14 05:42:30 +00:00
rjtanner 0487248b1f Updated Goth's Taven in Scorn so that the map exterior matches it's placement in the world map. Updated world map for new entrance destination to the Tavern. Updated stair coordiantes on the upper and lower level of the Tavern so that they line up with the other levels.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15088 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-13 04:41:07 +00:00
rjtanner 2524b29ea1 Floor layout changes to Goth's Tavern in Scorn. Door moved to left side of the map and added windows to match the building exterior. Added a cloak room near the entrance. Moved the gate password hint so players should stumble upon it more easily. Updated world map for new entrance coordinates.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15087 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-13 04:23:52 +00:00
rjtanner da41a4fe4f Removed NPC from the floor tile inventory and placed them on top of the tile.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15086 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-09-13 03:56:39 +00:00