From ca07b1a86c9a9d93c5901d7f2ec6e9b46f51860e Mon Sep 17 00:00:00 2001 From: masao87 Date: Fri, 11 May 2012 11:29:01 +0000 Subject: - Added Baby Hunter and Baby Ranger check. bugreport:5728 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16097 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/pre-re/item_db.txt | 2 +- db/re/item_db.txt | 2 +- npc/merchants/falcon_flute.txt | 31 +++++++++++++++++++++++-------- sql-files/item_db.sql | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index cc3195c41..d19f058cd 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -5196,7 +5196,7 @@ 12771,Passion_Hat_Box2,Passion Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12772,Cool_Hat_Box2,Cool Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12773,Victory_Hat_Box2,Victory Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if (getskilllv(127)) { if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; if (checkfalcon() == 1) { setfalcon 0; } else { setfalcon 1; } } },{},{} +12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if (getskilllv("HT_FALCON")) { if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; if (checkfalcon() == 1) { setfalcon 0; } else { setfalcon 1; } } },{},{} 12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} 12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} 12902,Bubble_Gum_Box,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{} diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 77a274886..3e2018166 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -5732,7 +5732,7 @@ // 12775,Ancient_Spirit_Amulet,Ancient Spirit Amulet,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} // -12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if (getskilllv(127)) { if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; if (checkfalcon() == 1) { setfalcon 0; } else { setfalcon 1; } } },{},{} +12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if (getskilllv("HT_FALCON")) { if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; if (checkfalcon() == 1) { setfalcon 0; } else { setfalcon 1; } } },{},{} 12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} 12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} 12902,Bubble_Gum_Box,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{} diff --git a/npc/merchants/falcon_flute.txt b/npc/merchants/falcon_flute.txt index 58ac4ae1d..f37baceaf 100644 --- a/npc/merchants/falcon_flute.txt +++ b/npc/merchants/falcon_flute.txt @@ -8,15 +8,16 @@ //===== Compatible With: ===================================== //= rAthena //===== Description: ========================================= -//= An NPC which sells you an Falcon Flute so you're able to -//= summon an Falcon wherever you are. +//= An NPC which sells you a Falcon Flute so you're able to +//= summon a Falcon wherever you are. //===== Additional Comments: ================================= //= 1.0 First Version. [Masao] +//= 1.1 Added Baby Hunter and Baby Ranger check. bugreport:5728 [Masao] //============================================================ -- script Falcon Flute Trader#fft1::fflute 51,{ +- script Falcon Flute Trader::fflute -1,{ - if (Class == Job_Hunter || Class == Job_Sniper || Class == Job_Ranger || Class == Job_Ranger_T) { + if (Class == Job_Baby_Hunter || Class == Job_Hunter || Class == Job_Sniper || Class == Job_Baby_Ranger || Class == Job_Ranger || Class == Job_Ranger_T) { mes "[Falcon Flute Trader]"; mes "Do you need a Falcon?"; mes "With a magical Flute, you can call your Falcon from anywhere!"; @@ -41,7 +42,7 @@ mes "[Falcon Flute Trader]"; mes "If you need a Falcon Flute I will sell them for 12,500 zeny. Or is that too expensive?"; next; - if (Class == Job_Hunter || Class == Job_Sniper) { + if (Class == Job_Baby_Hunter || Class == Job_Hunter || Class == Job_Sniper) { switch (select("Don't buy one:Buy a Falcon Flute")) { case 1: mes "[Falcon Flute Trader]"; @@ -49,6 +50,13 @@ close; case 2: if (Zeny >= 12500) { + if (countitem(12848) >= 1) { + mes "[Falcon Flute Trader]"; + mes "As i can see you already have an Falcon Flute!"; + mes "Don't worry my young friend, once you've purchased the Falcon Flute you won't need to do so again"; + mes "since the Falcon Flute won't disappear upon usage, isn't that great?"; + close; + } mes "[Falcon Flute Trader]"; mes "Here, take this Flute."; mes "With it you can whistle for your Falcon from anywhere."; @@ -75,6 +83,13 @@ close; case 2: if (Zeny >= 10000) { + if (countitem(12848) >= 1) { + mes "[Falcon Flute Trader]"; + mes "As i can see you already have an Falcon Flute!"; + mes "Don't worry my young friend, once you've purchased the Falcon Flute you won't need to do so again"; + mes "since the Falcon Flute won't disappear upon usage, isn't that great?"; + close; + } mes "[Falcon Flute Trader]"; mes "Here take this Flute."; mes "With it you can whistle for your Falcon from anywhere."; @@ -91,7 +106,7 @@ close; } } - if (Class == Job_Archer){ + if (Class == Job_Baby_Archer || Class == Job_Archer) { mes "[Falcon Flute Trader]"; mes "Hello young one!"; mes "Currently i can't help you,"; @@ -103,5 +118,5 @@ close; } -hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft2 51 -pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft3 51 \ No newline at end of file +hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 51 +pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 51 \ No newline at end of file diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql index 402fd660a..1ea42a0f2 100644 --- a/sql-files/item_db.sql +++ b/sql-files/item_db.sql @@ -5756,7 +5756,7 @@ REPLACE INTO `item_db` VALUES (12773,'Victory_Hat_Box2','Victory Hat Box2',2,0,N # REPLACE INTO `item_db` VALUES (12775,'Ancient_Spirit_Amulet','Ancient Spirit Amulet',2,20,NULL,600,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); # -REPLACE INTO `item_db` VALUES (12848,'Falcon_Flute','Falcon Flute',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if (getskilllv(127)) { if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; if (checkfalcon() == 1) { setfalcon 0; } else { setfalcon 1; } }',NULL,NULL); +REPLACE INTO `item_db` VALUES (12848,'Falcon_Flute','Falcon Flute',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if (getskilllv("HT_FALCON")) { if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) end; if (checkfalcon() == 1) { setfalcon 0; } else { setfalcon 1; } }',NULL,NULL); REPLACE INTO `item_db` VALUES (12900,'Battle_Manual_Box','Battle Manual Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,10;',NULL,NULL); REPLACE INTO `item_db` VALUES (12901,'Insurance_Package','Insurance Package',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12209,10;',NULL,NULL); REPLACE INTO `item_db` VALUES (12902,'Bubble_Gum_Box','Bubble Gum Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12210,10;',NULL,NULL); -- cgit v1.2.3-70-g09d2