Commit Graph

3098 Commits (2e3547a2be3d257b17f41b803b6a0cb6ac7c3261)

Author SHA1 Message Date
akirschbaum 2e3547a2be Fix broken trap.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14720 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-26 19:45:28 +00:00
akirschbaum 415cba8faa Remove unneeded logic from map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14719 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-26 19:35:13 +00:00
akirschbaum 0ee9c8e617 Adapt to renamed face names.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14718 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-26 18:33:01 +00:00
ryo_saeba 1dd3f8b2b9 Merge lines.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14702 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-26 07:14:38 +00:00
akirschbaum 9dcffd7445 Whitespace changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14700 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-25 18:55:53 +00:00
ryo_saeba 0955cfad77 Add shop inventory sign.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14699 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-25 13:30:45 +00:00
ryo_saeba 3c66c0be0f Fix face.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14689 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-23 20:19:14 +00:00
ryo_saeba 17c619135f Remove evil 'print'.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14676 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-21 21:11:18 +00:00
ryo_saeba 39a10aa4fd Use hole without grass.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14665 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-19 18:24:56 +00:00
akirschbaum 682bb8b96d Cosmetic changes: add floor tiles.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14661 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-19 08:03:06 +00:00
akirschbaum a65974705e Remove stray doors with walls.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14660 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-19 07:53:22 +00:00
ryo_saeba 91cb5ea408 Add some replies.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14637 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-16 20:39:06 +00:00
ryo_saeba 29b25fd904 Fix quest which can't be finished. Prevent giving multiple keys.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14633 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-16 18:53:13 +00:00
ryo_saeba 4b791bfcf8 Fix for bug #3316426: Scorn nobilityArchdukequest (second part). Fix quest step mistake.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14622 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-15 18:02:30 +00:00
ryo_saeba 98782c5c42 CRE reformatting, no change.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14621 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-15 18:01:25 +00:00
ryo_saeba 4dc1e2b9d3 Fix for bug #3316426: Scorn nobilityArchdukequest (first part). Fix quest name typo.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14620 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-15 17:59:42 +00:00
ryo_saeba 41ff2c5649 Fix for bug #3316354: Farmhouse, can't get the key. Fix wrong letter case.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14619 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-15 17:54:33 +00:00
ryo_saeba ba23389243 File reformatted by CRE, no change.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14618 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-15 17:53:36 +00:00
ryo_saeba f64dbdfab1 Fix for bug #3315687: Quest(#1): Gramp's earhorn , can't get rid of it. Syntax incoherence between item and message.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14562 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-13 16:58:02 +00:00
ryo_saeba 32553f2342 Don't cause an exception if it is not a player triggering.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14561 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-12 18:22:26 +00:00
ryo_saeba 68094029af Add autojailing scripts for PK, activated by DMs.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14535 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-09 22:20:06 +00:00
ryo_saeba 0a6b0b1664 Test jail information.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14529 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-09 21:00:09 +00:00
ryo_saeba 68a0e673c5 Fix script.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14526 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-09 19:31:13 +00:00
ryo_saeba 43041fec06 Add 'disinfect' command for DMs, removing diseases on the current map.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14525 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-09 18:57:10 +00:00
ryo_saeba b99884bb7f Replace Ancient and Legendary dragons with extracted archetype.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14523 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-07 19:06:55 +00:00
ryo_saeba 2573d2dcb2 Replace Ancient dragon with extracted archetype.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14522 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-07 19:03:47 +00:00
ryo_saeba 0380b24074 Replace Eternal dragon with extracted archetype.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14521 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-07 19:01:41 +00:00
ryo_saeba 6bf883ec37 Replace Legendary dragon with extracted archetype.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14520 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-07 18:56:50 +00:00
ryo_saeba 980a7cc445 Replace modified monster with new extracted archetype.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14518 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-06-07 18:28:20 +00:00
ryo_saeba 7a874fcdb0 Correct probably invalid connection.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14506 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-30 17:44:48 +00:00
ryo_saeba 2dd1c2aa5c Merge lines.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14505 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 22:07:29 +00:00
ryo_saeba 51390761c7 Use new awful_rat archetype, needs arch revision 14503 or more.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14504 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 21:59:30 +00:00
ryo_saeba 0737416c01 Ensure items were removed.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14501 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 18:28:07 +00:00
ryo_saeba 955102cc66 Correctly handle items with nrof 0.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14500 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 18:27:46 +00:00
ryo_saeba b8c8d764a3 Add one more test, related to broken gateway.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14499 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 18:05:13 +00:00
ryo_saeba 62d79a87c6 Fix script broken by NCP-related changes in server.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14498 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 18:04:27 +00:00
ryo_saeba 8870b46365 Quanties can be 0 for non merging, take that into account.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14497 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 17:50:39 +00:00
ryo_saeba 4ec2680733 Improve the 'buy' command, don't show already bought extensions.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14495 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-29 16:45:27 +00:00
rjtanner 419f11cf57 Cosmetic wall changes to Muramasa! (Nurnberg weapon shop) - no function changes.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14491 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-27 04:27:44 +00:00
rjtanner e5a87cd7ef Cosmetic update to Lone Town's Acme Building Supply. Floor plan matches the physical building shape. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14490 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-26 04:38:38 +00:00
rjtanner 9670877abd Updates to Lone Town's Ye Olde Shoppe of Transport. 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@14489 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-25 04:25:00 +00:00
rjtanner 1b9c224ecf Update (world) map entrance name to match map name, Acme Homebuilding Inc. is now Acme Building Supply of Wolfsburg.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14488 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-24 05:40:05 +00:00
rjtanner 4e9f672f18 Minor changes to Lone Town's Acme Building Supply. 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@14484 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-23 04:25:55 +00:00
rjtanner 4a3a9d6d19 Updates to Wolfsburg's Ye Olde Shoppe of Transport. 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@14479 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-22 05:46:45 +00:00
rjtanner ec86ec004e Cosmetic updates to Acme Building Supply of Wolfsburg. Expanded the map to include ground outside the shop walls. Floor plan matches the physical building shape. Shop item and decor layout changes. 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@14475 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-21 02:12:44 +00:00
rjtanner 31db2e7ce5 Remove line breaks in NPC dialog to Eddie's Store by the Wall in Navar.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14474 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-20 03:59:21 +00:00
rjtanner 9732d22e53 Major cosmetic update to Guild of Sages in Darcap mountain village. Expanded the map to include ground outside the shop walls. Floor plan matches the physical building shape. Door or entrance now opens when a player approaches. Shop item and decor layout changes. 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@14470 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-19 05:05:55 +00:00
rjtanner c68d4cdeb0 Removed line breaks from NPC dialog.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14468 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-18 04:54:03 +00:00
rjtanner f5d07e786e Major cosmetic update to Bob's Bakery in Darcap mountain village. Expanded the map to include ground outside the shop walls. Floor plan matches the physical building shape. Door or entrance now opens when a player approaches. Shop item and decor layout changes. 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@14467 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-17 05:12:24 +00:00
rjtanner e9ff19aa53 Removed line breaks in the instructional sign text to the Darcap Armour Shop (Smith's Armour).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14466 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-16 05:30:53 +00:00