Skip to content

Commit

Permalink
Merge pull request #1381 from AtlantisRO/master
Browse files Browse the repository at this point in the history 
Added use of F_HasEdenGroupMark function.
Thanks to @AtlantisRO!
  • Loading branch information
@secretdataz
secretdataz committed Jun 21, 2016
2 parents 274232f + cfe7e3e commit 815368a
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 42 deletions.
5 changes: 3 additions & 2 deletions npc/re/quests/eden/11-25.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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. -";
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/26-40.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.3
//= 1.4
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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;
}
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/41-55.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.3
//= 1.4
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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;
}
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/56-70.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.6
//= 1.7
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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;
}
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/71-85.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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. -";
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/86-90.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= Chilly
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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-";
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/91-99.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= Chilly
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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-";
Expand Down
7 changes: 4 additions & 3 deletions npc/re/quests/eden/eden_100_111.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= Capuche
//===== Current Version: =====================================
//= 1.1
//= 1.2
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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,{
Expand All @@ -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.";
}
Expand Down Expand Up @@ -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.";
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/eden_111_120.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= Capuche
//===== Current Version: =====================================
//= 1.1
//= 1.2
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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.";
Expand Down
8 changes: 5 additions & 3 deletions npc/re/quests/eden/eden_121_130.txt
View file
Expand Up @@ -3,19 +3,21 @@
//===== By: ==================================================
//= Capuche
//===== Current Version: =====================================
//= 1.0
//= 1.2
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
//= [Official Conversion]
//= 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.";
}
Expand Down Expand Up @@ -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.";
}
Expand Down
5 changes: 3 additions & 2 deletions npc/re/quests/eden/eden_131_140.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= Capuche
//===== Current Version: =====================================
//= 1.1
//= 1.2
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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.";
}
Expand Down
13 changes: 9 additions & 4 deletions npc/re/quests/eden/eden_common.txt
View file
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.8
//= 2.0
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
Expand All @@ -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
Expand Down Expand Up @@ -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?";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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!";
Expand Down Expand Up @@ -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);
}

0 comments on commit 815368a

Please sign in to comment.