Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

1 files changed, 44 insertions, 37 deletions

diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 71c33e6aa..2516a189c 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -1,13 +1,11 @@
 //===== Hercules Script ======================================
 //= 2004 Headgear Quests
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Dj-Yhn
-//===== Current Version: ===================================== 
-//= 1.6a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Current Version: =====================================
+//= 1.6b
+//===== Description: =========================================
+//= [Official Conversion]
 //= 2004 New Headgears. Official Quests
 //= 1) Black Cat Ears (payon 115 131)
 //= 2) X Hairpin, Band Aid, Flower Hairpin (geffen 129 148)
@@ -21,12 +19,12 @@
 //= 10) Model Training Hat (payon_in03 8 193)
 //= 11) Tulip Haipin (geffen 83 189)
 //= 12) Party Hat, Straw Hat, Cowboy Hat, (xmas_in 35 30)
-//=	Sombrero, Beanie 
+//=     Sombrero, Beanie 
 //= 13) Decorative Golden Bell, (yuno_in03 20 18)
-//=	Crown of Ancient Queen, Crown of Mistress
+//=     Crown of Ancient Queen, Crown of Mistress
 //= 14) Alarm Mask (alde_alche 88 180)
 //= 15) Drooping Cat, Smokie Leaf, Lazy Smokie, (morocc 273 79)
-//	Blue Fish
+//=     Blue Fish
 //= 16) Kitsune Mask (pay_dun03 48 84)
 //= 17) Orc Hero Helm (in_orcs01 31 93 & 162 33)
 //===== Additional Comments: =================================
@@ -34,11 +32,13 @@
 //= 1.5 Vito'd function call for checkweight. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.6a Added 'disable_items' command. [Euphy]
+//= 1.6b Added more 'disable_items' commands. [Euphy]
 //============================================================
 
 // Black Cat Ears
 //============================================================
 payon,115,131,3	script	Neko Neko#1	725,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -68,7 +68,7 @@ payon,115,131,3	script	Neko Neko#1	725,{
 		delitem 2213,1; //Cat_Hairband
 		delitem 983,1; //Black_Dyestuffs
 		delitem 914,200; //Fluff
-		set zeny,zeny-10000;
+		set Zeny, Zeny-10000;
 		getitem 5057,1; //Ear_Of_Black_Cat
 		next;
 		mes "[Neko Neko]";
@@ -106,6 +106,7 @@ payon,115,131,3	script	Neko Neko#1	725,{
 // X Hairpin, Band Aid, Flower Hairpin
 //============================================================
 geffen,129,148,3	script	Argen#1	779,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "[Argen]";
 		mes "Hey~ why are you carrying so many items?";
@@ -249,7 +250,7 @@ geffen,129,148,3	script	Argen#1	779,{
 			mes "Hey, that looks pretty smooth! Oh, and uh, you can keep this leftover Stem.";
 			delitem 2269,1; //Centimental_Flower
 			delitem 999,10; //Steel
-			set zeny,zeny-20000;
+			set Zeny, Zeny-20000;
 			getitem 5061,1; //Flower_Hairpin
 			getitem 905,1; //Stem
 			next;
@@ -295,6 +296,7 @@ geffen,129,148,3	script	Argen#1	779,{
 // Hot-blooded Headband
 //============================================================
 yuno,300,188,5	script	Zhenbolt#1	753,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -390,6 +392,7 @@ yuno,300,188,5	script	Zhenbolt#1	753,{
 // Red Ribbon
 //============================================================
 prontera,165,232,3	script	Nephia#1	744,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -521,7 +524,7 @@ comodo,237,217,5	script	Meruntei#1	732,{
 		delitem 5010,1; //Indian_Hair_Piece
 		delitem 5049,1; //Stripe_Band
 		delitem 7101,10; //Peco_Wing_Feather
-		set zeny,zeny-10000;
+		set Zeny, Zeny-10000;
 		getitem 5071,1; //Indian_Headband
 		next;
 		mes "[Meruntei]";
@@ -686,8 +689,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch...!";
 					mes "Why are you carrying so many items with you? Leave all your extra baggage somewhere else and come back.";
@@ -706,7 +708,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "'Angel Wing Ears!'";
 						delitem 2254,1; //Angelic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5074,1; //Ear_Of_Angel's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -745,8 +747,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch...!";
 					mes "Why are you carrying so many items with you? Leave all your extra baggage somewhere else and come back.";
@@ -762,7 +763,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "There you go, buddy. I am proud to say this is my masterpiece. I call it... 'Devil Wing Ears!'";
 						delitem 2255,1; //Satanic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5068,1; //Ear_Of_Devil's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -813,8 +814,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item. I can't mess up my artwork because of some mistake you might make. ^000000";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch, why are you carrying";
 					mes "so many items with you?";
@@ -833,7 +833,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Devil Wing Ears!'";
 						delitem 2255,1; //Satanic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5068,1; //Ear_Of_Devil's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -869,8 +869,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 			mes "I don't care how many times you've upgraded the items you brought, but please ^4d4dff carry only items that you need to create this item.^000000 I can't mess up my artwork because of some mistake you might make.";
 			next;
 			if (select("I am ready.:Okay, let me go store my other items first.") == 1) {
-				set .@now_weight,MaxWeight-Weight;
-				if (.@now_weight < 2000) {
+				if (MaxWeight - Weight < 2000) {
 					mes "[Hatbyr Mhore]";
 					mes "Ouch, why are you carrying";
 					mes "so many items with you?";
@@ -888,7 +887,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 						mes "I am proud to say this is my masterpiece. Please take this item. I call it... 'Angel Wing Ears!'";
 						delitem 2254,1; //Angelic_Chain
 						delitem 2286,1; //Elven_Ears
-						set zeny,zeny-20000;
+						set Zeny, Zeny-20000;
 						getitem 5074,1; //Ear_Of_Angel's_Wing
 						next;
 						mes "[Hatbyr Mhore]";
@@ -963,6 +962,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	813,{
 // Sea-Otter Hat
 //============================================================
 xmas,183,267,3	script	Pretty Lindsay#1	793,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -971,8 +971,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 		mes "- you put some items into Kafra Storage. -";
 		close;
 	}
-	set .@now_weight,MaxWeight-Weight;
-	if (.@now_weight < 2000) {
+	if (MaxWeight-Weight < 2000) {
 		mes "[Pretty Lindsay]";
 		mes "I know you brought everything you need for me to make you a hat, but you're carrying too much stuff. Why don't you put some of your things in Kafra Storage?";
 		close;
@@ -1078,6 +1077,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 // Teddybear Hat
 //============================================================
 xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1165,6 +1165,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 // Model Training Hat
 //============================================================
 payon_in03,8,193,4	script	Nanhyang#1	77,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1325,6 +1326,7 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 // Tulip Hairpin
 //============================================================
 geffen,83,189,5	script	Seth#1	716,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes " [Seth]";
 		mes "Whoa, why are you carrying so many items with you?";
@@ -1378,7 +1380,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "I'm done!";
 			mes "I did a good job, didn't I?";
 			next;
-			if (BaseJob == Job_Novice && Upper != 1) {
+			if (BaseJob == Job_Novice || BaseJob == Job_SuperNovice) {
 				mes "[Seth]";
 				mes "Oh, here's the leftovers. Mommy says that we should always save things. Heh heh~";
 				getitem 935,1; //Shell
@@ -1443,6 +1445,7 @@ geffen,83,189,5	script	Seth#1	716,{
 // Party Hat, Straw Hat, Cowboy Hat, Sombrero, Beanie
 //============================================================
 xmas_in,35,30,3	script	Hat Merchant#zero	797,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -1733,6 +1736,7 @@ xmas_in,35,30,3	script	Hat Merchant#zero	797,{
 // Decorative Golden Bell, Crown of Ancient Queen, Crown of Mistress
 //============================================================
 yuno_in03,20,18,6	script	Nehris#1	726,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";
@@ -1774,7 +1778,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 			delitem 10016,1; //Golden_Bell
 			delitem 714,1; //Emperium
 			delitem 969,3; //Gold
-			set zeny,zeny-20000;
+			set Zeny, Zeny-20000;
 			getitem 5091,1; //Big_Golden_Bell
 			mes "[Nehris]";
 			mes "Yoohoo~";
@@ -1812,7 +1816,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 			delitem 10006,1; //Queen's_Hair_Ornament
 			delitem 714,1; //Emperium
 			delitem 969,3; //Gold
-			set zeny,zeny-20000;
+			set Zeny, Zeny-20000;
 			getitem 5080,1; //Headgear_Of_Queen
 			mes "[Nehris]";
 			mes "Tah dah!";
@@ -1862,7 +1866,7 @@ yuno_in03,20,18,6	script	Nehris#1	726,{
 				delitem 2249,1; //Coronet
 				delitem 714,1; //Emperium
 				delitem 969,3; //Gold
-				set zeny,zeny-40000;
+				set Zeny, Zeny-40000;
 				getitem 5081,1; //Mistress_Crown
 				mes "[Nehris]";
 				mes "Yay! You've got a great looking crown!";
@@ -2070,6 +2074,7 @@ OnInit:
 // Drooping Cat, Smokie Leaf, Lazy Smokie, Blue Fish
 //============================================================
 morocc,273,79,4	script	Educated Traveller	99,{
+	disable_items;
 	if ((MaxWeight-Weight) < 5000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're over weight -";
@@ -2506,6 +2511,7 @@ OnTouch:
 }
 
 pay_dun03,48,84,4	script	Nine Tails#Kitsune Man	762,{
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you are carrying -";
@@ -2627,6 +2633,7 @@ OnMyMobDead2:
 //============================================================
 in_orcs01,31,93,1	script	Orc Warrior#1	1023,2,2,{
 OnTouch:
+	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -3625,14 +3632,14 @@ OnTouch:
 	close;
 }
 
-//============================================================ 
+//============================================================
 // Old changelog
-//============================================================ 
+//============================================================
 //= 1.01 Fixed items names iRO->kRO, fixed some bugs [Qwadrat]
-//=	Fixed possible item exploits, fixed Straw Hat
-//= 	Added missing checks [Lupus]
-//= 1.1	Fixed a bug in Giant-band-aid that didn't counting rotten bandages
-//=	Fixed a bug in Fur Hat that didn't count yarn [Evera]
+//=     Fixed possible item exploits, fixed Straw Hat
+//=     Added missing checks [Lupus]
+//= 1.1 Fixed a bug in Giant-band-aid that didn't counting rotten bandages
+//=     Fixed a bug in Fur Hat that didn't count yarn [Evera]
 //= 1.2 Syntax fixes for parenthesis, reformatting [KarLaeda]
 //= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //============================================================