Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated (and added) item_trade entries. (Converted from Aegis.)

Browse Source 
* Updated several Prontera NPCs.
- Updated Prontera town NPCs, and Prontera Library.
- Updated the Prontera Milk Merchant. 
- Updated the inn dialogs slightly, and corrected information for Prontera.
- Added Gaebolg Family Curse quest.
- Commented out old Clothes_dyer npc.
* Updated Rachel's guide's while loop to be a bit nicer looking.
* Added the ability to redeem lottery tickets before max donation is met.
* Changed conflicting warps to the "Adoption" room in the church.
* Fixed a bug in Kiel Hyre warps and quest.
* Updated Dandelion Request quest for Gaebolg compatibility.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10736 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2007-06-10 01:33:26 +00:00
parent 4ac32de7a6
commit 12c716e4d3
15 changed files with 8084 additions and 2938 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/Changelog.txt
View File

@ -49,6 +49,7 @@
----
========================
06/09
* Rev. 10736 Updated (and added) item_trade entries. (Converted from Aegis.) [L0ne_W0lf]
* Added some official Thor Volcano mob stats [Playtester]
- also updated sql files
* Fixed some bugs on Moscovia mobs [Playtester]

177
db/item_trade.txt
View File

@ -12,67 +12,116 @@
//Example:
//1161,67,50 //Balmung: No drop, No trade, No Guild Store (1+2+64 =67),
//only GMs of GM-level 50 and up can override the setting.
2634,127,100 // ??????
2635,127,100 // ??????
//The Sign Quest related items
7177,123,100 // ?? ?????
7178,123,100 // ?? ???
7304,123,100 // ??????
7305,123,100 // ???????
7306,123,100 // ?????
7307,123,100 // ??????
7308,123,100 // ?????
7309,123,100 // ??????
2642,123,100 // ??????
2644,123,100 // ??? armor
7314,123,100 // ??? event
7025,27,100 // ??? ??
7527,122,100 // ????? ???
12142,122,100 // ????? ???
2647,123,100 // ????
//Eye of Hellion quest related items
7332,123,100 // ??
7333,123,100 // ????_1
7334,123,100 // ????_2
7335,123,100 // ????_3
7336,123,100 // ????_4
7339,123,100 // ??????_
5132,27,100 // ?????
//Leather Pouch (part of Cooking Quest)
7432,123,100
// Keys (Thanatos Tower Quest)
7421,123,100
7422,123,100
7423,123,100
7424,123,100
7425,123,100
// Magical Stones (Thanatos Tower Quest)
7426,123,100
7427,123,100
7428,123,100
7429,123,100
7430,123,100
// Kiel Hyre Quest Items
7487,123,100 //Pub_Liquor
7488,123,100 //Delivery_Box
7489,123,100 //Outhouse_Spare_Key
7490,123,100 //Letter_to_Elie
7491,123,100 //Iron_Box
7492,123,100 //Yellow_Keycard
7493,123,100 //Golden_Key
7494,123,100 //Exquisite_Button
7495,123,100 //Blue_Keycard
7496,123,100 //Red_Keycard
7497,123,100 //Piece_of_Metal
7498,123,100 //Losimier's_House_Key
7499,123,100 //Portrait_of_a_Family
7500,123,100 //Portrait_of_a_Lady
7501,123,100 //K.H's_Letter
7502,123,100 //James's_Memo
7503,123,100 //Portrait_of_a_Guy
7504,123,100 //Power_Source
7505,123,100 //Toy_Key
7506,115,100 //Black_Keycard
7508,123,100 //Elisia's_Ring
7509,91,100 //Gorgeous_Keycard
7516,123,100 //Green Keycard
// Wedding Related items
2634,127,100 // Bridegroom_Ring
2635,127,100 // Bride_Ring
// "2005 The Sign" related items
7177,123,100 // Part_Of_Star's_Sob
7178,123,100 // Star's_Sob
7304,123,100 // Witch's_Spell_Book
7305,123,100 // Authority_Of_Nine_World
7306,123,100 // Fragment_Of_Soul
7307,123,100 // Whisper_Of_Soul
7308,123,100 // Witch's_Potion
7309,123,100 // Wing_Of_Crow
2642,123,100 // Serin's_Gold_Ring
2644,123,100 // The_Sign_
7314,123,100 // The_Sign
7025,91,100 // Lucifer's_Lament
7527,122,100 // Life_Book
12142,122,100 // Magic_Book
// "2nd Anniversary Event" items
// "Eye of Hellion" items
2647,123,100 // Nile_Rose
7332,123,100 // Slate
7333,123,100 // Piece_Of_Slate_1
7334,123,100 // Piece_Of_Slate_2
7335,123,100 // Piece_Of_Slate_3
7336,123,100 // Piece_Of_Slate_4
7339,123,100 // RO_Transportation_Card_
5132,91,100 // Angeling_Hat
// "Main Quest"/"Danilion's Request" items
7416,91,100 // Letter_Of_Recommendation
7417,91,100 // Mission_ScrollA
7418,91,100 // Mission_ScrollB
// "10.3 Quest items"
// * "Gaebolg family Curse" items
7431,115,100 // Books
7432,115,100 // Leather_Pouch
// * "Thanatos Tower" items
7421,115,100 // Red_Key
7422,115,100 // Yellow_Key
7423,115,100 // Blue_Key
7424,115,100 // Green_Key
7425,115,100 // Black_Key
7426,115,100 // Red_Magic_Stone
7427,115,100 // Yellow_Magic_Stone
7428,115,100 // Blue_Magic_Stone
7429,115,100 // Green_Magic_Stone
7430,115,100 // Black_Magic_Stone
7420,115,100 // Skull_
7484,123,100 // Warrior_Symbol
7485,123,100 // 2nd_Floor_Pass
7486,123,100 // 3rd_Floor_Pass
// "Kiel Hyre's Cottage" Quest related items
7487,123,100 // Tavern_Wine
7488,123,100 // Delivery_Box
7489,123,100 // Villa_Spare_Key
7490,123,100 // Kyll_Hire_Letter
7491,123,100 // Iron_Box
7492,123,100 // Yellow_Key_Card
7493,123,100 // Golden_Key
7494,123,100 // Kiel_Button
7495,123,100 // Blue_Key_Card
7496,123,100 // Red_Key_Card
7497,123,100 // Steel_Piece
7498,123,100 // Rosimier_Key
7499,123,100 // Family_Portrait
7500,123,100 // Elysia_Portrait
7501,123,100 // Kyll_Hyre_Letter2
7502,123,100 // Pieco_Memo_Of_James
7503,123,100 // Man_Portrait
7504,123,100 // Toy_Motor
7505,123,100 // Toy_Key
7506,115,100 // Black_Key_Card
7508,123,100 // Elysia_Ring
7509,83,100 // Fancy_Key_Card
7515,115,100 // Marvelous_Medal
7516,115,100 // Green_Key_Card
// Chinese ????? related items
7518,115,100 // Women's_Medal
2668,115,100 // Women's_Glory
7525,115,100 // Summer_Feast_Ticket
7341,123,100 // Worn_Out_Pendant
// Lighthalzen Quest items
// * Schwartzvalt Trilogy Quest items
7342,123,100 // File01
7343,123,100 // File02
7344,123,100 // File03
7346,123,100 // Pile_Of_Ymir_Heart
7349,123,100 // Indication_Of_Member02
// * Friendship Quest(?) Items
7351,123,100 // Friend's_Diary
// "2006 USA 3rd Anniversary" related items
7530,123,100 // Travel_Brochure_01
7531,123,100 // Travel_Brochure_02
7532,123,100 // Travel_Brochure_03
7533,123,100 // Travel_Brochure_04
7534,123,100 // Photo_Album_01
7535,123,100 // Photo_Album_02
7536,123,100 // Photo_Album_03
7537,123,100 // Photo_Album_04
5147,123,100 // Baseball_Cap
// Poring Coin items
7538,115,100 // Sifted_Sand
7539,115,100 // Poring_Coin

11
npc/Changelog.txt
View File

@ -1,6 +1,17 @@
Date Added
======
2007/06/09
* Rev. 10736 Updated several Prontera NPCs. [L0ne_W0lf]
- Updated Prontera town NPCs, and Prontera Library.
- Updated the Prontera Milk Merchant.
- Updated the inn dialogs slightly, and corrected information for Prontera.
- Added Gaebolg Family Curse quest.
- Commented out old Clothes_dyer npc.
* Updated Rachel's guide's while loop to be a bit nicer looking.
* Added the ability to redeem lottery tickets before max donation is met.
* Changed conflicting warps to the "Adoption" room in the church.
* Fixed a bug in Kiel Hyre warps and quest.
* Updated Dandelion Request quest for Gaebolg compatibility.
* Added Hugel Bingo game system. Please test it and report any bugs. [SinSloth]
- 'nosave' mapflag added to the map.
2007/06/08

1146
npc/cities/prontera.txt
View File

File diff suppressed because it is too large Load Diff

5
npc/custom/adoption.txt
View File

@ -3,6 +3,7 @@
//===== By ================================================
//= Fredzilla with help from Kamari,Acky
//===== Version ===========================================
//= 1.7 Moved warps to the southern exit of the main chappel. [L0ne_W0lf]
//= 1.6a Fixed wrong label name [KarLaeda]
//= 1.6 Removed call to function Is_Taekwon_Class in favor of baseClass == Job_Taekwon [Silentdragon]
//= 1.5 Added GM menu to reset current adoption [Lupus]
@ -49,8 +50,8 @@
//= Use "Upper==2" insread of event_adopted
//=========================================================
prt_church,115,122,0 warp prtch03 1,2,prt_church,164,171
prt_church,162,171,0 warp prtch01-3 1,2,prt_church,113,122
prt_church,83,122,0 warp prtch03 1,2,prt_church,164,171
prt_church,162,171,0 warp prtch01-3 1,2,prt_church,86,122
prt_church,166,176,3 script Adoption Man 61,{

14
npc/guides/guides_rachel.txt
View File

@ -11,6 +11,7 @@
//= Rachel City guide
//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 Change the while loops a bit. [L0ne_W0lf]
//============================================================
rachel,138,146,5 script Rachel Guide 934,{
mes "[Rachel Guide]";
@ -20,7 +21,8 @@ rachel,138,146,5 script Rachel Guide 934,{
mes "If this is the first time for you";
mes "to use the guide services, why";
mes "don't you check the \"Notice\" menu first?";
while(1) {
set .@loop,1;
while(.@loop) {
next;
switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
case 1:
@ -34,9 +36,9 @@ rachel,138,146,5 script Rachel Guide 934,{
next;
if (select("Yes:No") == 1) set .@compass_check,1;
next;
}
while(1) {
set .@loop2,1;
while(.@loop2) {
if (.@wait_button_chk == 0) set .@wait_button_chk,1;
else next;
@ -74,10 +76,9 @@ rachel,138,146,5 script Rachel Guide 934,{
mes "[Rachel Guide]";
mes "If you like to get rid of all the location marks on your Mini-Map,";
mes "just ask me again, and choose \"Remove Marks from Mini-Map\" menu.";
set .@Exitloop,1;
set .@loop2,0;
break;
}
if (.@Exitloop) break;
}
break;
@ -101,10 +102,9 @@ rachel,138,146,5 script Rachel Guide 934,{
mes "[Rachel Guide]";
mes "Hope you have a wonderfull journey";
mes "in Arunafeltz.";
set .@Exitloop2,1;
set .@loop,0;
break;
}
if (.@Exitloop2) break;
}
close;
}

34
npc/merchants/inn.txt
View File

@ -4,7 +4,7 @@
//= Darkchild (1.1)
//= Playtester (1.2)
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@ -25,6 +25,9 @@
//= 1.3 Added (finally) Rachel Inn Maid. Official warp
//= and save points[erKURITA]
//= 1.4 Added Hugel inn [erKurita]
//= 1.5 Added "end;" after warping the player. [L0ne_W0lf]
//= - Small corrections to the prontera Inns.
//= - Removed the Cancel dialog.
//============================================================
@ -32,14 +35,14 @@
// West Side Inn -------------------
prt_in,244,135,2 script Inn Maid::Sammy 53,{
callfunc "F_InnMaid","[Sammy]","West Inn","prt_in",238,130;
warp "prt_in",237,102;
callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130;
warp "prt_in",247,104; end;
}
// East Side Inn ------------------
prt_in,61,141,2 script Inn Maid::Ahlma#01 53,{
callfunc "F_InnMaid","[Ahlma]","East Inn","prt_in",64,136;
warp "prt_in",49,173;
callfunc "F_InnMaid","[Emplyee Ahlma]","Nenkaras","prt_in",64,136;
warp "prt_in",64,136; end;
}
//======================== Alberta ====================================
@ -47,27 +50,27 @@ prt_in,61,141,2 script Inn Maid::Ahlma#01 53,{
alberta_in,32,142,5 script Inn Maid::Moira 53,{
callfunc "F_InnMaid","[Moira]","North Inn","alberta_in",26,138;
warp "alberta_in",18,188;
warp "alberta_in",18,188; end;
}
// South -----------------------------
alberta_in,55,142,8 script Inn Maid::Tina 53,{
callfunc "F_InnMaid","[Tina]","South Inn","alberta_in",60,140;
warp "alberta_in",68,188;
warp "alberta_in",68,188; end;
}
//====================== Geffen ======================================
geffen_in,70,64,5 script Inn Maid::Betty 53,{
callfunc "F_InnMaid","[Betty]","Geffen Inn","geffen_in",74,60;
warp "geffen_in",106,106;
warp "geffen_in",106,106; end;
}
//======================= Payon ======================================
payon_in01,131,62,5 script Inn Maid::SunHee 53,{
callfunc "F_InnMaid","[Sun Hee]","Payon Inn","payon_in01",132,56;
warp "payon_in01",140,15;
warp "payon_in01",140,15; end;
}
//======================== Morocc ====================================
@ -75,33 +78,34 @@ payon_in01,131,62,5 script Inn Maid::SunHee 53,{
morocc_in,147,138,5 script Inn Maid::Suzie 53,{
callfunc "F_InnMaid","[Suzie]","North East Inn","morocc_in",142,140;
warp "morocc_in",174,144;
warp "morocc_in",174,144; end;
}
// South --------------------------------
morocc_in,80,100,5 script Inn Maid::Shala 53,{
callfunc "F_InnMaid","[Shala]","South Inn","morocc_in",78,95;
warp "morocc_in",74,128;
warp "morocc_in",74,128; end;
}
//======================== Rachel ====================================
ra_in01,376,69,4 script Inn Keeper 931,{
callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
warp "ra_in01",384,128;
warp "ra_in01",384,128; end;
}
//======================== Hugel ====================================
hu_in01,246,107,3 script Inn Maid::Receptionist 53,{
callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
warp "hu_in01",267,5;
warp "hu_in01",267,5; end;
}
//======================= Inn Function ==============================
function script F_InnMaid {
mes getarg(0);
mes "Welcome to '" + getarg(1) + "'.";
mes "Welcome to";
mes getarg(1) + ".";
mes "How may I help you?";
next;
menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend;
@ -132,7 +136,5 @@ function script F_InnMaid {
return;
Mend:
mes getarg(0);
mes "I am waiting for a job to do.";
close;
}

109
npc/merchants/milk_trader.txt
View File

@ -1,61 +1,82 @@
//===== eAthena Script =======================================
//= Milk Trader
//===== By: ==================================================
//= kobra_k88
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
//= 1.2a
//= 1.3
//===== Compatible With: =====================================
//= eAthena 7.15 +
//= eAthena SVN
//===== Description: =========================================
//= [Aegis Conversion]
//= trades bottles for milk
//===== Additional Comments: =================================
//= Fully working
//= 1.1 Negative input bug fixed [Lupus]
//= 1.2 Raised the price to close zeny exploit [Lupus]
//= 1.2a Switched to Lupus's "loopless" technique.[kobra_k88]
//= 1.3 Rescripted from the ground up. [L0ne_W0lf]
//============================================================
// Milk Trader -------------------------------------------------------------
prontera,71,131,7 script Milk Trader 86,{
mes "[Milk Trader]";
mes "If you bring me an empty bottle and 20 Zeny, I will exchange it for 1 bottle of milk.";
prontera,73,140,0 script Milk Vendor 86,{
//Supposedly this is to make sure the character
//has room to accept items in their inventory.
//var max_max_c = CheckMaxCount 1201 1
//if max_max_c == 1
// mes "^3355FFJust a minute!";
// mes "I can't offer any of my";
// mes "services to you because";
// mes "you're carrying too much";
// mes "stuff. Put your extra items in";
// mes "Kafra Storage and come again~";
// close;
//}
mes "[Milk Vendor]";
mes "Hey, hey...";
mes "If you bring me";
mes "1 Empty Bottle and";
mes "15 Zeny, I'll exchange";
mes "them for 1 Milk. How";
mes "does that sound?";
next;
menu "-Exchange as many as possible.",M_0, "-Let me set the amount.",M_1, "-Cancel",M_End;
M_0:
set @amount, 1000;
if(zeny/20 < @amount) set @amount, zeny/20;
if(countitem(713) < @amount) set @amount, countitem(713);
if(@amount > 0) goto L_Milk;
mes "[Milk Trader]";
mes "..... Are you trying to make a fool of me.... ?";
close;
M_1:
input @amount;
if(@amount < 1 || @amount > 1000) goto M_End;
if(countitem(713) < @amount) goto L_NoBottle;
if(zeny < (@amount*20)) goto L_NoZeny;
L_Milk:
set zeny, zeny - (@amount*20);
delitem 713, @amount;
getitem 519, @amount;
M_End:
mes "[Milk Trader]";
mes "Come back anytime.";
close;
L_NoBottle:
mes "[Milk Trader]";
mes "Ok, empty bottle please! Empty Bottle!!";
mes "... Aww.. you don't have enough...?";
close;
L_NoZeny:
mes "[Milk Trader]";
mes "You need more zeny.";
if (select("Exchange all empty bottles.:Cancel") == 1) {
if (countitem(713) <= 0) {
mes "[Milk Vendor]";
mes "Hey...";
mes "You don't have";
mes "any Empty Bottles.";
mes "I can't really give you";
mes "this milk any other";
mes "way, you know...";
close;
}
set .@bottles,countitem(713);
set .@total_weight,.@bottles * 50;
set .@total_cost,.@bottles * 15;
set .@now_weight,maxweight-weight;
if (zeny < .@Total_cost) {
mes "[Milk Vendor]";
mes "Oh, whoa~!";
mes "You don't have enough";
mes "zeny to exchange all";
mes "these Empty Bottles for";
mes "Milk. You need to have";
mes "at least " + gap + " zeny.";
close;
}
if (.@now_weight < .@total_weight) {
mes "[Milk Vendor]";
mes "Hmm...";
mes "Would you make";
mes "a little more room";
mes "in your inventory";
mes "before I give you";
mes "all of this milk?";
close;
}
set zeny,zeny-.@total_cost;
delitem 713,.@bottles; //Empty Bottles
getitem 519,.@bottles; //Milk
close;
}
close;
}

5894
npc/other/books.txt
View File

File diff suppressed because it is too large Load Diff

6
npc/quests/Kiel_Hyre_Quest.txt
View File

@ -63,8 +63,8 @@
//= 3.0 Fixed a typo in Elly, in her room. (was <= should have been <) [L0ne_W0lf]
//= Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
//= 3.1 Moved the "delitem" for all related quest items to the proper NPC. [L0ne_W0lf]
//= 3.2 Fixed error with Allysia teling yout o "Go away." maybe. [L0ne_W0lf]
//============================================================
//============================================================================
// Kiel Hyre Quest/Robotic Lab Dungeon
//
@ -5136,7 +5136,7 @@ kh_mansion,22,28,4 script Kiel Hyre 903,{
//----------------------------------------------------------------------------
kh_mansion,18,30,4 script Allysia 894,{
cutin "kh_ellisia",2;
if (KielHyreQuest <= 68) {
if (KielHyreQuest < 46) {
mes "[Allysia]";
mes "Who are you?";
mes "How did you get here?";
@ -5144,7 +5144,7 @@ kh_mansion,18,30,4 script Allysia 894,{
close;
}
else if (KielHyreQuest < 70) {
else if (KielHyreQuest >= 46) {
mes "[Allysia]";
mes "You must be surprised";
mes "by everything that's been";

10
npc/quests/quests_morocc.txt
View File

@ -2373,7 +2373,7 @@ OnTouch:
mes "Hey, master! Do you";
mes "know this guy?";
next;
if(mao_curse == 24)
if(prt_curse == 24)
{
mes "[" + strcharinfo(0) + "]";
mes "I, um, I'm looking";
@ -2841,7 +2841,7 @@ OnInit:
end;
OnTouch:
if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || mao_curse == 24)
if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || prt_curse == 24)
{
if(!$maobar_room)
{
@ -2865,7 +2865,7 @@ OnTouch:
donpcevent "Lin#2::OnEnter";
donpcevent "#mao_table::OnEnter";
}
else if(mao_curse == 24) donpcevent "Marjana::OnEnter";
else if(prt_curse == 24) donpcevent "Marjana#poison::OnEnable";
mes "[Tao]";
mes "Ah, that place is protected";
mes "by security magic, so you'll";
@ -2912,7 +2912,7 @@ OnStop:
donpcevent "Lin#2::OnInit";
donpcevent "Kidd#1::OnInit";
donpcevent "Kidd#2::OnInit";
donpcevent "Marjana::OnInit";
donpcevent "Marjana#poison::OnInit";
donpcevent "#mao_table::OnInit";
donpcevent "#roombar1::OnInit";
stopnpctimer;
@ -2930,7 +2930,7 @@ OnTimer245000:
donpcevent "Lin#2::OnInit";
donpcevent "Kidd#1::OnInit";
donpcevent "Kidd#2::OnInit";
donpcevent "Marjana::OnInit";
donpcevent "Marjana#poison::OnInit";
donpcevent "#mao_table::OnInit";
end;

3495
npc/quests/quests_prontera.txt
View File

File diff suppressed because it is too large Load Diff

111
npc/quests/quests_rachel.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.2
//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -36,6 +36,7 @@
//= 1.0 First version, needs testing. [L0ne_W0lf]
//= 1.1 Some slight optimization. [L0ne_W0lf]
//= 1.2 Fixed Man Stuck in Ice only giving 1 Freezing Snow Powder. [L0ne_W0lf]
//= 1.3 Added hte ability to redeem lottery tickets before donation max is met. [L0ne_W0lf]
//============================================================
// Lost Child Quest (Prerequisite to High Priest quest)
@ -5447,7 +5448,98 @@ L_End:
ra_temin,170,46,3 script Panno#rachel 920,{
cutin "ra_fano03",2;
if (ra_tem_q == 10) {
if (ra_tem_q < 2) {
mes "[Priestess Panno]";
mes "Greetings.";
mes "May Freya fill";
mes "your days with joy.";
mes "Laughter. And prosperity.";
next;
switch(select("Redeem Lottery Tickets:Temple Information:Hey, what's happening?")) {
case 1:
cutin "ra_fano03",2;
mes "[Priestess Panno]";
mes "Fine. You really";
mes "want to exchange your";
mes "Lottery Tickets? It's my job";
mes "to ask and make sure, you";
mes "know, in case you were saving";
mes "them for some weird reason.";
next;
if (select("Yes:No") == 1) {
case 1:
set .@now_weight,MaxWeight-Weight;
if (.@now_weight < 300) {
cutin "ra_fano02",2;
mes "[Priestess Panno]";
mes "You're carrying too much";
mes "right now. What are you";
mes "going to do if I give you";
mes "something large, unwieldy";
mes "and heavy? Put your junk";
mes "away in Storage first.";
goto L_End;
}
goto L_Lottery;
}
cutin "ra_fano03",2;
mes "[Priestess Panno]";;
mes "You can redeem your";
mes "Lottery Tickets at any";
mes "time, so please visit";
mes "me at your leisure.";
mes "Go with Freya.";
goto L_End;
case 2:
cutin "ra_fano01",2;
mes "[Priestess Panno]";
mes "The Chapel is located";
mes "over the wall behind me.";
mes "Our pope's office and chambers";
mes "are upstairs. You can only go";
mes "there if you have special";
mes "authorization.";
next;
mes "["+strcharinfo(0)+"]";
mes "......";
mes ".........";
next;
mes "[Priestess Panno]";
mes "............";
mes ".........";
mes "......";
next;
mes "["+strcharinfo(0)+"]";
mes "...?";
next;
cutin "ra_fano02",2;
mes "[Priestess Panno]";
mes "You come to a temple";
mes "to pray, not to look";
mes "around. Or chit-chat";
mes "with the priestesses";
mes "like me. Don't forget it.";
next;
cutin "ra_fano03",2;
mes "[Priestess Panno]";
mes "The offices for the High";
mes "Priests are located on each";
mes "side of the hallway. However,";
mes "you can only enter if you've";
mes "been permitted beforehand.";
goto L_End;
case 3:
mes "[Priestess Panno]";
mes "......................";
mes "No chit-chat";
mes "inside the temple.";
goto L_End;
}
}
else if (ra_tem_q == 10) {
mes "[Priestess Panno]";
mes "Good day.";
next;
@ -5785,10 +5877,17 @@ L_Lottery:
mes "You...";
mes "Don't have any Lottery";
mes "Tickets to redeem";
mes "We're not distributing";
mes "them now, but maybe you";
mes "can ask your friends for one.";
next;
if ($rachel_donate > 9999) {
mes "We're not distributing";
mes "them now, but maybe you";
mes "can ask your friends for one.";
}
else {
mes "You can obtain them from";
mes "Priestess Nemma at the temple";
mes "entrance after you donate zeny.";
}
next;
cutin "ra_fano03",2;
mes "[Priestess Panno]";
mes "May Freya be with you.";

2
npc/scripts_athena.conf
View File

@ -41,7 +41,7 @@ npc: npc/cities/yuno.txt
npc: npc/merchants/shops.txt
npc: npc/merchants/refine.txt
npc: npc/merchants/dye_maker.txt
npc: npc/merchants/clothes_dyer.txt
//npc: npc/merchants/clothes_dyer.txt
npc: npc/merchants/hair_dyer.txt
npc: npc/merchants/hair_style.txt
npc: npc/merchants/old_pharmacist.txt

7
npc/warps/other/kiel.txt
View File

@ -1,9 +1,9 @@
//===== Athena Script ========================================
//= Kiel Warp Script (Kiel Buildings)
//===== By: ==================================================
//= Playtester
//= Playtester; L0ne_W0lf
//===== Current Version: =====================================
//= 1.5
//= 1.6
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 8+
//===== Description: =========================================
@ -15,6 +15,7 @@
//= 1.3 Removed and altered exploitable warps for Kiel Hyre Quest. [L0ne_W0lf]
//= 1.4 Removed FIELD entrance into Kiel Hyre's Villa. [L0ne_W0lf]
//= 1.5 Rewrite of the warps. No more exploits/bugs should be present after this. [L0ne_W0lf]
//= 1.6 Thanks Tsuyuki for pointing out that bug! Bah! [L0ne_W0lf]
//============================================================
//============================================================
@ -43,7 +44,7 @@ kh_vila,46,54,0 warp kh_vila_03b 1,1,kh_vila,75,54
kh_vila,34,66,0 warp kh_vila_04a 1,1,kh_vila,20,108
kh_vila,20,103,0 warp kh_vila_04b 1,1,kh_vila,34,61
kh_vila,84,66,0 warp kh_vila_05a 1,1,kh_vila,44,107
kh_vila,44,103,,0 warp kh_vila_05b 1,1,kh_vila,84,62
kh_vila,44,103,0 warp kh_vila_05b 1,1,kh_vila,84,62
kh_vila,32,128,0 warp kh_vila_06a 1,1,kh_vila,23,171
kh_vila,22,167,0 warp kh_vila_06b 1,1,kh_vila,32,123
kh_vila,90,47,0 warp kh_vila_07a 1,1,kh_vila,119,47