Commit Graph

3079 Commits (32553f2342fc9e87ec332be18ee21d6de3a0e14e)

Author SHA1 Message Date
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
rjtanner a7ea5e7478 ChangeLog update
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14465 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-15 05:03:40 +00:00
rjtanner ba401c7802 Removed line break in NPC dialog and corrected a typo (armour vs. armo) in Smith's Armour in Darcap.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14464 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-14 06:49:20 +00:00
rjtanner 4be1b39b95 Major cosmetic update to Darcap General Store. 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@14463 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-13 06:10:35 +00:00
rjtanner 933d280ca9 Major cosmetic update to Molthir's Potionshop in Darcap. 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. Made it so accidents with the cauldron are less dangerous to other players entering the shop. 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@14462 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-12 05:14:30 +00:00
rjtanner 3cf582956a Major cosmetic update to Mirkland's Magic in Darcap. 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@14461 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-11 04:32:14 +00:00
rjtanner 33bd79e008 Cosmetic update to Spike's Weapons in Darcap. 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. Some, but very little, 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@14460 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-10 04:44:30 +00:00
rjtanner 7d8fb1e4c4 Cosmetic update to Smith's Armour in Darcap. 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. Some, but very little, 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@14459 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-09 04:03:52 +00:00
rjtanner 490d2a4090 Remove line breaks from the instructional sign in the Lord of the Rings in Santo Dominion.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14458 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-08 03:04:26 +00:00
ryo_saeba 5dd107b769 Fix walls.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14457 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-07 14:34:28 +00:00
rjtanner 18e36045db Remove line breaks in NPC dialogue at the Euthville Magic Shop.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14453 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-07 03:13:51 +00:00
rjtanner c4f87c4d1d Major cosmetic update to Wizzo's Magic Shop in Navar. 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@14452 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-06 05:25:03 +00:00
rjtanner d600b4a703 Cosmetic overhall to Bob's Fish & Chips in Darcap. Expa^Ced 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@14451 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-05 04:27:46 +00:00
rjtanner c2735c1907 Cosmetic overhall to Ye Ol' Home Depote in Navar. Exapnded 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@14450 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-04 04:35:31 +00:00
rjtanner 23eb8805e8 Major cosmetic overhall to Olaf's Armour Emporium in Navar. Exapnded 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@14448 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-05-03 05:20:06 +00:00
rjtanner 548e4e3452 Spelling correction, Red's Weapons Bazaar (not Bazzar) in Navar.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14438 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-04-29 05:42:23 +00:00
rjtanner f8338ca39b Major cosmetic overhall to Red's Weapon Bazzar in Navar. Exapnded 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@14437 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-04-29 05:40:55 +00:00
rjtanner 71e99a9dfe Major cosmetic overhaul to Eddie's Store by the Wall (general store) in Navar. Exapnded 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@14434 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-04-26 04:50:37 +00:00
rjtanner db599537e0 Small redesign of Pimol's Fine Bow Shop in Navar. Added another row of tiles around the map border outside the shop walls. Minor floor plan changes to match the building shape. Door or entrance now opens when a player approaches. Shop item layout changes. Updated world map for new map entrance destination.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14431 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-04-25 00:46:37 +00:00
rjtanner 0ad672ce3b Major cosmetic overhaul to Sages Tower in Marksel. Exapnded 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@14430 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-04-24 04:17:41 +00:00