Commit Graph

227 Commits (2d73cbd974037b0ed66f4148710c1396b66b8596)

Author SHA1 Message Date
Kevin Zheng d79bf5960e Adjust lighting
Make outdoor maps outdoor, add darkness where appropriate. Add lighting
to shops or other points of interest.
2022-01-05 15:58:27 -06:00
DraugTheWhopper f02d8cbda9 Replace all instances of shop_general with shop_random.
I'm basically deprecating shop_general, at least until it's both useful and distinct from shop_random.
2021-11-03 00:56:57 -04:00
DraugTheWhopper a87308d829 Make Scorn General Shop be more "general", and less food. 2021-10-31 22:54:27 -04:00
tannerrj 88700149be Grammar and spelling corrections to NPC dialog 2021-10-04 00:43:43 -05:00
Nicolas Weeger fbf5fbb902 Add messageboard graphics and arch and use them
Patch #416 by Saiapatsu
https://sourceforge.net/p/crossfire/patches/416/
2021-08-21 19:22:11 +02:00
Nicolas Weeger 34109846d6 Describe the origin or purpose of every key
This patch will give the vast majority of the keys in the game
a message that describes the location the key was found in, or straight-up what it's used for.

It also names or renames a lot of them, although this isn't the focus (for now).

Patch https://sourceforge.net/p/crossfire/patches/415/ by Saiapatsu.
2021-08-13 18:55:09 +02:00
Andreas Kirschbaum 449fc26e37 Reorder game object attributes in canonical order 2021-08-01 17:50:28 +02:00
Andreas Kirschbaum 80beb6e1e4 Remove attributes which have the same value as the archetype 2021-08-01 14:08:39 +02:00
Nicolas Weeger 57ac000386 Fix JSON syntax 2021-07-31 18:17:29 +02:00
SilverNexus e4dc7bd517 Remove duplicate tile in Scorn gem shop. 2021-07-28 14:31:12 -04:00
rock808 32128f1751 Slight re-work of the CoffeeGoose quest
- Fill in some clue/storyline gaps, give some NPCs a little better responses
- In Oled's cafe, remove coffee converter and extra floor
2021-07-24 21:03:57 -07:00
ryo_saeba accd44d365 Use building archetypes for instructions. Requires arch r21820.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21821 282e977c-c81d-0410-88c4-b93c2d0d6712
2021-01-19 17:02:10 +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
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
rjtanner 7eaefcb799 Make Bank of Skud Vault (scorn/shops/bank-vault) an indoor map, corrects map creator error
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21234 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-06-03 22:58:19 +00:00
rjtanner edc0378480 Correct creation date in map headers, no functional changes
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21233 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-06-01 04:15:16 +00:00
rjtanner bf595f1df9 Make entrances to Astral Vault map unique, make map paths from the Astral Vault back to the banks absolute, added missing levers to the Astral Vault map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21232 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-06-01 04:03:37 +00:00
rjtanner 9e08fcf4b4 New feature map, Astral Vault - a way for players to have access to common storage that is accessible from any of the current bank maps. Requires map update r21230.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21231 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-05-31 22:27:49 +00:00
rjtanner a85dba3e00 Update instructional sign in Beginners (scorn/misc/beginners) in Scorn to remove the reference to wearing armour since it is now automatically worn as part of the character creation process.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21123 282e977c-c81d-0410-88c4-b93c2d0d6712
2020-02-29 06:52:13 +00:00
partmedia 4d904cbe9c Sell pens and blank books
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20955 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-08-15 04:18:09 +00:00
rjtanner 5f732c6be0 Patch #352 Minor door and spelling fixes in low-level Scorn. Spelling fixes to plural items for various Scorn maps.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20723 282e977c-c81d-0410-88c4-b93c2d0d6712
2019-03-17 06:13:47 +00:00
partmedia 5953f999ad Make pawn shop more greedy
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20636 282e977c-c81d-0410-88c4-b93c2d0d6712
2018-12-28 16:30:20 +00:00
silvernexus 8009926904 Change firewalls in maps to use direction instead of sp. Depends on r20469.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20471 282e977c-c81d-0410-88c4-b93c2d0d6712
2017-08-06 01:08:45 +00:00
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
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
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
partmedia cec3f88649 Fix unreachable dialog
Submitted by:   Daniel Ziem (patch #344)

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20218 282e977c-c81d-0410-88c4-b93c2d0d6712
2016-02-04 16:21:29 +00:00
partmedia e386d254b9 Update Scorn Alchemy Shop
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20190 282e977c-c81d-0410-88c4-b93c2d0d6712
2015-12-21 23:56:39 +00:00
silvernexus 6338c133a9 Removed duplicate shop tile in Scorn Weapon Shop.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20133 282e977c-c81d-0410-88c4-b93c2d0d6712
2015-12-06 18:43:28 +00:00
partmedia 9be239dc3c Give the Scorn bookstore a shopkeeper
Submitted by:   Jason Zheng

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19903 282e977c-c81d-0410-88c4-b93c2d0d6712
2015-04-13 00:40:24 +00:00
partmedia 81a642dd18 Clean up Scorn bookstore
Remove extraneous hidden wood floor tiles, fix capitalization, use
automatic spell book naming, and remove unnecessary message text.

Submitted by:   Jason Zheng

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19902 282e977c-c81d-0410-88c4-b93c2d0d6712
2015-04-13 00:40:18 +00:00
partmedia 9bbf25dad0 Update signs and match appearance outside
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19799 282e977c-c81d-0410-88c4-b93c2d0d6712
2015-02-23 04:30:37 +00:00
rjtanner 6109045758 Update to Scorn Sale Shop (scorn/shops/scorn.sale1) in Scorn to use updated random item shop item tiles. Requires archetype update r19604 or newer.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19616 282e977c-c81d-0410-88c4-b93c2d0d6712
2014-08-28 05:23:29 +00:00
partmedia c1ea1fa314 Shrink boundaries of Scorn's south city wall.
- Allow magic in the area south of Scorn's new city limits.
- Create a new south gate.
- Improve overall appearance when smoothing is enabled.
- Move around a few buildings to accommodate changes.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19522 282e977c-c81d-0410-88c4-b93c2d0d6712
2014-06-06 01:33:59 +00:00
partmedia 822dcb4a99 Remove duplicate tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18848 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-29 03:03:58 +00:00
partmedia 7cbcf575b6 Remove 'race' property in Scorn Food Shop.
In addition, pay somewhat well for flesh (this is a food shop, take into
account races such as dragons). Also improve lighting and add a special
place for players to sell stuff.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18847 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-29 03:03:43 +00:00
akirschbaum dd472884c9 Run MapNormalizer editor script on all map files.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18817 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-19 13:26:30 +00:00
akirschbaum 927add0868 Run MapNormalizer editor script on all map files.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18816 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-19 10:23:00 +00:00
rjtanner ecfe557f6f Cosmetic changes with Scorn Armour Shop (scorn/shops/armourshop) to correct a stacking issue resulting in the floor tile appearing above wall sections by the blacksmith. No functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18761 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-07-11 22:38:08 +00:00
akirschbaum 5e430c833f Remove trailing whitespace.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18703 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-05-09 11:08:11 +00:00
rjtanner 8c995582b1 Part of Patch #323 Various cosmetic changes to various places, courtesy of Kevin Zheng. Place dialogue information within Oorgh's inventory instead of as a magic_ear in Scorn Pawn Shop (scorn/shops/scorn.sale2). Technical change, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18616 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-03-21 23:19:48 +00:00
rjtanner e31bdcbfb4 Part of Patch #323 Various cosmetic changes to various places, courtesy of Kevin Zheng. Sign name and message text updates to Scorn Sale Maps (scorn/shops/scorn.sale1 and scorn/shops/scorn.sale2).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18615 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-03-21 23:12:36 +00:00
rjtanner f39a5561bc Part of Patch #323 Various cosmetic changes to various places, courtesy of Kevin Zheng. Capitalization corrections to house plant references in Scorn Sale Maps (scorn/shops/scorn.sale1 and scorn/shops/scorn.sale2).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18614 282e977c-c81d-0410-88c4-b93c2d0d6712
2013-03-21 23:11:03 +00:00
rjtanner e9752c04ec Remove weather setting (temp 50) from map header of Scorn Private Shop (scorn/shops/privateshop). Technical change, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18413 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-08-22 22:58:25 +00:00
rjtanner 942b38c206 Removed weather setting (temp 50) from map header to the private shop maps. Technical change, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18407 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-08-18 05:50:39 +00:00
rjtanner 8549bc0cfd Cosmetic and layout changes to Oled's Cafe (scorn/shops/oleds_cafe) in Scorn. Enlarged the map to include area surrounding the cafe, added some windows, changed the location of the door. Updated world map (world/world_104_116) for map entrance coordinate changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18337 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-07-03 06:52:45 +00:00
rjtanner cf3e2dd7fd Cosmetic and layout changes to Eswald's Coffee Shop (scorn/shops/coffeeshop) in Scorn. Enlarged the map to include area surrounding the shop, added some windows. Updated world map (world/world_105_116) for map entrance coordinate changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18336 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-07-02 06:46:29 +00:00
rjtanner 7005818eb7 Moved map idea credit to the map header in Bank of Skud (scorn/shops/bank) in Scorn. Technical change only, no functional changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18082 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-05-09 05:42:32 +00:00
rjtanner e86e79ea1c Enlarged the lobby area of Food Shop Warehouse (scorn/shops/foodshop) in Scorn to give players more room to move around each other. Updated world map to reflect changes in entrance coordinates.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18079 282e977c-c81d-0410-88c4-b93c2d0d6712
2012-05-08 06:22:35 +00:00