From 9cf01b2812450fb4bf3011c2b7a727e31d5d4e72 Mon Sep 17 00:00:00 2001 From: Euphy Date: Wed, 29 Oct 2014 12:01:00 -0400 Subject: [PATCH] Misc fixes. - Updated turn-in requirements for Tripatriate Union's Feud. (incl. bugreport:9339) http://rathena.org/board/tracker/issue-9339-the-tripartite-unions-feud/ - Moved "Voyage log" NPC coordinates. (bugreport:9225) http://rathena.org/board/tracker/issue-9225-turtle-island-quest-voyage-log/ - Updated "Immuned Shield" (2168) item script. (bugreport:9319) http://rathena.org/board/tracker/issue-9319-immuned-shield-is-using-the-pre-renewal-effect/ - Added Wolfchev's Laboratory warp to custom warper. Signed-off-by: Euphy --- db/re/item_db.txt | 2 +- npc/custom/warper.txt | 8 ++++++-- npc/quests/quests_13_1.txt | 19 ++++++++++--------- npc/quests/quests_alberta.txt | 2 +- sql-files/item_db_re.sql | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/db/re/item_db.txt b/db/re/item_db.txt index eea182ea31..425370d939 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -1260,7 +1260,7 @@ 2165,Sol_Shield,Sol Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{} 2166,Exorcism_Bible_,Devil's Bible Drive,4,20,,600,,80,,1,0x00008100,63,2,32,,50,1,5,{ bonus bInt,1; },{},{} 2167,Poison_Shield,Poison Shield,4,20,,1300,,50,,1,0xFFFFFFFF,63,2,32,,65,1,3,{},{},{} -2168,Immuned_Shield,Immune Shield,4,20,,700,,55,,1,0xFFFFFFFF,63,2,32,,1,1,1,{ if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,((getrefine()>12)?12:getrefine())-5; },{},{} +2168,Immuned_Shield,Immune Shield,4,20,,700,,55,,1,0xFFFFFFFF,63,2,32,,1,1,1,{ if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,((getrefine()>12)?12:getrefine())-5; if (getrefine()>=7) bonus2 bSubEle,Ele_Neutral,5; if (getrefine()>=9){ bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; }},{},{} 2169,Kalasak,Kalasag,4,20,,400,,40,,0,0xFFFFFFFF,63,2,32,,1,1,1,{ bonus2 bSubClass,Class_Boss,getrefine()/3; },{},{} 2170,Bayani_Kalasak,Bayani Kalasag,4,20,,400,,40,,1,0xFFFFFFFF,63,2,32,,1,1,1,{ bonus2 bSubClass,Class_Boss,getrefine()/3; },{},{} 2171,Fox_Armguard,Fox Wrist Guard,4,40000,,200,,45,,1,0x02000000,63,2,32,,100,1,1,{ bonus bFlee,5; },{},{} diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt index 249134d981..76e804c13d 100644 --- a/npc/custom/warper.txt +++ b/npc/custom/warper.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.4a +//= 1.4b //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -17,6 +17,7 @@ //= Aligned coordinates with @go. //= 1.4 Added new Guild Dungeons. //= 1.4a Slight edits. +//= 1.4b Added Wolfchev's Laboratory warp. //============================================================ - script Warper -1,{ @@ -425,7 +426,8 @@ G6: Go("schg_dun01",200,124); // -------------------------------------------------- menu "Bakonawa Lake",I1, "Bangungot Hospital 2F",I2, "Buwaya Cave",I3, "Endless Tower",I4, "Hazy Forest",I5, "Malangdo Culvert",I6, "Nidhoggur's Nest",I7, - "Octopus Cave",I8, "Old Glast Heim",I9, "Orc's Memory",I10, "Sealed Shrine",I11; + "Octopus Cave",I8, "Old Glast Heim",I9, "Orc's Memory",I10, "Sealed Shrine",I11, + "Wolfchev's Laboratory",I12; I1: Restrict("RE"); Go("ma_scene01",172,175); @@ -445,6 +447,8 @@ I9: Restrict("RE"); Go("glast_01",204,268); I10: Go("gef_fild10",240,198); I11: Go("monk_test",306,143); +I12: Restrict("RE"); + Go("lhz_dun04",148,269); // -------------------------------------------------- Special: diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index ddc3e8a2a4..dce8128d65 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 3.4 +//= 3.5 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -27,6 +27,7 @@ //= 3.3 Updated to match the latest official script. [Euphy] //= 3.3a Added Izlude RE coordinates. [Euphy] //= 3.4 Added GM management function and NPC. [Euphy] +//= 3.5 Updated turn-in requirements for Tripatriate Union's Feud. [Euphy] //============================================================ // Onward to the New World :: ep13_gogo @@ -5948,7 +5949,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "I heard you can get this thing from a monster named, 'Cornus' found in the fields."; next; mes "[Ryosen]"; - mes "Or... do you have any ^0000ffMystic Horns^000000 with you? Of course, I'm not saying that I want it for free. If you'd give me 5 ^0000ff5 Mystic Horns^000000, I'd give you my Rune-Midgart's Strawberry Cake."; + mes "Or... do you have any ^0000ffMystic Horns^000000 with you? Of course, I'm not saying that I want it for free. If you'd give me ^0000ff2 Mystic Horns^000000, I'd give you my Rune-Midgart's Strawberry Cake."; next; switch(select("I haven't seen such a thing.:Oh, ok, I'll give you!")) { case 1: @@ -5979,7 +5980,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ mes "[Ryosen]"; mes "... Haha, I'm joking..."; next; - if (countitem(6023) > 4) { + if (countitem(6023) > 1) { mes "[Ryosen]"; mes "Are you really, honestly, positively sure you want to exchange them for my cake?"; next; @@ -5997,7 +5998,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{ next; mes "[Ryosen]"; mes "I heard you could extract some magical energy form Mystic Horns and use it. Anyway, thank you!"; - delitem 6023,5; //Mystic_Horn + delitem 6023,2; //Mystic_Horn getitem 12319,1; //Strawberry_Cake close; } @@ -6345,7 +6346,7 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ next; mes "[Hue]"; mes "Could you bring ^0000ffFur^000000 if you get some? I'm not asking it for free."; - mes "I'll give you my Pineapple Jubilee from Schwartzvalt, if you bring me ^0000ff5 Furs^000000."; + mes "I'll give you my Pineapple Jubilee from Schwartzvalt, if you bring me ^0000ff2 Furs^000000."; next; switch(select("I don't have any, right now.:Oh, I'll give you Fur.")) { case 1: @@ -6372,7 +6373,7 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{ mes "[Hue]"; mes "Ah, are you sure you want to exchange?"; next; - if (countitem(6020) > 4) { + if (countitem(6020) > 1) { mes "[Hue]"; mes "Oh, so it's the thing called, Fur??"; next; @@ -6808,7 +6809,7 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{ next; mes "[Hansenne]"; mes "Can you give me a ^0000ffPeaked Hat^000000 if you have any? I'm not asking for free."; - mes "For ^0000ff5 Peaked Hats^000000, I'll give you my special dessert!"; + mes "For ^0000ff2 Peaked Hats^000000, I'll give you my special dessert!"; next; switch(select("No way.:Sure.")) { case 1: @@ -6837,7 +6838,7 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{ mes "[Hansenne]"; mes "Ah!!! You have it?"; next; - if (countitem(6021) > 4) { + if (countitem(6021) > 1) { mes "[Hansenne]"; mes "Oh, you really have those!"; next; @@ -6858,7 +6859,7 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{ mes "Ehhmmm, thank you!"; mes "Geeeee, thank you!"; mes "Haha, hahaha, hahahahahahahahaha."; - delitem 6021,5; //Peaked_Hat + delitem 6021,2; //Peaked_Hat getitem 12321,1; //Spicy_Sandwich close; } diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 3f00b33298..cade35630e 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -1341,7 +1341,7 @@ alberta_in,18,102,4 script Letter#tur 111,{ close; } -alberta,248,93,4 script Voyage log#tur 111,{ +alberta,246,117,4 script Voyage log#tur 111,{ if (rand(2)) { mes "[Voyage log]"; mes "03:20 am"; diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index bd710d742b..6598dfc57b 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -1291,7 +1291,7 @@ REPLACE INTO `item_db_re` VALUES (2164,'Sombre_Shield','Bull Son Shield',4,20,NU REPLACE INTO `item_db_re` VALUES (2165,'Sol_Shield','Sol Shield',4,20,NULL,1300,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'65',1,3,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2166,'Exorcism_Bible_','Devil\'s Bible Drive',4,20,NULL,600,NULL,80,NULL,1,0x00008100,63,2,32,NULL,'50',1,5,'bonus bInt,1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2167,'Poison_Shield','Poison Shield',4,20,NULL,1300,NULL,50,NULL,1,0xFFFFFFFF,63,2,32,NULL,'65',1,3,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (2168,'Immuned_Shield','Immune Shield',4,20,NULL,700,NULL,55,NULL,1,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,((getrefine()>12)?12:getrefine())-5;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (2168,'Immuned_Shield','Immune Shield',4,20,NULL,700,NULL,55,NULL,1,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,((getrefine()>12)?12:getrefine())-5; if (getrefine()>=7) bonus2 bSubEle,Ele_Neutral,5; if (getrefine()>=9){ bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; }',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2169,'Kalasak','Kalasag',4,20,NULL,400,NULL,40,NULL,0,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'bonus2 bSubClass,Class_Boss,getrefine()/3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2170,'Bayani_Kalasak','Bayani Kalasag',4,20,NULL,400,NULL,40,NULL,1,0xFFFFFFFF,63,2,32,NULL,'1',1,1,'bonus2 bSubClass,Class_Boss,getrefine()/3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2171,'Fox_Armguard','Fox Wrist Guard',4,40000,NULL,200,NULL,45,NULL,1,0x02000000,63,2,32,NULL,'100',1,1,'bonus bFlee,5;',NULL,NULL);