Imperial Bow & Banshee Bow. Armor Breaker Arrow (rare). Naftalin drop.

6 files changed, 112 insertions, 7 deletions

diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index 75051fd9..71738b12 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -977,6 +977,12 @@ LeatherShield 603
 BromenalShield 797
 DragonShield 5285
 PinkieScroll 6000
+DragonSword 589
+ImperialBow 609
+Naftalin 5288
+ArmorBreaker 5289
+SilverArrow 5290
+ThornArrow 5291
 FireGoblin 1011
 Bat 1017
 ManaBug 1131
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index b5cbc267..3b65d03d 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -5169,13 +5169,14 @@ item_db: (
 	Refine: false
 	ViewSprite: 755
 	Script: <"
-		callfunc "BrawlingItem", EQI_HEAD_MID;
+		callfunc "BrawlingItem", EQI_HEAD_MID; // @EVOL2
+		//callfunc "BrawlingItem"; // @TMWA
 		bonus bAgi, 15;
 		bonus bSpeedAddRate,  10;
 		bonus bFlee,  20;
 		bonus bHit,  20;
 		bonus bMaxHP,  200;
-		bonus bMatkRate, -3;
+		bonus bMatkRate, -3; // @EVOL2
 	">
 },
 {
@@ -15139,4 +15140,38 @@ item_db: (
 		bpet;
 	">
 },
+
+
+// Not Yet Implemented
+{
+	Id: 589
+	AegisName: "DragonSword"
+	Name: "Dragon Sword"
+},
+{
+	Id: 609
+	AegisName: "ImperialBow"
+	Name: "Imperial Bow"
+},
+{
+	Id: 5288
+	AegisName: "Naftalin"
+	Name: "Naphthalene"
+},
+{
+	Id: 5289
+	AegisName: "ArmorBreaker"
+	Name: "Armor Breaker Arrow"
+},
+{
+	Id: 5290
+	AegisName: "SilverArrow"
+	Name: "Silver Arrow"
+},
+{
+	Id: 5291
+	AegisName: "ThornArrow"
+	Name: "Thorn Arrow"
+},
+
 )
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 0407ae69..20e43532 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -3827,6 +3827,7 @@ mob_db: (
 	MutationStrength: 10
 	Drops: {
 		TreasureKey: 800
+		Naftalin: 150
 		UndeadEar: 90
 		UndeadEye: 80
 		RottenRags: 70
diff --git a/world/map/db/mob_db_over_150.txt b/world/map/db/mob_db_over_150.txt
index 530725b2..6b9dcc7f 100644
--- a/world/map/db/mob_db_over_150.txt
+++ b/world/map/db/mob_db_over_150.txt
@@ -23,6 +23,6 @@
 1146, Flashmob, Flashmob, 181, 27000, 280, 72000, 5000, 1, 40, 60, 57, 57, 31, 22, 90, 127, 255, 95, 31, 10, 1, 1, 37, 149, 160, 600, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 1147, Koyntety, Koyntety, 181, 27000, 280, 72000, 5000, 4, 220, 240, 52, 52, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 240, 1400, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 1148, DoomGolem, DoomGolem, 180, 22000, 280, 65000, 2000, 3, 160, 180, 60, 30, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 320, 1000, 672, 50, 537, 800, 779, 150, 780, 150, 777, 70, 1198, 50, 666, 30, 5253, 4, 5258, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
-1149, Enchanter, Enchanter, 181, 19000, 280, 55000, 2000, 8, 140, 180, 30, 60, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 240, 800, 672, 50, 537, 800, 779, 90, 780, 80, 777, 70, 1198, 50, 666, 30, 1227, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
+1149, Enchanter, Enchanter, 181, 19000, 280, 55000, 2000, 8, 140, 180, 30, 60, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 240, 800, 672, 50, 537, 800, 5288, 150, 779, 90, 780, 80, 777, 70, 1198, 50, 666, 30, 1227, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
 1150, ManaTyrant, ManaTyrant, 180, 24000, 280, 27000, 5000, 2, 300, 325, 42, 67, 31, 22, 90, 127, 255, 95, 31, 10, 1, 1, 37, 149, 180, 1050, 672, 50, 759, 1, 5237, 20, 1253, 5, 720, 100, 825, 500, 868, 20, 1172, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 1161, Xakelbael, Xakelbael, 200, 29999, 280, 999999, 99999, 9, 90, 124, 74, 100, 199, 2, 199, 197, 255, 175, 31, 10, 1, 1, 37, 181, 210, 672, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/world/map/npc/026-2/cerhan.txt b/world/map/npc/026-2/cerhan.txt
index 64cc723f..202249cc 100644
--- a/world/map/npc/026-2/cerhan.txt
+++ b/world/map/npc/026-2/cerhan.txt
@@ -1,4 +1,4 @@
-// Author: Jenalya
+// Author: Jenalya, Jesusalva
 
 026-2,38,118,0|script|Cerhan|311
 {
@@ -15,19 +15,21 @@ L_Story:
     next;
     mes "\"I'm an experienced weapon master and I was thinking about establishing a smithy here. I'll need some more equipment, though.\"";
     next;
-    if (countitem("MylarinDust") > 0)
+    if (countitem(MylarinDust) > 0)
         menu
             "Do you know something about 'Mylarin Dust'?", L_Mylarin,
+            "Do you work with bows or only swords and armor?", L_Banshee,
             "Good luck with that.",L_GoodLuckWith;
     goto L_GoodLuckWith;
 
 L_GoodLuckWith:
     mes "[Cerhan]";
     mes "\"If you're interested in weapons and armor, you may want to come back later.\"";
-    if (countitem("SandCutter") > 0)
+    if (countitem(SandCutter) > 0)
         menu
             "[Leave]",L_Close,
-            "Actually, I exchanged my Mylarin Dust with a bunny girl.", L_SandCutter;
+            "Actually, I exchanged my Mylarin Dust with a bunny girl.", L_SandCutter,
+            "Do you work with bows or only swords and armor?", L_Banshee;
     close;
 
 L_SandCutter:
@@ -50,6 +52,51 @@ L_Mylarin:
     mes "\"Please come back, when I'm ready for that. Mylarin dust... amazing.\"";
     goto L_Close;
 
+L_Banshee:
+    mes "[Cerhan]";
+    mes "\"I work mostly with ##Bdaggers##b and armor, not swords. Umfrey is selling arrows; He should be at your right, talk to him instead.\"";
+    if (countitem(BansheeBow) < 1) goto L_Close;
+    next;
+    mes "[Cerhan]";
+    mes "\"Actually, what the fletching. How could you curse your [@@"+ImperialBow+"|@@] like that?! It is ruined! Would you really sacrifice anything for just some extra points in attack speed? Don't you have any virtues?!\""; // TRANSLATORS: Fletching is the fin-shaped aerodynamic stabilization device attached on arrows, bolts, darts, or javelins.
+    next;
+    mes "[Cerhan]";
+    mes "\"Sure, I can see it is much more powerful now as a [@@"+BansheeBow+"|@@] but really. A cursed item. Aren't you afraid of dying?!\"";
+    next;
+    mes "[Cerhan]";
+    mes "\"Wyara might believe that a @@"+PurificationPotion+"|@@ should only be used to purify impurities in nature, but at Thermin, we make do with what we have, so I'll offer you a deal. I can remove the curse on your bow and restore it to its original glory...\"";
+    next;
+    mes "[Cerhan]";
+    mes "\"...For only 5,000 GP. And please note, that it will be purified, not uncursed. If it was lying in, say, a chest for too long and you put it there again, the curse will resurrect and it'll be ruined again.\"";
+    next;
+    if (Zeny < 5000) goto L_NoMoney;
+    mes "[Cerhan]";
+    mes "\"So whaddaya say? Do we have a deal?\"";
+    menu
+        "I'm a bit broke right now, so maybe later.", L_NoMoney,
+        "Sure, please purify my Banshee Bow.", L_Purify;
+
+L_NoMoney:
+    next;
+    mes "[Cerhan]";
+    mes "\"Just bring me the money, and I'll do it in a jiff.\"";
+    close;
+
+L_Purify:
+    if (countitem(BansheeBow) < 1) goto L_Banshee;
+    if (Zeny < 5000) goto L_NoMoney;
+    set Zeny, Zeny - 5000;
+    delitem BansheeBow, 1;
+    getitem ImperialBow, 1;
+    mes "[Cerhan]";
+    mes "\"And here we go, your Imperial Bow was restored to its former glory! Should be much easier to survive now, eh?\"";
+    if ((checkweight(ArmorBreaker, 50) == 0) || (@inventorylist_count == 100)) goto L_Close;
+    next;
+    mes "[Cerhan]";
+    mes "\"I'll even give you a little memento. Now go, and make me proud!\"";
+    getitem ArmorBreaker, 50; // In average, each arrow went for 100 gp, a bargain
+    close;
+
 L_Close:
     close;
 }
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index d7644054..00645c76 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -119,12 +119,28 @@ L_InventoryNoSpace:
 L_AskLeaving:
     mes "It's time to leave this place now.";
     next;
+    if (countitem(ImperialBow)) goto L_Banshee;
+    goto L_ReallyLeave;
+
+L_ReallyLeave:
     // Force the hero to leave last, as this event triggers the end of the quest
     // as well as some dialogs from Valia, when the hero returns.
     if (strcharinfo(0) == $@ILLIA_HERO$ && getareausers("052-2", 19, 8, 137, 88) > 1)
         goto L_WaitHelpersLeave;
     goto L_PrepareLeaving;
 
+L_Banshee:
+    mes "Actually, should I place the [@@"+ImperialBow+"|@@] here? If I do, it'll be cursed into a [@@"+BansheeBow+"|@@] again.";
+    menu
+        "Ridiculous. Why would I curse my weapon again?", L_ReallyLeave,
+        "Yes, that's a good idea. I would sacrifice anything for the extra power.", L_CurseBanshee;
+
+L_CurseBanshee:
+    if (countitem(ImperialBow) < 1) goto L_ReallyLeave;
+    delitem ImperialBow, 1;
+    getitem BansheeBow, 1;
+    goto L_ReallyLeave;
+
 L_WaitHelpersLeave:
     mes "However, I'd better wait my friends leave before I do.";
     next;