From cfe7e3efc603f3d8273e33fb11d7ad2d9c916a69 Mon Sep 17 00:00:00 2001 From: AtlantisRO Date: Tue, 21 Jun 2016 03:44:31 -0600 Subject: [PATCH] Added use of F_HasEdenGroupMark function. --- npc/re/quests/eden/11-25.txt | 5 +++-- npc/re/quests/eden/26-40.txt | 5 +++-- npc/re/quests/eden/41-55.txt | 5 +++-- npc/re/quests/eden/56-70.txt | 5 +++-- npc/re/quests/eden/71-85.txt | 5 +++-- npc/re/quests/eden/86-90.txt | 5 +++-- npc/re/quests/eden/91-99.txt | 5 +++-- npc/re/quests/eden/eden_100_111.txt | 7 ++++--- npc/re/quests/eden/eden_111_120.txt | 5 +++-- npc/re/quests/eden/eden_121_130.txt | 8 +++++--- npc/re/quests/eden/eden_131_140.txt | 5 +++-- npc/re/quests/eden/eden_common.txt | 13 +++++++++---- npc/re/quests/eden/eden_quests.txt | 25 +++++++++++++------------ npc/re/quests/eden/eden_service.txt | 5 +++-- 14 files changed, 61 insertions(+), 42 deletions(-) diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index c097ef0957..0e57c59ab4 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -14,10 +14,11 @@ //= 1.2 Optimized. [Euphy] //= 1.3 Bug fixes. [Capuche] //= 1.4 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.5 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ - if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { mes "- You need to have an -"; mes "- ^4d4dff'Eden Group Mark'^000000 -"; mes "- to receive these missions. -"; diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index bd2b8a0be6..a9a511deb2 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -13,10 +13,11 @@ //= 1.1 Some little optimization here and there. [Masao] //= 1.2 Optimized. [Euphy] //= 1.3 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.4 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,38,38,3 script Mission [26 - 40] 857,{ - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "You are not a qualified member. You can not use the bulletin board."; close; } diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index 6cac1dcfa2..97e7011bbc 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -13,10 +13,11 @@ //= 1.1 Some little optimization here and there. [Masao] //= 1.2 Optimized. [Euphy] //= 1.3 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.4 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,40,38,3 script Mission [41 - 55] 857,{ - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "You are not an Eden group member. You are not qualified to access the bulletin board."; close; } diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index ca1948aff6..801221207b 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -16,10 +16,11 @@ //= 1.4 Fixed invalid check (Magic Wand Quest). [Joseph] //= 1.5 Optimized, based on code by Zopokx. [Euphy] //= 1.6 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.7 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,42,38,3 script Mission [56 - 70] 857,{ - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "To get these missions, I need to Join the Eden Group first. I must find Secretary Lime Evenor and become a member."; close; } diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index f2be00f10d..eceaadae5f 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -14,10 +14,11 @@ //= 1.2 Optimized. [Euphy] //= 1.3 Updated to match the official scripts. [Euphy] //= 1.4 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.5 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,44,38,3 script Mission [71 - 85] 857,{ - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "- Only members of the -"; mes "- Eden Group can read -"; mes "- this bulletin board. -"; diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index f1baed7581..8d71da8a05 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Chilly //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -14,10 +14,11 @@ //= 1.2 Optimized. [Euphy] //= 1.3 Updated to match the official script. [Euphy] //= 1.4 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.5 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,48,175,3 script 86-90 Mission Board 857,{ - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "Wait a minute!"; mes "-You need to have an-"; mes "-^4d4dff'Eden Group Mark'^000000-"; diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 1e9a5cb2e1..2390fd5b65 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Chilly //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -14,10 +14,11 @@ //= 1.2 Optimized. [Euphy] //= 1.3 Updated to match the official script. [Euphy] //= 1.4 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.5 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,48,177,3 script 91-99 Mission Board 857,{ - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "Wait a minute!"; mes "-You need to have an-"; mes "-^4d4dff'Eden Group Mark'^000000-"; diff --git a/npc/re/quests/eden/eden_100_111.txt b/npc/re/quests/eden/eden_100_111.txt index 1ed9d3e301..6868878020 100644 --- a/npc/re/quests/eden/eden_100_111.txt +++ b/npc/re/quests/eden/eden_100_111.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Capuche //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.2 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ @@ -28,7 +29,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ end; } mes "[Gelkah]"; - if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { mes "Show me proof that you're part of the Eden Group or I have no business with you."; mes "I'm giving requests to base level ^FF0000100 - 110^000000 adventurers."; } @@ -1004,7 +1005,7 @@ S_Hunting: moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ mes "[Rohtert]"; - if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { cutin "rote01",2; mes "You are not even a member of Eden Group. What are you doing here?"; mes "I'm only dealing with base level ^FF0000100 - 110^000000 adventurers."; diff --git a/npc/re/quests/eden/eden_111_120.txt b/npc/re/quests/eden/eden_111_120.txt index b37afb1898..e73ca43e6f 100644 --- a/npc/re/quests/eden/eden_111_120.txt +++ b/npc/re/quests/eden/eden_111_120.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Capuche //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -12,11 +12,12 @@ //===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.2 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ mes "[Mingmin]"; - if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { cutin "min02",0; mes "A stranger. This place is supposed to be for Eden Group Members only."; mes "I'm in need base level ^FF0000111 - 120^000000 adventurers to help my research."; diff --git a/npc/re/quests/eden/eden_121_130.txt b/npc/re/quests/eden/eden_121_130.txt index 180047d4a2..d3860c2348 100644 --- a/npc/re/quests/eden/eden_121_130.txt +++ b/npc/re/quests/eden/eden_121_130.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Capuche //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -11,11 +11,13 @@ //= Repeatable quests for players between BaseLevel 121 - 130. //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.2 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{ mes "[Melody-Jack]"; - if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { mes "Who the hell are you? Get out of here!"; mes "I'm only talking to base level ^FF0000121-130^000000 adventurers."; } @@ -562,7 +564,7 @@ OnTouch: moc_para01,17,77,5 script Aigu#1 4_F_IU,{ mes "[Aigu]"; - if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { mes "Oh, why aren't you a part of Eden Group?"; mes "I'm only talking to base level ^FF0000121-130^000000 adventurers."; } diff --git a/npc/re/quests/eden/eden_131_140.txt b/npc/re/quests/eden/eden_131_140.txt index fa415d8fe1..aa11618f5b 100644 --- a/npc/re/quests/eden/eden_131_140.txt +++ b/npc/re/quests/eden/eden_131_140.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Capuche //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -12,12 +12,13 @@ //===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.2 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ cutin "ragi01",0; mes "[Ragi]"; - if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { mes "Only adventurers from Eden Group are welcome here."; mes "I'm giving requests to base level ^FF0000130-140^000000 adventurers only."; } diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 6ba6810e38..1e9ab80525 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 2.0 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 1.7 Added Malaya teleporter. [Euphy] //= 1.8 Updated to match the latest official script. [Euphy] //= 1.9 Added support to Para_Team_Mark_ in Eden Group. [AtlantisRO/Ragno] +//= 2.0 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ // Common NPCs :: lv_tre @@ -76,7 +77,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ next; break; case 2: - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "[Lime Evenor]"; mes "You can be a Eden's member by simply registering with me."; mes "Would you like to join Eden Group?"; @@ -188,7 +189,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ } break; case 4: - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Lime Evenor]"; mes "Would like to try some missions as an Eden member?"; next; @@ -315,7 +316,7 @@ OnTouch: } moc_para01,47,39,3 script #warp_2_pass 111,{ - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Lime Evenor]"; mes "Oh, it is an exclusive place only for Eden's members."; mes "If you are a member, you can come whenever you want!"; @@ -429,3 +430,7 @@ moc_para01,20,35,5 script Office Assistant Neede 814,{ mes "Huh? Did you hear that? Gosh~!"; close; } + +function script F_HasEdenGroupMark { + return (countitem(6219) > 0 || countitem(22508) > 0); +} \ No newline at end of file diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 2ceb002d24..7cb2867639 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -17,11 +17,12 @@ //= 2.0 Updated Instructor Ur's quests. [Capuche] //= 2.1 Updated Blacksmith Thorn and Weapons Expert NPC. [Capuche] //= 2.2 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 2.3 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ mes "[Boya]"; - if (countitem(6219) < 1 && countitem(22508) < 1) { + if (!callfunc("F_HasEdenGroupMark")) { mes "You are not in my group are you?"; mes "I don't have anything to say to outsiders."; mes "If you want something register with my group."; @@ -820,7 +821,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 972,{ mes "Not a wolf."; mes "I wasn't a dog originally..."; next; - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Talking Dog]"; mes "Anyway are you a Eden Group member?"; mes "Oh good to see you."; @@ -1028,7 +1029,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 422,{ pay_arche,41,136,3 script Eden Member Karl#para05 904,{ if (para_suv01 < 13) { - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Karl]"; mes "Hey, how are you?"; mes "Good to see you~"; @@ -1171,7 +1172,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 904,{ anthell01,29,264,5 script Eden Member Cloud#para06 899,{ if (para_suv01 < 17) { - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Cloud]"; mes "Oops."; mes "You are a member of my group."; @@ -1361,7 +1362,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 899,{ in_orcs01,38,175,3 script Eden Member Hooksha 803,{ if (para_suv01 < 24) { - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Hooksha]"; mes "Unbelievable why did you come here?"; mes "Um... You are not on the third step of the training?"; @@ -1630,7 +1631,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 803,{ iz_dun04,43,46,3 script Eden Member Callandiva 745,{ if (para_suv01 < 33) { - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Callandiva]"; mes "How did you get so deep in this ocean city?"; mes "Ah, that symbol is of our group."; @@ -2226,7 +2227,7 @@ moc_para01,179,44,3 script Chef 820,{ mes "Ah, Kim-dduck-soon."; mes "It's the representative meal for normal citizens."; next; - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { if (Zeny > 2699) { mes "[Chef]"; mes "Hey, here you are."; @@ -2265,7 +2266,7 @@ moc_para01,179,44,3 script Chef 820,{ mes "Course meal B?"; mes "This food with meat and vegetables in hot soup has it's origins from nomadic life under the cold and dry nature."; next; - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { if (Zeny > 3599) { mes "[Chef]"; mes "Hey, here you are."; @@ -2300,7 +2301,7 @@ moc_para01,179,44,3 script Chef 820,{ mes "How many times do I have to tell you?"; close; case 4: - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { if (Zeny > 4499) { mes "[Chef]"; mes "Hey, here you are."; @@ -2343,7 +2344,7 @@ moc_para01,179,44,3 script Chef 820,{ close; } case 2: - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "[Chef]"; mes "Most jobs should be managed by yourself. So it might be difficult, right?"; mes "Actually it's harmful so they have requested continuously."; @@ -2452,7 +2453,7 @@ moc_para01,179,44,3 script Chef 820,{ moc_para01,23,35,5 script Instructor Ur#2nd01 4_M_KNIGHT_BLACK,{ mes "[Instructor Ur]"; - if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { mes "Hey there!"; mes "I see you're not one of our agents?"; mes "Are you interested in joining us?"; @@ -3735,7 +3736,7 @@ moc_para01,111,83,3 script Blacksmith Thorn#2nd10 2_M_OLDBLSMITH,{ close; } mes "[Thorn]"; - if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark + if (!callfunc("F_HasEdenGroupMark")) { mes "Hmm, are you a member of Eden Group?"; mes "You need to be one of our members to use my services."; close; diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index 7665d18372..eb32fa0a12 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.0 First Version. //= 1.1 Replaced 2nd NPC with duplicate function. [Masao] //= 1.2 Added support to Para_Team_Mark_ in Eden Group. [Ragno] +//= 1.3 Added use of F_HasEdenGroupMark function. [Ragno] //============================================================ // Goods Cabinets :: pare_service @@ -33,7 +34,7 @@ mes "3.Cabinet fee is"; mes " ^4d4dff500 zeny^000000!"; next; - if (countitem(6219) > 0 || countitem(22508) > 0) { + if (callfunc("F_HasEdenGroupMark")) { mes "You need to insert zeny to use the cabinet."; mes "Cost : 500 Zeny "; mes "Would you like to use it?";