Replace countitemcolor to countitem.

13 files changed, 60 insertions, 60 deletions

diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt
index 66431f7d..528e7e56 100644
--- a/npc/000-0-1/narrator.txt
+++ b/npc/000-0-1/narrator.txt
@@ -23,7 +23,7 @@
         l("..."),
         l("Wake-up!");
 
-    if (countitemcolor(718) == 1) delitem 718, 1;
+    if (countitem(718) == 1) delitem 718, 1;
     setq General_Narrator, 1;
     setq ShipQuests_Nard, 6;
     savepoint "001-2-22.gat", 50, 38;
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 50e4445a..b4749d1e 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -86,7 +86,7 @@ L_TaskGiven:
 L_Menu:
     menu
         rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), L_Couwan,
-        rif(countitemcolor(714) > 0 || countitemcolor(715) > 0 || countitemcolor(716) > 0, l("I have some food for you.")), L_CollectSmthing,
+        rif(countitem(714) > 0 || countitem(715) > 0 || countitem(716) > 0, l("I have some food for you.")), L_CollectSmthing,
         rif(getq(ShipQuests_Gugli) < 2, l("Who should I search for?")), L_SailorNames,
         rif(getq(ShipQuests_Gugli) < 2, l("Where can I find your crew?")), L_Location,
         l("Bye!"), L_Quit;
@@ -140,7 +140,7 @@ L_Couwan:
     next;
     mesq l("May this be a lesson for you.");
 
-    if (countitemcolor(713) > 0) delitem 713, 1;
+    if (countitem(713) > 0) delitem 713, 1;
     setq ShipQuests_Couwan, 2;
     Zeny = Zeny + 10;
     getexp 40, 0;
@@ -186,12 +186,12 @@ L_Lean:
     close;
 
 L_TaskDone:
-    if (countitemcolor(714) == 2) delitem 714, 2;
-    if (countitemcolor(715) == 2) delitem 715, 2;
-    if (countitemcolor(716) == 2) delitem 716, 2;
-    if (countitemcolor(714) == 1) delitem 714, 1;
-    if (countitemcolor(715) == 1) delitem 715, 1;
-    if (countitemcolor(716) == 1) delitem 716, 1;
+    if (countitem(714) == 2) delitem 714, 2;
+    if (countitem(715) == 2) delitem 715, 2;
+    if (countitem(716) == 2) delitem 716, 2;
+    if (countitem(714) == 1) delitem 714, 1;
+    if (countitem(715) == 1) delitem 715, 1;
+    if (countitem(716) == 1) delitem 716, 1;
     setq ShipQuests_Gugli, 2;
 
     Zeny = Zeny + 250;
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 89e3adf8..ebd8b3e5 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -32,7 +32,7 @@ OnTouch:
 
     if (.@nard == 4) goto L_GotoNard;
     if (.@nard == 5) goto L_End;
-    if (.@nard > 0 && countitemcolor(718) > 0) goto L_Key;
+    if (.@nard > 0 && countitem(718) > 0) goto L_Key;
 
     setcamnpc "Julia";
     mesn "Julia";
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index d6be1d03..d339b862 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -48,8 +48,8 @@ L_Menu:
     menu
         rif(.@q3 == 5 && .@q4 < 1, l("What can I do now?")), L_GotoSleep,
         rif(.@q3 == 3 && .@q2 == 0, l("I heard rumors about some old hostilities between you and Gado. Are they true?")), L_Rumors,
-        rif(.@q2 == 2 && countitemcolor(717, 1), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), L_Regret,
-        rif(.@q2 == 2 && countitemcolor(717, 1), l("I have brought you a tasty present for your delicate mouth.")), L_PoisonJulia,
+        rif(.@q2 == 2 && countitem(717), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), L_Regret,
+        rif(.@q2 == 2 && countitem(717), l("I have brought you a tasty present for your delicate mouth.")), L_PoisonJulia,
         rif(getskilllv(1) != 9, l("Something is wrong with me, I can't smile nor sit.")), L_BasicSkill,
         lg("I made a mistake, I would like to change my language."), L_ChooseLang,
         l("Could you explain to me where I am?"), L_WhereIam,
@@ -206,7 +206,7 @@ L_PoisonJulia:
     mesq l("Seems yummy! Let me taste it!");
     next;
     mesq l("Hmmm, hm... *cough*, *cough*, *burp*, *cough*. What... What is that?!... *cough*, *burp*... Damn Gado... *cough*");
-    if (countitemcolor(717) > 0) delitem 717, 1;
+    if (countitem(717) > 0) delitem 717, 1;
     setq ShipQuests_ChefGado, 3;
 
     close;
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 065c3762..cd20697a 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -168,22 +168,22 @@ L_Accepted:
 L_GiveFood:
     mes "";
     menuint
-        rif(countitemcolor(501, 1), l(getitemname(501))), 0,
-        rif(countitemcolor(502, 1), l(getitemname(502))), 502,
-        rif(countitemcolor(503, 1), l(getitemname(503))), 503,
-        rif(countitemcolor(504, 1), l(getitemname(504))), 504,
-        rif(countitemcolor(505, 1), l(getitemname(505))), 505,
-        rif(countitemcolor(506, 1), l(getitemname(506))), 0,
-        rif(countitemcolor(507, 1), l(getitemname(507))), 2,
-        rif(countitemcolor(508, 1), l(getitemname(508))), 1,
-        rif(countitemcolor(509, 1), l(getitemname(509))), 509,
-        rif(countitemcolor(510, 1), l(getitemname(510))), 1,
-        rif(countitemcolor(512, 1), l(getitemname(512))), 512,
-        rif(countitemcolor(513, 1), l(getitemname(513))), 0,
-        rif(countitemcolor(515, 1), l(getitemname(515))), 515,
-        rif(countitemcolor(516, 1), l(getitemname(516))), 1,
-        rif(countitemcolor(518, 1), l(getitemname(518))), 1,
-        rif(countitemcolor(519, 1), l(getitemname(519))), 1,
+        rif(countitem(501), l(getitemname(501))), 0,
+        rif(countitem(502), l(getitemname(502))), 502,
+        rif(countitem(503), l(getitemname(503))), 503,
+        rif(countitem(504), l(getitemname(504))), 504,
+        rif(countitem(505), l(getitemname(505))), 505,
+        rif(countitem(506), l(getitemname(506))), 0,
+        rif(countitem(507), l(getitemname(507))), 2,
+        rif(countitem(508), l(getitemname(508))), 1,
+        rif(countitem(509), l(getitemname(509))), 509,
+        rif(countitem(510), l(getitemname(510))), 1,
+        rif(countitem(512), l(getitemname(512))), 512,
+        rif(countitem(513), l(getitemname(513))), 0,
+        rif(countitem(515), l(getitemname(515))), 515,
+        rif(countitem(516), l(getitemname(516))), 1,
+        rif(countitem(518), l(getitemname(518))), 1,
+        rif(countitem(519), l(getitemname(519))), 1,
         l("I don't have anything good for you today."), -1;
 
     .@id = @menuret;
@@ -191,7 +191,7 @@ L_GiveFood:
     if (.@id == 0) goto L_NoReward; // In case of wrong food.
     if (.@id == 1) goto L_Poison; // In case of poisoned food.
     if (.@id == 2) goto L_NoMore; // In case of Piberries.
-    if (countitemcolor(.@id) == 0) goto L_Quit;
+    if (countitem(.@id) == 0) goto L_Quit;
 //  if (.@id == item's ID) then food is correct.
 // Do not put any other number than -1, 0, 1, 2 or the item's ID, that'll avoid confusion.
 
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index e025ba27..4a6a5c3b 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -23,7 +23,7 @@
     if (.@q == 2) goto L_PoisonAccepted;
     if (.@q == 3) goto L_PoisonJulia;
     if (.@q == 4) goto L_QuestComplete;
-    if (.@q == 5 && countitemcolor(717) > 0) goto L_Aborting;
+    if (.@q == 5 && countitem(717) > 0) goto L_Aborting;
     if (.@q > 4) goto L_QuestAborted;
     if (.@n == 3) goto L_QuestStart;
 
@@ -103,7 +103,7 @@ L_QuestAccepted:
     next;
 
     menu
-        rif(countitemcolor(505) > 1 && countitemcolor(512) > 0 && countitemcolor(509) > 0 && countitemcolor(508) > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll,
+        rif(countitem(505) > 1 && countitem(512) > 0 && countitem(509) > 0 && countitem(508) > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll,
         l("What are your needs?"), L_Need,
         l("Where can I find a half croconut?"), L_OpenCroconut,
         l("Not yet. I will be back soon."), L_Quit;
@@ -189,7 +189,7 @@ L_Aborting:
     next;
     mesq lg("Give me back this dish, you dirty liar!");
 
-    if (countitemcolor(717) > 0) delitem 717, 1;
+    if (countitem(717) > 0) delitem 717, 1;
 
     next;
     mesq l("You're like the rest of this filthy crew, I can't trust you!");
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index e0093c09..5c57b66f 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -45,7 +45,7 @@ OnTouch:
     next;
 
     menu
-        rif(countitemcolor(718) > 0, l("Use the key.")), L_Warp,
+        rif(countitem(718) > 0, l("Use the key.")), L_Warp,
         l("Break the door."), L_Break,
         l("Go away."), -;
 
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index 32e21365..844671af 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -11,7 +11,7 @@
 //    1   Get a cookie.
 
 001-1,39,38,0	script	Cookie Master	NPC_COOKIE_MASTER,{
-    if ((countitemcolor(517) == 0) && (getq(General_Cookies) == 1))
+    if ((countitem(517) == 0) && (getq(General_Cookies) == 1))
         goto L_LostCookie;
     if (getq(General_Cookies) == 1)
         goto L_GetCookie;
diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt
index 5a13b094..ddf908b0 100644
--- a/npc/001-1/fexil.txt
+++ b/npc/001-1/fexil.txt
@@ -79,7 +79,7 @@
     menuint
         l("OK, let's trade."), 1,
         rif(.@fexil == 2, l("Do you still need help?")), 2,
-        rif(.@fexil > 2 && countitemcolor(729) > 0, l("I have some fur for you.")), 3,
+        rif(.@fexil > 2 && countitem(729) > 0, l("I have some fur for you.")), 3,
         l("No, Sorry."), 4;
 
     switch (@menuret)
@@ -107,7 +107,7 @@
                         l("Please enter a valid amount.");
                     continue;
                 }
-                if (.@amount > countitemcolor(729))
+                if (.@amount > countitem(729))
                 {
                     speech 5,
                         l("You don't have enough @@ on yourself.", getitemlink(729));
diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt
index 786dce5f..7da23dd6 100644
--- a/npc/001-2-22/alige.txt
+++ b/npc/001-2-22/alige.txt
@@ -172,22 +172,22 @@ L_Accepted:
 L_GiveFood:
     mes "";
     menuint
-        rif(countitemcolor(501, 1), l(getitemname(501))), 0,
-        rif(countitemcolor(502, 1), l(getitemname(502))), 502,
-        rif(countitemcolor(503, 1), l(getitemname(503))), 503,
-        rif(countitemcolor(504, 1), l(getitemname(504))), 504,
-        rif(countitemcolor(505, 1), l(getitemname(505))), 505,
-        rif(countitemcolor(506, 1), l(getitemname(506))), 0,
-        rif(countitemcolor(507, 1), l(getitemname(507))), 2,
-        rif(countitemcolor(508, 1), l(getitemname(508))), 1,
-        rif(countitemcolor(509, 1), l(getitemname(509))), 509,
-        rif(countitemcolor(510, 1), l(getitemname(510))), 1,
-        rif(countitemcolor(512, 1), l(getitemname(512))), 512,
-        rif(countitemcolor(513, 1), l(getitemname(513))), 0,
-        rif(countitemcolor(515, 1), l(getitemname(515))), 515,
-        rif(countitemcolor(516, 1), l(getitemname(516))), 1,
-        rif(countitemcolor(518, 1), l(getitemname(518))), 1,
-        rif(countitemcolor(519, 1), l(getitemname(519))), 1,
+        rif(countitem(501), l(getitemname(501))), 0,
+        rif(countitem(502), l(getitemname(502))), 502,
+        rif(countitem(503), l(getitemname(503))), 503,
+        rif(countitem(504), l(getitemname(504))), 504,
+        rif(countitem(505), l(getitemname(505))), 505,
+        rif(countitem(506), l(getitemname(506))), 0,
+        rif(countitem(507), l(getitemname(507))), 2,
+        rif(countitem(508), l(getitemname(508))), 1,
+        rif(countitem(509), l(getitemname(509))), 509,
+        rif(countitem(510), l(getitemname(510))), 1,
+        rif(countitem(512), l(getitemname(512))), 512,
+        rif(countitem(513), l(getitemname(513))), 0,
+        rif(countitem(515), l(getitemname(515))), 515,
+        rif(countitem(516), l(getitemname(516))), 1,
+        rif(countitem(518), l(getitemname(518))), 1,
+        rif(countitem(519), l(getitemname(519))), 1,
         l("I don't have anything good for you today."), -1;
 
     .@id = @menuret;
@@ -195,7 +195,7 @@ L_GiveFood:
     if (.@id == 0) goto L_NoReward; // In case of wrong food.
     if (.@id == 1) goto L_Poison; // In case of poisoned food.
     if (.@id == 2) goto L_NoMore; // In case of Piberries.
-    if (countitemcolor(.@id) == 0) goto L_Quit;
+    if (countitem(.@id) == 0) goto L_Quit;
 //  if (.@id == item's ID) then food is correct.
 // Do not put any other number than -1, 0, 1, 2 or the item's ID, that'll avoid confusion.
 
diff --git a/npc/001-2-23/doors.txt b/npc/001-2-23/doors.txt
index 3d67291c..e7a7bbea 100644
--- a/npc/001-2-23/doors.txt
+++ b/npc/001-2-23/doors.txt
@@ -45,7 +45,7 @@ OnTouch:
     next;
 
     menu
-        rif(countitemcolor(718) > 0, l("Use the key.")), L_Warp,
+        rif(countitem(718) > 0, l("Use the key.")), L_Warp,
         l("Break the door."), L_Break,
         l("Go away."), -;
 
diff --git a/npc/functions/inventoryplace.txt b/npc/functions/inventoryplace.txt
index 0d8fe397..35c2b6e9 100644
--- a/npc/functions/inventoryplace.txt
+++ b/npc/functions/inventoryplace.txt
@@ -13,7 +13,7 @@
 function	script	inventoryplace	{
     getinventorylist;
     .@iteminfo = getiteminfo(getarg(0), 2);
-    .@countitem = countitemcolor(getarg(0));
+    .@countitem = countitem(getarg(0));
 
     if (checkweight(getarg(0), getarg(1)) == 0) goto L_Warn;
     if ((.@iteminfo < 4) && (.@countitem == 0) && (.@inventorylist_count < 100)) return;
diff --git a/npc/items/croconut.txt b/npc/items/croconut.txt
index f7f1d7e1..a6cc5178 100644
--- a/npc/items/croconut.txt
+++ b/npc/items/croconut.txt
@@ -6,8 +6,8 @@
 //    Allows to cut a Croconut in multiple parts.
 //
 // Possible choices for L_Weapon:
-//    rif(countitemcolor(35xx, 1), l(getitemname(xx))), L_Weak,
-//    rif(countitemcolor(35yy, 1), l(getitemname(yy))), L_Good,
+//    rif(countitem(35xx), l(getitemname(xx))), L_Weak,
+//    rif(countitem(35yy), l(getitemname(yy))), L_Good,
 
 000-2-1,0,0,0	script	Croconut	NPC_HIDDEN,{
     close;
@@ -31,8 +31,8 @@ L_Weapon:
     next;
 
     menu
-        rif(countitemcolor(3500) > 0, l(getitemname(3500))), L_Weak,
-        rif(countitemcolor(3501) > 0, l(getitemname(3501))), L_Weak,
+        rif(countitem(3500) > 0, l(getitemname(3500))), L_Weak,
+        rif(countitem(3501) > 0, l(getitemname(3501))), L_Weak,
         l("Bare Hands"), -;
 
 L_TooWeak: