Added Items needed in eden_iro.txt

Changed NPC id->constant in eden_iro.txt
Fixed case warning errors on may_hats.txt and mushroom_event.txt

4 files changed, 245 insertions, 14 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c00cc9d9b..48d2f47f7 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -113870,6 +113870,25 @@ item_db: (
 	Script: <" packageitem(); ">
 },
 {
+
+	Id: 16381
+	AegisName: "WoE_Teleport_Scroll_100_Box"
+	Name: "WoE Teleport Scroll 100 Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" getitem 12444,100; ">
+},
+{
 	Id: 16385
 	AegisName: "F_Clover_Box_Mouth2"
 	Name: "O'Riley's Green Box"
@@ -114126,6 +114145,218 @@ item_db: (
 	Script: <" getitem 5611,1; ">
 },
 {
+	Id: 16418
+	AegisName: "Giant_Fly_Wing_Box_500"
+	Name: "Giant Fly Wing Box 500"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" getitem 12212,500; ">
+},
+{
+	Id: 16419
+	AegisName: "Greed_Scroll_Box_30"
+	Name: "Greed Scroll 30 Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" getitem 14529,30; ">
+},
+{
+	Id: 16420
+	AegisName: "Adventurer_Pack"
+	Name: "Adventurer Pack"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		getitem 12208,10;
+		getitem 12210,10;
+		getitem 12216,20;
+		getitem 12215,20;
+		getitem 7621,10;
+		getitem 12209,10;
+		getitem 12211,5;
+		getitem 12450,10;
+		getitem 12448,10;
+		getitem 12446,10;
+		getitem 12206,10;
+		getitem 12445,10;
+		getitem 12447,10;
+	">
+},
+{
+	Id: 16424
+	AegisName: "Executioner_Box"
+	Name: "Executioner Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 1174,604800; ">
+},
+{
+	Id: 16425
+	AegisName: "Cutlus_Box"
+	Name: "Cutlus Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 13402,604800; ">
+},
+{
+	Id: 16426
+	AegisName: "Moonlight_Dagger_Box"
+	Name: "Moonlight Dagger Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 13026,604800; ">
+},
+{
+	Id: 16427
+	AegisName: "Wrench_Box"
+	Name: "Wrench Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 1534,604800; ">
+},
+{
+	Id: 16428
+	AegisName: "Solar_Sword_Box"
+	Name: "Solar Sword Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 13403,604800; ">
+},
+{
+	Id: 16429
+	AegisName: "Tomahawk_Box"
+	Name: "Tomahawk Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 1374,604800; ">
+},
+{
+	Id: 16430
+	AegisName: "Rudra_Bow_Box"
+	Name: "Rudra Bow Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 1729,604800; ">
+},
+{
+	Id: 16431
+	AegisName: "Pole_Axe_Box"
+	Name: "Pole Axe Box"
+	Type: 18
+	Buy: 20
+	Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <" rentitem 1419,604800; ">
+},
+{
 	Id: 16436
 	AegisName: "Libra_Crown_Box"
 	Name: "Libra Crown Box"
diff --git a/npc/custom/events/mushroom_event.txt b/npc/custom/events/mushroom_event.txt
index 1d632d3e9..29faaf979 100644
--- a/npc/custom/events/mushroom_event.txt
+++ b/npc/custom/events/mushroom_event.txt
@@ -14,13 +14,13 @@
 
 prontera,142,228,6	script	Find the Mushroom	BLACK_MUSHROOM,{
 	mes "[ Find The Mushroom ]";
-	if (!.Status)
+	if (!.status)
 		mes "There is no event at the moment!";
 	else {
 		mes "There are "+.Spawn+" Mushrooms left in "+.Map$+"!";
 		mes "Find and kill the mushrooms to gain "+getitemname(.Prize)+"!";
 	}
-	if (.Status || getgmlevel() < .GM) close;
+	if (.status || getgmlevel() < .GM) close;
 	mes "Start the event?";
 	next;
 	if(select("- No:- Yes") == 1) close;
@@ -33,14 +33,14 @@ OnInit:
 	set .Prize,512;	// Reward item ID
 	set .Amount,10;	// Reward item amount
 	set .GM,60;	// GM level required to access NPC
-	setarray .Maps$[0],"izlude","geffen","morocc","prontera"; // Possible maps
+	setarray .maps$[0],"izlude","geffen","morocc","prontera"; // Possible maps
 	end;
 
 OnMinute10:	// Start time (every hour)
-	if (.Status) end;
-	set .Status,1;
+	if (.status) end;
+	set .status,1;
 	set .Spawn,rand(1,10);	// How many Mushrooms should spawn?
-	set .Map$,.Maps$[rand(getarraysize(.Maps$))];
+	set .Map$,.maps$[rand(getarraysize(.maps$))];
 	killmonster .Map$,"All";
 	monster .Map$,0,0,"Please don't kill me!",1084,.Spawn,strnpcinfo(0)+"::OnMobKilled";
 	announce "Find the Mushroom : Total of "+.Spawn+" Mushrooms have been spawned in "+.Map$+"!",0;
@@ -54,7 +54,7 @@ OnMobKilled:
 	if (.Spawn) announce "[ "+strcharinfo(0)+" ] has killed a Mushroom. There are now "+.Spawn+" Mushroom(s) left.",bc_map;
 	else {
 		announce "The Find the Mushroom Event has ended. All the Mushrooms have been killed.",0;
-		set .Status,0;
+		set .status,0;
 	}
 	end;
 }
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index ce2c09764..1739fee07 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -36,7 +36,7 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) goto L_NOITEM;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
+	if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) goto l_noitem;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
 	delitem 5067,1;//Items: Sombrero,
 	delitem 916,920;//Items: Feather_of_Birds,
 	delitem 925,310;//Items: Bill_of_Birds,
@@ -63,7 +63,7 @@ M_2:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) goto L_NOITEM;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
+	if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
 	delitem 5098,1;//Items: Tiger_Mask,
 	delitem 1030,10;//Items: Tiger's_Footskin,
 	delitem 1029,30;//Items: Tiger_Skin,
@@ -92,7 +92,7 @@ M_3:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) goto L_NOITEM;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
+	if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) goto l_noitem;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
 	delitem 2508,1;//Items: Ragamuffin_Manteau,
 	delitem 2506,2;//Items: Manteau_,
 	delitem 2609,3;//Items: Skull_Ring,
@@ -121,7 +121,7 @@ M_4:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) goto L_NOITEM;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
+	if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) goto l_noitem;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
 	delitem 2269,3;//Items: Romantic_Flower,
 	delitem 2207,3;//Items: Fancy_Flower,
 	delitem 2612,2;//Items: Flower_Ring,
@@ -152,7 +152,7 @@ M_5:
 	next;
 	menu "Yeah.",-,"Nay.",M_Exit;
 
-	if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) goto L_NOITEM;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
+	if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) goto l_noitem;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
 	delitem 975,1;//Items: Scarlet_Dyestuff,
 	delitem 980,1;//Items: Orange_Dyestuff,
 	delitem 2272,2;//Items: Stop_Post,
@@ -165,7 +165,7 @@ M_5:
 	mes callfunc("F_Bye");
 	close;
 
-L_NOITEM:
+l_noitem:
 	mes "[Yakima]";
 	mes "You are lack of items. Please, get all the items.";
 	emotion e_sry;
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 3236313f3..4f65498ea 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -429,7 +429,7 @@ L_Exchange:
 
 // Merry Badger
 //============================================================
-moc_para01,13,22,4	script	Merry Badger#xch	882,{
+moc_para01,13,22,4	script	Merry Badger#xch	4_F_SITDOWN,{
 	mes "[Merry Badger]";
 	mes "Hello there!  I'm Merry Badger and I was hired to exchange the ^00CC00Eden Merit Badges^000000!";
 	next;