Commit Graph

2501 Commits (694b57694c0e57fc19e63ab3655b7afc50b73cd9)

Author SHA1 Message Date
rjtanner e0ef49543c Insert missing ground tiles (grass) and lake tile to central area of Scorn
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10731 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 02:07:23 +00:00
rjtanner 8f42751835 Update building name to match internal map name
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10730 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 02:05:54 +00:00
rjtanner 70de3859b9 Cosmetic change, inserted a floor tile (vs lava) underneath the dwarven blacksmith
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10729 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 02:03:31 +00:00
rjtanner 216a52ec1a Cosmetic wall changes for nicer merging
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10728 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 01:34:40 +00:00
rjtanner 3c36d7858b Update maps in styles/specialmaps/ with unique and more descriptive map names
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10727 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 01:30:53 +00:00
rjtanner 783cb98da5 Update 'store maps' in styles/specialmaps/ with shop header code, these are the small shops that are sometimes found in randomly generated maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10726 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-26 01:17:15 +00:00
rjtanner c3c4ebc0c7 Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10715 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 07:30:36 +00:00
rjtanner 077b147985 Fix for [crossfire-Bugs-2341093] Valkyrie altars nolonger working - removed and reinserted the altar archetype corrected the issue by adding 'arch altar_valkyrie_pray_event' to the altars inventory
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10713 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 06:58:14 +00:00
lalo 76aab482bd fixing altar of Valkyrie in HallOfDMs (bug 2341093) -- r10708 fixed the abandoned temple
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10712 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 03:34:44 +00:00
rjtanner 0c25575779 Move Puddings Place map to the Scorn Harbor - the acid using monsters in this map are too deadly and crual to new and unprepaired players
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10711 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 03:22:37 +00:00
rjtanner e50e10fb4b Added missing plural names to the balms and potions
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10710 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 03:09:18 +00:00
rjtanner d4f4e390df Changes to the shop layout - more item types for sale (all levels of Potions of Life, balm of cure poison, balm of minor healing) in slightly different locations to make room for the new inventory
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10709 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 03:03:20 +00:00
rjtanner 92b8058d65 Cosmetic change with how swall (fence) merges with nearby walls
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10708 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-25 02:40:16 +00:00
lalo 44cd2d4c93 oops, committed some debugging code! Sorry :-)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10701 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 08:37:17 +00:00
lalo e22f56ee72 follow-up to last commit "allow player dragons to pick metabolism focus": also change player title. And I forgot to make the sea tiles blocking.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10700 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 07:30:55 +00:00
rjtanner f66bc0e569 Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10698 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 07:18:07 +00:00
rjtanner 42f7f89e96 Update maps with x & y entrance coordinates and difficulty level
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10696 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 07:02:18 +00:00
rjtanner 317a03e333 Redesign Bob's Bakery in darcap/town2
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10695 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 06:52:05 +00:00
rjtanner 2980deaf81 Redesign of sages tower in darcap/town2 to make them individual maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10694 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 06:27:46 +00:00
lalo fd95d90953 giving starting player dragons a slightly less short stick by letting them choose a metabolism focus
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10693 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 06:08:35 +00:00
rjtanner 24ae9f651b Redesign of fisherhouses to make them individual maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10691 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-24 05:39:32 +00:00
akirschbaum e1229f31f6 Fix incorrect face name.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10688 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-23 15:55:24 +00:00
rjtanner 2a994a2eba Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10675 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-22 02:04:52 +00:00
rjtanner 597659d3c6 Restore resist_physical 30 stat to the training demon
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10671 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-22 01:49:14 +00:00
rjtanner 2aa08b82a5 Reformat map header syntax - no functional changes
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10663 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-22 01:27:08 +00:00
kbulgrien 6da4348d23 - Remove a redundant rule from the NPC dialog.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10639 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 08:15:05 +00:00
kbulgrien 97a884773d - Add a new NPC in Goths that uses an npc_dialog.py message file to drive a
CFDialog.py driven conversation (the conversation was created before the
  author knew about CFDialog or how to use it, but it was too large to put
  into @match as it caused a server crash).  This dialog is structured, but
  state is not tracked due the informational nature of the conversation.
  The NPC drops some hints about things in Scorn that a new player might
  want to check out.  There are no spoilers, but it may serve to help a new
  player find out about some things about scorn that the author did not
  discover for ages.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10638 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 08:09:46 +00:00
kbulgrien 1bb1e16719 - Reformat for readability. No functional change.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10637 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 07:46:17 +00:00
kbulgrien cb381c6b26 - More clearly document how to write JSONs when pre or postconditions are not
needed by a particular rule.  For the inexperienced, this was a showstopper.
- Dispense with the user defined exception and replace the old handling with a
  more effective debug log message combined with a generic exception.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10636 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 07:43:24 +00:00
kbulgrien 5308835604 - Document how to successfully create rules that do not need any pre or post
conditions (by supplying and empty list).
- Add exception handling to matchConditions() and setConditions() and output
  a debug log message to facilitate debugging broken dialogs when the rules
  contain malformed condition lists.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10635 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 07:30:14 +00:00
kbulgrien 9fbc7d83ea - Add a comment noting that when debugging, a server restart is needed to put
code changes into effect.
- No functional changes.
- Whitespace changes.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10634 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 07:02:53 +00:00
rjtanner 9aea156b4b Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10633 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 03:07:32 +00:00
rjtanner 319b4d2a2d More descriptive names to the Darcap Circus maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10632 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 02:58:32 +00:00
rjtanner f9f4972aa6 Convert platinum payment altars to accept payment of any coin type, requires server update r10232 (or newer)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10631 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 02:37:29 +00:00
rjtanner 40b06c1c0a Remove no longer used name_pl tags from objects (terrain, buildings and ships) in the world maps
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10627 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-21 01:40:13 +00:00
akirschbaum 3f7dd81011 Make editor scripts work with latest Gridarta.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10625 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-20 21:58:48 +00:00
rjtanner b6db99ca2b Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10556 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-19 02:17:04 +00:00
rjtanner cde03c5ba0 Map header update and reformatting - no functional changes
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10546 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-19 01:30:46 +00:00
kbulgrien 7464daa57f Replace hut named lighthouse with one of the archetypes that actually looks
like a lighthouse with a glow radius.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10521 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 07:14:16 +00:00
kbulgrien a5c2e1259f Minor dialog rework: Remove mid-sentence line breaks and break at possible
paragraphs instead; fix capitalization/grammar/spelling; give fatman a name.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10520 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 05:36:54 +00:00
rjtanner 9f289802cb Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10519 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 03:25:04 +00:00
rjtanner 52a977a713 Apply region (whalingoutpost) to map
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10518 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 03:06:49 +00:00
rjtanner 21ff951cf8 Fix broken conversion table
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10517 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-18 03:05:42 +00:00
rjtanner 3c2f52f25f Updated ChangeLog file using svn2cl
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10505 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-17 06:31:23 +00:00
ryo_saeba 9c6e4faf99 Turning boat example map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10490 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-16 18:59:26 +00:00
akirschbaum 28850717eb Fix typo.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10484 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-16 08:53:45 +00:00
rjtanner 65fccfc7f5 Additional lever to prevent players from being trapped in the map, as pointed out by kbulgrien
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10473 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-16 05:56:21 +00:00
kbulgrien b6726a40ea Gork should not reset the conversation just because you say the wrong
word!


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10472 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 23:08:27 +00:00
kbulgrien 2db9e437fd - Reinstate an comment accidental deletion that occurred in revision 10421.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10471 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 09:08:11 +00:00
kbulgrien 9977b1298f - Add in a comment that was edited into the CFDialog page on the wiki.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10470 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-11-15 08:43:40 +00:00