diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 7 | ||||
| -rw-r--r-- | npc/jobs/2-1/hunter.txt | 5 | ||||
| -rw-r--r-- | npc/merchants/inn.txt | 10 | ||||
| -rw-r--r-- | npc/merchants/shops.txt | 4 | ||||
| -rw-r--r-- | npc/mobs/airplane.txt | 3 | ||||
| -rw-r--r-- | npc/quests/WIP/schwalz.txt | 33 | ||||
| -rw-r--r-- | npc/warps/cities/hugel.txt | 13 |
7 files changed, 55 insertions, 20 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 7122d4fde..57010b651 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -33,6 +33,13 @@ KarLaeda Date Added
======
+11/09
+ * Added Bingo - Hugel warps, thanks to erKURITA [Lupus]
+ - Added Hugel INN
+ - Added missing temp Airship mobs
+ - Pet shop in Lighthalzen
+ - Minor typos fix of Hunter Job quest, thanks to $ephiroth
+ * Fixed Swaltzwalt Quest Part 1 bugs [dunkle]
11/08
* Added quest\WIP (work in progress folder) with scripts by Dunkle and CallNIX [Lupus]
* Small fix in Hunter Job Quest [KarLaeda]
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index ddea02556..33f85aed8 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -31,6 +31,7 @@ //= 2.2 Merged JFunc, fixed missing dialogues [Lupus]
//= 2.2a Fixed Sharon resetting the test2 item set [Lupus]
//= 2.3a 7 official sets of Demon Hunter,thx to Dr.Evil [Lupus]
+//= 2.4 Added missing next;, missing NPC names [Lupus]
//============================================================
//<====================================== Job Changer ========================================>\\
@@ -139,7 +140,6 @@ L_Start: L_ReTest:
- mes "[Hunter Sharon]";
mes "Hmm.. what's this? So you wanna do the interview again? Very well. Hopefully you'll do better this time.";
next;
mes "[Hunter Sharon]";
@@ -270,6 +270,7 @@ L_Start: mes "[Hunter Sharon]";
mes "With your kind of additude and values, you should have no problems becoming a Hunter.";
next;
+ mes "[Hunter Sharon]";
goto L_Test2;
sL_90:
mes "[Hunter Sharon]";
@@ -278,6 +279,7 @@ L_Start: mes "[Hunter Sharon]";
mes "Work hard on the next test. Make Sharon happy, okies?";
next;
+ mes "[Hunter Sharon]";
goto L_Test2;
sL_Failed:
mes "[Hunter Sharon]";
@@ -463,6 +465,7 @@ L_Start: M_No:
mes "[Demon Hunter]";
mes "Stop playing around "+strcharinfo(0)+", that's your name, right?";
+ next;
menu "Yes",M_Yes, "Uhhh no",sM_End;
sM_End:
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index cf41d3a8c..1f30e8078 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -4,7 +4,7 @@ //= Darkchild (1.1)
//= Playtester (1.2)
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -24,6 +24,7 @@ //= 1.2 Rewrote inn script [Playtester]
//= 1.3 Added (finally) Rachel Inn Maid. Official warp
//= and save points[erKURITA]
+//= 1.4 Added Hugel inn [erKurita]
//============================================================
@@ -90,6 +91,13 @@ ra_in01.gat,376,69,4 script Inn Keeper 931,{ warp "ra_in01.gat",384,128;
}
+//======================== Hugel ====================================
+hu_in01.gat,246,107,3 script Inn Maid::Receptionist 53,{
+
+ callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01.gat",263,95;
+ warp "hu_in01",267,5;
+}
+
//======================= Inn Function ==============================
function script F_InnMaid {
mes getarg(0);
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index b9dd34cf6..67bbff1cb 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,7 +3,7 @@ //===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 1.8
+//= 1.9a
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -23,6 +23,7 @@ //= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
//= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
//= 1.9 Uncommented Homunculus shop, since Homunculus is working on trunk now. [Evera]
+//= 1.9a Pet Merchant -> Lighthalzen [erKURITA]
//============================================================
@@ -169,6 +170,7 @@ lighthalzen.gat,69,75,5 shop Fruit Gardener 102,512:-1,513:-1 lighthalzen.gat,112,44,8 shop Flower Girl 90,712:-1,744:-1,748:-1
lighthalzen.gat,126,126,4 shop Food Seller 83,7456:-1,7452:-1
lighthalzen.gat,124,129,8 shop Vegetable Gardener 91,515:-1,516:-1,535:-1
+lighthalzen.gat,222,191,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1
lhz_in02.gat,286,95,4 shop Begginer's Merchant 62,1621:-1,5112:-1,2416:-1,2113:-1,2512:-1
lhz_in02.gat,271,99,4 shop Armor Dealer 851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
lhz_in02.gat,276,99,4 shop Weapon Dealer 851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1771:-1
diff --git a/npc/mobs/airplane.txt b/npc/mobs/airplane.txt index ea3aca9d9..4d7e6d274 100644 --- a/npc/mobs/airplane.txt +++ b/npc/mobs/airplane.txt @@ -1,3 +1,4 @@ +//v 1.1
//Temporary spawns until Airship quest is finished
airplane_01.gat,225,52,25,10 monster Gremlin 1632,9,7200000,3600000,1
@@ -5,3 +6,5 @@ airplane_01.gat,225,52,25,10 monster Beholder 1633,6,7200000,3600000,1 airplane_01.gat,225,52,25,10 monster Picky 1049,4,7200000,3600000,1
airplane_01.gat,225,52,25,10 monster Familiar 1005,2,7200000,3600000,1
airplane_01.gat,225,52,25,10 monster Drainliar 1111,1,7200000,3600000,1
+airplane_01.gat,225,52,25,10 monster Rotar Zairo 1392,4,7200000,3600000,1
+airplane_01.gat,225,52,25,10 monster Steel Chonchon 1042,2,7200000,3600000,1
\ No newline at end of file diff --git a/npc/quests/WIP/schwalz.txt b/npc/quests/WIP/schwalz.txt index c844854fa..3ad7116c3 100644 --- a/npc/quests/WIP/schwalz.txt +++ b/npc/quests/WIP/schwalz.txt @@ -7,15 +7,17 @@ //= CallNix (Part 1)
//= dunkle (Part 2 & 3)
//===== Current Version: =====================================
-//= 1.0 working version
-//= 1.1 fixed bug with wrong valuable [dunkle]
-//= added and deleted some checks [dunkle]
-//= fixed warps (but they are wrong) [dunkle]
-//= fixed enabling of A Fine Gentleman [dunkle]
-//= fixed bug with reward [dunkle]
-//= 1.2 fixed bug in part with overflow timer (now you must wait untill next day, not 12 hours) [dunkle]
-// changed some valuables [dunkle]
-// fixed bugs in The broken Manufactoring [dunkle]
+//= 1.0 working version
+//= 1.1 fixed bug with wrong valuable [dunkle]
+//= added and deleted some checks [dunkle]
+//= fixed warps (but they are wrong) [dunkle]
+//= fixed enabling of A Fine Gentleman [dunkle]
+//= fixed bug with reward [dunkle]
+//= 1.2 fixed bug in part with overflow timer (now you must wait untill next day, not 12 hours) [dunkle]
+// changed some valuables [dunkle]
+// fixed bugs in The broken Manufactoring [dunkle]
+//= 1.2b fixed timer Ordinary Man [dunkle]
+//= 1.3 fixed part1 bugs [dunkle]
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -83,8 +85,9 @@ if (SCHWALTZVALT_PART2==23) { close;
}
-if questpass_swaltzwaltp1==1 goto l_alreadydone;
-if quest_swaltzwaltp1==1 goto Quest_enable;
+
+if (questpass_swaltwaltp1==1) goto l_alreadydone;
+if ( (SCHWALTZVALT_PART1==2) || (SCHWALTZVALT_PART1==3) ) goto Quest_enable;
if ( (SCHWALTZVALT_PART1==1) && (gettime(5)!=schwalzday) ) goto L_NEXTDAY;
if (SCHWALTZVALT_PART1==1) goto l_hadspoken;
mes "[Ghalstein]";
@@ -205,7 +208,8 @@ mes "There are some strange mobs there. So be careful. And last...People who go next;
mes "[Ghalstein]";
mes "So you had to go to 2 and 3 lvl of BioLab. Be sure you have finish this quest. And bring me 10 Lab staff records, 10 Armlet of prisoner and 1 Pile of Imir heat";
-set quest_swaltzwaltp1,1;
+set SCHWALTZVALT_PART1,2;
+
set schwalzday,0;
close;
@@ -270,22 +274,21 @@ close; }
//=======================================================================
lhz_dun02.gat,268,287,4 script The broken Manufactoring 111,{
-if quest_swaltzwaltp1!=1 goto l_end;
+if SCHWALTZVALT_PART1!=2 goto l_end;
mes "[The broken Manufactoring]";
mes "You see something shining inside the spoiling machines.Open up the machinr and check it,detected a round shape";
mes "object wich circulate with a mysterious shines.";
menu "Its seems like an important object",-,"But it looks nothing musch",l_nottake;
getitem(7346),1;
+set SCHWALTZVALT_PART1,3;
mes "["+strcharinfo(0)+"]";
mes "Well, Now i suppose everything will be ok.";
close2;
npctalk "Creeep... Creeeep-Creep...*pfu*.";
mes "["+strcharinfo(0)+"]";
mes "Oooops....I dont think this machien will work anymore... I'll go better from here";
-set quest_swaltzwaltp1,0;
close;
end;
-
l_nottake:
close;
diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt index 65bd184f5..b2cda1c63 100644 --- a/npc/warps/cities/hugel.txt +++ b/npc/warps/cities/hugel.txt @@ -3,7 +3,7 @@ //===== By: ==================================================
//= Sara-chan (1.1)
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 10+
//===== Description: =========================================
@@ -15,6 +15,7 @@ //= 1.3 Rewrote all warps to relate houses, and fixed it to kRO. [Er_Maqui]
//= 1.3a Replaced all spaces with TABs [Lupus]
//= 1.4 Fixed an back warp on hu_in01,15,70 (walk to the warp, then warps you back) [erKURITA]
+//= 1.5 Added Bingo warps [erKURITA]
//============================================================
//= Hugel City ================================================
@@ -97,4 +98,12 @@ hu_in01.gat,307,322,0 warp hugel56 1,1,hu_in01.gat,312,386 hugel.gat,80,230,0 warp hugel57 1,1,hu_in01.gat,24,363
hu_in01.gat,24,361,0 warp hugel58 1,1,hugel.gat,82,230
hugel.gat,93,201,0 warp hugel60 1,1,hu_in01.gat,303,380
-hu_in01.gat,301,380,0 warp hugel59 1,1,hugel.gat,93,199
\ No newline at end of file +hu_in01.gat,301,380,0 warp hugel59 1,1,hugel.gat,93,199
+
+//Bingo
+hugel.gat,55,208,0 warp hugelwarp1051 1,1,que_bingo.gat,49,9
+que_bingo.gat,49,7,0 warp hugelwarp1052 1,1,hugel.gat,57,207
+que_bingo.gat,39,34,0 warp hugelwarp1053 1,1,que_bingo.gat,34,109
+que_bingo.gat,34,105,0 warp hugelwarp1054 1,1,que_bingo.gat,38,28
+que_bingo.gat,53,34,0 warp hugelwarp1055 1,1,que_bingo.gat,49,71
+que_bingo.gat,48,66,0 warp hugelwarp1056 1,1,que_bingo.gat,53,29
\ No newline at end of file |