From 6fe030872ac147a3223bc632350f93045d06fbee Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Wed, 17 Jun 2009 09:05:54 +0000 Subject: [PATCH] Remove 'rod' shopitems specifications; these have been merged into 'horn'. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11922 282e977c-c81d-0410-88c4-b93c2d0d6712 --- azumauindo/suno-yamatoshi/shops/magicshop1 | 2 +- azumauindo/suno-yamatoshi/shops/magicshop2 | 2 +- brest/shops/brest.magic | 2 +- lake_country/shops/klondors_wands | 2 +- navar_city/misc/city1magic | 2 +- navar_city/misc/dragon_guild | 2 +- pup_land/lone_town/shops/transport.shoppe | 2 +- quests/cd/cd.store.753 | 2 +- scorn/shops/magicshop | 2 +- wolfsburg/shops/transport.shoppe | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/azumauindo/suno-yamatoshi/shops/magicshop1 b/azumauindo/suno-yamatoshi/shops/magicshop1 index 4e32b9e01..e8b5f04c1 100644 --- a/azumauindo/suno-yamatoshi/shops/magicshop1 +++ b/azumauindo/suno-yamatoshi/shops/magicshop1 @@ -3,7 +3,7 @@ name Kijutsu Shijou, Level 1 reset_timeout 7200 difficulty 40 region azumauindo -shopitems potion:0;ring:5;horn:20;book:10;spellbook:30;rod:10;wand:10;scroll:10;skillscroll:5;power_crystal:10;*:-95 +shopitems potion:0;ring:5;book:10;spellbook:30;rod:10;wand:10;scroll:10;skillscroll:5;power_crystal:10;*:-95 shopgreed 1.30000 shopmin 200 shopmax 100000 diff --git a/azumauindo/suno-yamatoshi/shops/magicshop2 b/azumauindo/suno-yamatoshi/shops/magicshop2 index f928ba91b..4f7d088d7 100644 --- a/azumauindo/suno-yamatoshi/shops/magicshop2 +++ b/azumauindo/suno-yamatoshi/shops/magicshop2 @@ -3,7 +3,7 @@ name Kijutsu Shijou, Level 2 reset_timeout 7200 difficulty 40 region azumauindo -shopitems potion:0;ring:5;horn:20;book:10;spellbook:30;rod:10;wand:10;scroll:10;skillscroll:5;power_crystal:10;*:-95 +shopitems potion:0;ring:5;book:10;spellbook:30;rod:10;wand:10;scroll:10;skillscroll:5;power_crystal:10;*:-95 shopgreed 1.30000 shopmin 200 shopmax 100000 diff --git a/brest/shops/brest.magic b/brest/shops/brest.magic index 7e3b854b4..9a00e7864 100644 --- a/brest/shops/brest.magic +++ b/brest/shops/brest.magic @@ -2,7 +2,7 @@ arch map name Brest Magic difficulty 9 region brest -shopitems cloak:5;spellbook:35;ring:15;book:28;scroll:25;wand:28;armour improver:2;weapon improver:2;rod:32;potion:10;horn:35;amulet:17;power_crystal:25;gem:0;lamp:-10;*:-90 +shopitems cloak:5;spellbook:35;ring:15;book:28;scroll:25;wand:28;armour improver:2;weapon improver:2;rod:32;potion:10;amulet:17;power_crystal:25;gem:0;lamp:-10;*:-90 shopgreed 1.00000 shopmin 250 shopmax 200000 diff --git a/lake_country/shops/klondors_wands b/lake_country/shops/klondors_wands index a524426da..9e01ae201 100644 --- a/lake_country/shops/klondors_wands +++ b/lake_country/shops/klondors_wands @@ -2,7 +2,7 @@ arch map name Klondor's Wand Shop difficulty 25 region lakecountry -shopitems gem:20;wand:100;rod:30;horn:20;*:-60 +shopitems gem:20;wand:100;rod:30;*:-60 shopmin 10 shopmax 100000 width 16 diff --git a/navar_city/misc/city1magic b/navar_city/misc/city1magic index 405b01c25..7b3b89eb6 100644 --- a/navar_city/misc/city1magic +++ b/navar_city/misc/city1magic @@ -4,7 +4,7 @@ reset_timeout 7200 fixed_resettime 1 difficulty 15 region navar -shopitems power_crystal:30;rod:36;skillscroll:15;weapon improver:10;armour improver:10;scroll:32;wand:34;spellbook:42;ring:20;amulet:23;horn:39;potion:18;gem:2;cloak:2;*:-40 +shopitems power_crystal:30;rod:36;skillscroll:15;weapon improver:10;armour improver:10;scroll:32;wand:34;spellbook:42;ring:20;amulet:23;potion:18;gem:2;cloak:2;*:-40 shopgreed 1.00000 shopmin 40 shopmax 500000 diff --git a/navar_city/misc/dragon_guild b/navar_city/misc/dragon_guild index ebc3195e4..49f9a6f04 100644 --- a/navar_city/misc/dragon_guild +++ b/navar_city/misc/dragon_guild @@ -3,7 +3,7 @@ name Navar Dragon Guild fixed_resettime 1 difficulty 1 region navar -shopitems cloak:20;gem:20;scroll:20;wand:21;rod:22;horn:24;ring:26;amulet:22;treasure:16;*:0 +shopitems cloak:20;gem:20;scroll:20;wand:21;rod:22;ring:26;amulet:22;treasure:16;*:0 shopgreed 1.00000 shopmin 1 shopmax 500000 diff --git a/pup_land/lone_town/shops/transport.shoppe b/pup_land/lone_town/shops/transport.shoppe index b8cb3d40b..ef385ec58 100644 --- a/pup_land/lone_town/shops/transport.shoppe +++ b/pup_land/lone_town/shops/transport.shoppe @@ -3,7 +3,7 @@ name Lone Town's Ye Olde Shoppe of Transport reset_timeout 1800 difficulty 110 region lonetown -shopitems amulet:95;ring:90;potion:90;book:85;scroll:90;spellbook:90;skillscroll:90;wand:90;rod:90;horn:95;*:0 +shopitems amulet:95;ring:90;potion:90;book:85;scroll:90;spellbook:90;skillscroll:90;wand:90;rod:90;*:0 shopmin 100 shopmax 2000000 width 25 diff --git a/quests/cd/cd.store.753 b/quests/cd/cd.store.753 index 7f4bf6d7b..0cc9c494d 100644 --- a/quests/cd/cd.store.753 +++ b/quests/cd/cd.store.753 @@ -2,7 +2,7 @@ arch map name Fortress Ang, Store difficulty 10 region wilderness -shopitems gem:80;amulet:40;ring:40;book:35;scroll:40;spellbook:40;skillscroll:50;wand:40;rod:40;horn:45;lamp:95;*:-33 +shopitems gem:80;amulet:40;ring:40;book:35;scroll:40;spellbook:40;skillscroll:50;wand:40;rod:40;lamp:95;*:-33 shopmin 25 shopmax 5000 width 20 diff --git a/scorn/shops/magicshop b/scorn/shops/magicshop index 4cd1a2f47..93d9412fe 100644 --- a/scorn/shops/magicshop +++ b/scorn/shops/magicshop @@ -3,7 +3,7 @@ name Scorn Magic Shop fixed_resettime 1 difficulty 3 region scorn -shopitems amulet:25;ring:40;potion:40;book:35;scroll:40;spellbook:40;skillscroll:50;wand:40;rod:40;horn:45;*:-50 +shopitems amulet:25;ring:40;potion:40;book:35;scroll:40;spellbook:40;skillscroll:50;wand:40;rod:40;*:-50 shopmax 2000 width 18 height 16 diff --git a/wolfsburg/shops/transport.shoppe b/wolfsburg/shops/transport.shoppe index 1a9b38ae7..422d87cd4 100644 --- a/wolfsburg/shops/transport.shoppe +++ b/wolfsburg/shops/transport.shoppe @@ -3,7 +3,7 @@ name Wolfsburg's Ye Olde Shoppe of Transport reset_timeout 1800 difficulty 110 region wolfsburg -shopitems amulet:95;ring:90;potion:90;book:85;scroll:90;spellbook:90;skillscroll:90;wand:90;rod:90;horn:95;*:0 +shopitems amulet:95;ring:90;potion:90;book:85;scroll:90;spellbook:90;skillscroll:90;wand:90;rod:90;*:0 shopmin 100 shopmax 2000000 width 25