Replace ID Grenade with SmokeGrenade (I need real Grenades now).

Maybe cloacking effect gets fixed now, btw

5 files changed, 6 insertions, 6 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 22c60ece8..14aa8b9fb 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1562,8 +1562,8 @@ item_db: (
 },
 {
 	Id: 586
-	AegisName: "Grenade"
-	Name: "Grenade"
+	AegisName: "SmokeGrenade"
+	Name: "SmokeGrenade"
 	Type: "IT_USABLE"
 	Buy: 700
 	Sell: 350
diff --git a/npc/001-1/rewards.txt b/npc/001-1/rewards.txt
index d9ffb00a2..d681f7ab8 100644
--- a/npc/001-1/rewards.txt
+++ b/npc/001-1/rewards.txt
@@ -71,7 +71,7 @@ OnInit:
     sellitem BottleOfDivineWater, 10;
 	sellitem Curshroom,6;
 	sellitem PetcaringGuide,5; // I needed to add this somewhere
-	sellitem Grenade,3;
+	sellitem SmokeGrenade,3;
 	end;
 
 /* set currency to be item 828 */
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 657d2ffb3..de9ad7816 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -55,7 +55,7 @@
                             MauveHerb,CopperOre,MaggotSlime,RawLog,ScorpionStinger,SilkCocoon,TreasureKey,
                             WhiteFur,EmptyBottle,RustyKnife,Coral,PiouLegs,Cheese,SnakeEgg,RoastedMaggot,BlueDye;
     }
-    setarray @Rares,   BrimmedHat, 5, IronIngot, 10, BronzeGift, 10, Grenade, 15;
+    setarray @Rares,   BrimmedHat, 5, IronIngot, 10, BronzeGift, 10, SmokeGrenade, 15;
 
     // Push blueprints based on your Job Level
     array_push(@Rares, AlchemyBlueprintA);
diff --git a/npc/018-2-4/lv1.txt b/npc/018-2-4/lv1.txt
index bc04dad18..5cb6b3f21 100644
--- a/npc/018-2-4/lv1.txt
+++ b/npc/018-2-4/lv1.txt
@@ -37,7 +37,7 @@ OnInit:
 	sellitem StrengthPotion,50;
 
 	sellitem Curshroom,10;
-	sellitem Grenade,4;
+	sellitem SmokeGrenade,4;
 	end;
 
 OnCountFunds:
diff --git a/npc/functions/treasure.txt b/npc/functions/treasure.txt
index cd7324af8..9e0cd14a0 100644
--- a/npc/functions/treasure.txt
+++ b/npc/functions/treasure.txt
@@ -37,7 +37,7 @@ function	script	TreasureBox	{
         if (.@t % 149 == 0 || .@r < .@ur_rate)
             .@loot=any(AtroposMixture, GoldenApple, DivineApple, MercBoxA, MoveSpeedPotion, Shemagh, EverburnPowder, IridiumOre, PlatinumOre);
         else if (.@t % 50 == 0 || .@r < 100)
-            .@loot=any(Grenade, SnakeEgg, LachesisBrew, ArrowAmmoBox, CoinBag, SilverGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, AlchemyBlueprintB);
+            .@loot=any(SmokeGrenade, SnakeEgg, LachesisBrew, ArrowAmmoBox, CoinBag, SilverGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, FluoPowder, AlchemyBlueprintB);
         else if (.@r < 1000 || .@t == 0)
             .@loot=any(MoubooSteak, ClothoLiquor, Coal, RedPlushWine, HastePotion, StrengthPotion, Dagger, BronzeGift, IronOre, CopperOre, AlchemyBlueprintA);
         else if (.@r < 4000)