diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index f8d60b26b9..c097ef0957 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.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 Bug fixes. [Capuche] +//= 1.4 Added support to Para_Team_Mark_ in Eden Group. [Ragno] //============================================================ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ - if (countitem(6219) < 1) {// Para_Team_Mark + if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark 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 53de24848c..bd2b8a0be6 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.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -12,10 +12,11 @@ //= 1.0 First Version. //= 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] //============================================================ moc_para01,38,38,3 script Mission [26 - 40] 857,{ - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { 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 28a2c422fb..6cac1dcfa2 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.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -12,10 +12,11 @@ //= 1.0 First Version. //= 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] //============================================================ moc_para01,40,38,3 script Mission [41 - 55] 857,{ - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { 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 64d8fedab3..ca1948aff6 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.5 +//= 1.6 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -15,10 +15,11 @@ //= 1.3 Fixed Puppet Master's Agony Quest (12217 -> 3259). [Joseph] //= 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] //============================================================ moc_para01,42,38,3 script Mission [56 - 70] 857,{ - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { 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 06c33b4d3c..f2be00f10d 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.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 Updated to match the official scripts. [Euphy] +//= 1.4 Added support to Para_Team_Mark_ in Eden Group. [Ragno] //============================================================ moc_para01,44,38,3 script Mission [71 - 85] 857,{ - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { 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 8a40637c09..f1baed7581 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.3 +//= 1.4 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -13,10 +13,11 @@ //= 1.1 Some little improvements here and there. [Masao] //= 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] //============================================================ moc_para01,48,175,3 script 86-90 Mission Board 857,{ - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { 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 9af1d3fb88..1e9a5cb2e1 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.3 +//= 1.4 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -13,10 +13,11 @@ //= 1.1 Some little improvements here and there. [Masao] //= 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] //============================================================ moc_para01,48,177,3 script 91-99 Mission Board 857,{ - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { 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 e7911e3abd..1ed9d3e301 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.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Repeatable quests for players between BaseLevel 100 - 111. //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Added support to Para_Team_Mark_ in Eden Group. [Ragno] //============================================================ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ @@ -27,7 +28,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ end; } mes "[Gelkah]"; - if (countitem(6219) == 0) {// Para_Team_Mark + if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark 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."; } @@ -1003,7 +1004,7 @@ S_Hunting: moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ mes "[Rohtert]"; - if (countitem(6219) == 0) {// Para_Team_Mark + if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark 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 c4a1c20242..b37afb1898 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.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -11,11 +11,12 @@ //= Repeatable quests for players between BaseLevel 111 - 120. //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Added support to Para_Team_Mark_ in Eden Group. [Ragno] //============================================================ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ mes "[Mingmin]"; - if (countitem(6219) == 0) {// Para_Team_Mark + if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark 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 3fc5a4a457..180047d4a2 100644 --- a/npc/re/quests/eden/eden_121_130.txt +++ b/npc/re/quests/eden/eden_121_130.txt @@ -15,7 +15,7 @@ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{ mes "[Melody-Jack]"; - if (countitem(6219) < 1) {// Para_Team_Mark + if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark mes "Who the hell are you? Get out of here!"; mes "I'm only talking to base level ^FF0000121-130^000000 adventurers."; } @@ -562,7 +562,7 @@ OnTouch: moc_para01,17,77,5 script Aigu#1 4_F_IU,{ mes "[Aigu]"; - if (countitem(6219) < 1) {// Para_Team_Mark + if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark 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 c0350b7a1c..fa415d8fe1 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.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -11,12 +11,13 @@ //= Repeatable quests for players between BaseLevel 131 - 140. //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Added support to Para_Team_Mark_ in Eden Group. [Ragno] //============================================================ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ cutin "ragi01",0; mes "[Ragi]"; - if (countitem(6219) == 0) {// Para_Team_Mark + if (countitem(6219) == 0 && countitem(22508) == 0) {// Para_Team_Mark 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 d673f5d5d5..6ba6810e38 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -19,6 +19,7 @@ //= 1.6 Added Izlude RE coordinates. [Euphy] //= 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] //============================================================ // Common NPCs :: lv_tre @@ -32,6 +33,26 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ mes "- after you loose some weight. -"; close; } + if (countitem(6219) > 0) { + mes "[Lime Evenor]"; + mes "Thanks to many adventurers visiting our Eden Group, we've recently prepared a new version of Eden Group Mark for our visitors."; + mes "And it is also possible to exchange old version of Eden Group Mark into a new one."; + next; + mes "[Lime Evenor]"; + mes "Though it has a slight time delay, this new version of Eden Group Mark will send you back to current saved location."; + mes "Would you like to exchange yours?"; + next; + if (select("Sure:I'm good.") == 2){ + mes "[Lime Evenor]"; + mes "What possible reason would you have... to not exchange?"; + close; + } + delitem 6219,1; + getitem 22508,1; + mes "[Lime Evenor]"; + mes "There you go. Come back again~"; + close; + } mes "[Lime Evenor]"; mes "People who follow their dreams and romances listen to me. We are representatives of the paradise called 'The garden of Eden' called the Eden group . There is no place like this anywhere."; mes "Hello. Can I help you?"; @@ -55,7 +76,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ next; break; case 2: - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { mes "[Lime Evenor]"; mes "You can be a Eden's member by simply registering with me."; mes "Would you like to join Eden Group?"; @@ -94,7 +115,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ next; mes "[Lime Evenor]"; mes "Hopefully you can do great work as an Eden's member."; - getitem 6219,1; //Para_Team_Mark + getitem 22508,1; //Para_Team_Mark_ next; break; case 2: @@ -167,7 +188,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ } break; case 4: - if (countitem(6219) > 0) { + if (countitem(6219) > 0 || countitem(22508) > 0) { mes "[Lime Evenor]"; mes "Would like to try some missions as an Eden member?"; next; @@ -294,7 +315,7 @@ OnTouch: } moc_para01,47,39,3 script #warp_2_pass 111,{ - if (countitem(6219) > 0) { + if (countitem(6219) > 0 || countitem(22508) > 0) { 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!"; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 70c07f0023..2ceb002d24 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -16,11 +16,12 @@ //= 1.6 Kagerou/Oboro support (Class -> BaseClass) [Euphy] //= 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] //============================================================ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ mes "[Boya]"; - if (countitem(6219) < 1) { + if (countitem(6219) < 1 && countitem(22508) < 1) { 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."; @@ -819,7 +820,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { mes "[Talking Dog]"; mes "Anyway are you a Eden Group member?"; mes "Oh good to see you."; @@ -1027,7 +1028,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { mes "[Karl]"; mes "Hey, how are you?"; mes "Good to see you~"; @@ -1170,7 +1171,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { mes "[Cloud]"; mes "Oops."; mes "You are a member of my group."; @@ -1360,7 +1361,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { mes "[Hooksha]"; mes "Unbelievable why did you come here?"; mes "Um... You are not on the third step of the training?"; @@ -1629,7 +1630,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { mes "[Callandiva]"; mes "How did you get so deep in this ocean city?"; mes "Ah, that symbol is of our group."; @@ -2225,7 +2226,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { if (Zeny > 2699) { mes "[Chef]"; mes "Hey, here you are."; @@ -2264,7 +2265,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { if (Zeny > 3599) { mes "[Chef]"; mes "Hey, here you are."; @@ -2299,7 +2300,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) { + if (countitem(6219) > 0 || countitem(22508) > 0) { if (Zeny > 4499) { mes "[Chef]"; mes "Hey, here you are."; @@ -2342,7 +2343,7 @@ moc_para01,179,44,3 script Chef 820,{ close; } case 2: - if (countitem(6219) > 0) { + if (countitem(6219) > 0 || countitem(22508) > 0) { 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."; @@ -2451,7 +2452,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) {// Para_Team_Mark + if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark mes "Hey there!"; mes "I see you're not one of our agents?"; mes "Are you interested in joining us?"; @@ -3734,7 +3735,7 @@ moc_para01,111,83,3 script Blacksmith Thorn#2nd10 2_M_OLDBLSMITH,{ close; } mes "[Thorn]"; - if (countitem(6219) < 1) {// Para_Team_Mark + if (countitem(6219) < 1 && countitem(22508) < 1) {// Para_Team_Mark 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 ab1930ff96..7665d18372 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.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 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] //============================================================ // Goods Cabinets :: pare_service @@ -32,7 +33,7 @@ mes "3.Cabinet fee is"; mes " ^4d4dff500 zeny^000000!"; next; - if (countitem(6219) > 0) { + if (countitem(6219) > 0 || countitem(22508) > 0) { mes "You need to insert zeny to use the cabinet."; mes "Cost : 500 Zeny "; mes "Would you like to use it?";