Commit Graph

7421 Commits (master)

Author SHA1 Message Date
eracc 40154aba1c Add a check_inv tile to block players that do not have the ltaprtmnt force to get into the Lone Town apartment.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5067 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-11-02 18:50:27 +00:00
eracc 70bf518719 Added personal bookshelves for the younger Zorn daughters in Zorn castle.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5066 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-11-02 14:54:52 +00:00
eracc 24930862a7 Create Zerina Zorn (eldest Zorn daughter) and add her to Zorn castle. More to come ...
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5064 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-31 00:42:23 +00:00
akirschbaum d7312b0945 Prevent players from being trapped.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5059 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-29 18:26:53 +00:00
kbulgrien 467739ecfc - Move save bed from under wall to nearby location.
- CFJavaEditor save reordered several map entries, but no other functional
  changes were made.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5055 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-29 05:10:24 +00:00
kbulgrien edaeb4c398 - Change lake corner pieces to use the same style of water as the main body of
the lake.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5054 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-29 03:04:07 +00:00
akirschbaum 2ba4163ee0 Remove level 0 wands.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5050 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-24 17:35:45 +00:00
akirschbaum 664c46aca9 Remove level 0 rods.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5044 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-22 19:59:53 +00:00
ryo_saeba 573ed3d52f Fix for bug #1573136 (Defect Altar / Wrong slaying)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5039 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-21 22:49:48 +00:00
kbulgrien 67c439b1b6 - Tags reordered due to reordering caused by save in CFJavaEditor.
- Furniture and characters moved throughout map so that standing by
  one NPC and talking only gets a response from the NPC closest to
  the player.  Previously several NPCs answered when they were not
  the closest NPC to the player.
- Character msg/endmsg text changes: redundant match strings removed;
  line wrapping removed.  Minor formatting/spelling/grammar changes.
- Dilek:  msg/endmsg refers to empty booze bottle on table, but none
  was there.  Added an empty booze bottle to Dilek's table.
- BRAGH O'LEARY: Add match strings job and name to make it more likely
  that someone can eke conversation out of him.  By default he was so
  standoffish you might not keep trying to chat with him.  His booze
  is fixed to now render on top of, instead of under, the table.
- West-wall wizard in red garb: One of his hints relates to the Pirate
  Den that moved to Wolfsburg.  Adjusted the "easy" magic ear message
  to mention Wolfsburg in that part of the text.  Also added name and
  job match strings.
- Wizard with an aura of great power:  Added match string message for
  job and name.
- Slot machines had "slaying" without a target value.  CFJavaEditor
  removed the lines.
- Bingo room table/altar on same coordinates were split up to put the
  table back in the middle line of tables.
- Dwarf lumberjack:  Now has a "name".
- Mark, 1st Tier warrior, dwarf miner, beholder, dwarf lumberjack,
  wounded fighter, pirate, pupland elves, conjurer, emissary:  Added
  name and/or job matches.
- Reworked pupland elf's conversation a bit.
- Brum talked about the Black Ice mountains, but there are no other
  references to them by that name, so now he tells you where they
  are.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5031 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-19 05:27:09 +00:00
kbulgrien eeb1f2ec78 - Minor grammatical tweak; add another message; remove redundant match strings.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5030 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-16 04:38:43 +00:00
kbulgrien b618747ff9 - Fix spelling. While at it, undo line wrapping in msg/endmsg.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5029 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-16 04:09:13 +00:00
qal21 03458f5be4 Revert revision 5021 and 5022, mistakes that Leaf and I made. For real this time.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5023 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-10 02:46:38 +00:00
qal21 e84502e845 Revert Leaf's accidental commit (rev 5021)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5022 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-10 02:32:57 +00:00
qal21 e22a8a62ab Rename 'jesus weeping' to 'Valriel weeping' in world_105_113.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5019 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-09 14:24:16 +00:00
kbulgrien 6915e8ddb1 - Gork conversation adjustments. Match strings are now regular expressions.
Reduce redundant use of keyword.  Spelling/punctuation tweaks.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5014 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-08 02:41:08 +00:00
kbulgrien 58b3227f11 - Minor punctuation and case adjustment.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5013 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-08 02:21:06 +00:00
kbulgrien 44bc61f263 - Minor punctuation and case tweaks.
- Mork match strings updated to regular expressions.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5012 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-08 02:19:42 +00:00
qal21 ff8974ba3e Add 'ledges' beside the jail teleporters, to prevent players brought there by the 'arrest' command from stepping off of the teleporter. Update the instructions sign to mention the 'arrest' command.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5011 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-07 19:24:38 +00:00
k_ahlers d1125662a0 Fixed Bug #1552319
Not the best solution but now the chapel is usable.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5006 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-07 14:47:53 +00:00
k_ahlers 0797daf1dc Solved Bug #1530018
I removed the runes and added "dungeon-magic" to the tiles
below the door. This should prevent players casting some-
thing through the door.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5005 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-07 14:27:47 +00:00
k_ahlers b62f4f78c0 Fixed Bug #1539223
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5004 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-07 14:20:18 +00:00
kbulgrien 7b294fa162 - Spelling adjustments only.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5003 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-07 02:42:25 +00:00
qal21 de6c7764f8 Add undead shaft and pirate mansion maps to svn. Created by Brad Reilly.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5002 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-06 19:44:43 +00:00
qal21 e5bb0bd8c0 Spelling correction in comment in CFWorld.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5001 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-06 18:44:09 +00:00
qal21 4505f8df6e Add Rhyzian amulet quest.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5000 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-06 18:40:46 +00:00
k_ahlers e7536f45bc Bugfix to bug #1571256
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4997 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-06 12:23:08 +00:00
kbulgrien 2f55949206 - Add map_layer item to food items and townsman3 so that they
are rendered on top of the tables/chair instead of under
  them.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4995 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-06 04:07:21 +00:00
kbulgrien 8bc38918a2 - Miscellaneous spelling and grammatical adjustments.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4988 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-10-03 03:29:06 +00:00
akirschbaum e6e36b16e0 Fix typo. (#1566639)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4984 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-28 07:27:37 +00:00
eracc ecd2ae93b8 Update to take into account larger client viewing areas.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4977 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-26 03:45:23 +00:00
qal21 3370818173 Remove tabs from multi-line string in python/IPO/banksay.py. Fixes bug #1551381.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4971 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-24 15:38:00 +00:00
kbulgrien 5a3a3c06d4 - Fixes to Scorn IPO distributed throughout the Empire.
- Correct the mailbox instructions in various towns to
  tell the reader to ask the correct person for help
  instead of Colette in Scorn.
- A few minor tweaks also made in some other IPOs.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4968 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-22 02:54:35 +00:00
kbulgrien 4b3f18fc0f - Tweak spelling/grammar in IPO
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4955 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-21 03:58:15 +00:00
eracc b2a88f287e Testing commit access with update to Zorn castle. More nasty surprises for the unwary. :-)
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4954 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-20 16:06:43 +00:00
kbulgrien 1ba483c77f - Various spelling and grammar fixes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4953 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-20 06:23:08 +00:00
kbulgrien 4ab2b7f6da - Oldcity skeleton riddle spelling fix (then --> than).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4952 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-20 06:02:30 +00:00
kbulgrien ccf2dddbbf - Fix spelling of Alfalfa's name.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4951 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-20 05:41:34 +00:00
mwedel 58fcbe1904 move some files about.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@4941 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-19 07:18:24 +00:00
akirschbaum 13c4e40803 Add missing floor tile below destroyable earthwall.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4937 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-17 15:15:30 +00:00
qal21 59c3fa1f29 Minor cleanup of slot code. Seperated payout values from logic. Still need to clean code up further and eliminate duplicated code.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4929 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-16 04:07:07 +00:00
qal21 a9e82d0988 Fix minor win jackpots on plat, imperial, and diamond slot machines. Courtesy of the anonymous submitter of tracker item #1559643.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4928 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-16 03:29:53 +00:00
qal21 d5a13773c2 Add floor under statues. Fixes bug #1555583.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4918 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-10 06:58:45 +00:00
eracc 0134daf99d Copied Yolanda Zorn with her fixed Ice robe to the castle map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4912 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 22:43:01 +00:00
eracc dd5c1385e2 Fix a problem with Yolanda's Ice Robe.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4911 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 22:41:37 +00:00
eracc b80704d0ea Fix design problem with wall hidden under one of the shop tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4910 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 21:30:13 +00:00
eracc f014ff1b53 Several new modifications to the creatures in the store and to the first
upper floor of Zorn castle. More to come later.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4909 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 20:43:51 +00:00
eracc f82a3a5f58 Committing for backup the new stuff I did today.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4908 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 20:42:17 +00:00
eracc ef03c8c93b A file containing customized things for the Zorn quest. Putting this on CVS
mainly for backup purposes.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4905 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 19:00:59 +00:00
lalo c2bcf26d79 changing the altar of Valkyrie to use flesh exp if available
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4903 282e977c-c81d-0410-88c4-b93c2d0d6712
2006-09-09 16:59:07 +00:00