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

* Slew up NPC bug fixes and other updates.

Browse Source 
- Corrected item checking in Dancer job quest. (buggreport:1987)
- Fixed infinite dialog in novice grounds. (buggreport:1998)
- Fixed overlapping warps in ice dungeon.  (buggreport:2009)
- Corrected super novice script checks. (buggreport:2016)
- Corrected bug in alchemist dealer. (bugreport:2020)
- Commented out message board NPCs.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13052 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf
2008-08-08 19:54:07 +00:00
parent f32ca3d261
commit dd8e1e1bf3
7 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
npc/Changelog.txt
View File

@@ -1,5 +1,13 @@
Date Added
======
2008/08/08
* Rev. 13052 Slew up NPC bug fixes and other updates. [L0ne_W0lf]
- Corrected item checking in Dancer job quest. (buggreport:1987)
- Fixed infinite dialog in novice grounds. (buggreport:1998)
- Fixed overlapping warps in ice dungeon. (buggreport:2009)
- Corrected super novice script checks. (buggreport:2016)
- Corrected bug in alchemist dealer. (bugreport:2020)
- Commented out message board NPCs.
2008/08/03
* Fixed an NPC in Kiel Hyre Quest warping onto the exit warp for final room. [Paradox924X]
* Rev. 13038 Fixed some condition checks in archer, mage, and swordie, jobs. [L0ne_W0lf]

9
npc/jobs/2-2/dancer.txt
View File

@@ -4,7 +4,7 @@
//= Kalen - Original jAthena
//= Fredzilla - Converted, Lupus
//===== Current Version: =====================================
//= 3.5
//= 3.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 3.3 Updated waiting room. (Removes global var) [L0ne_W0lf]
//= 3.4 Fixed bad variables, bugreport:1685 [Brainstorm]
//= 3.5 Minor corrections to script. (bugreport:1766) [L0ne_W0lf]
//= 3.6 Applied Correction bug with for loop. [L0ne_W0lf]
//============================================================
comodo,180,153,4 script Sonotora#1 90,{
@@ -294,7 +295,11 @@ job_duncer,43,93,4 script Aile#da 724,{
break;
}
set .@size, getarraysize(.@item);
for( set .@i, 0; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i]; set .@i, .@i + 1 );
for( set .@i, 0; .@i < .@size; set .@i,.@i+1 ) {
if( countitem(.@item[.@i]) < .@count[.@i] ) {
break;
}
}
if( .@i == .@size && Zeny > 9999 ) {
cutin "job_dancer_eir02",2;
mes "[Aile]";

6
npc/jobs/novice/novice.txt
View File

@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dr.Evil & MasterOfMuppets
//===== Current Version: =====================================
//= 2.1
//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= Added duplicate NPCs to combat training maps.
//= 2.0 Fixed savepoint not being changed sometimes. [L0ne_W0lf]
//= 2.1 Corrected spacing issue in welcome message. [L0ne_W0lf]
//= 2.2 Corrected Leo's endless dialog. [L0ne_W0lf]
//============================================================
// Bulletin Board
@@ -2088,8 +2089,9 @@ new_1-2,184,172,1 script Understandings of Skills 47,{
mes "as you are cute~!";
mes "I, Leo, am very impressed.";
next;
break;
set .@end,1;
}
if (.@end) break;
}
mes "[Leo Handerson]";
mes "Do you wish to";

9
npc/jobs/novice/supernovice.txt
View File

@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Darkchild
//===== Current Version: =====================================
//= 2.0
//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,10 +14,11 @@
//===== Additional Comments: =================================
//= 1.9 Rescripted to the Aegis 10.3 Standars. [Samuray22]
//= 2.0 Rescripted again, this time using an iRO base. [L0ne_W0lf]
//= 2.1 Swapped use of baseclass for basejob. [L0ne_W0lf]
//============================================================
aldeba_in,223,167,3 script Tzerero#sn 709,{
if (BaseClass == Job_SuperNovice) {
if (BaseJob == Job_SuperNovice) {
mes "[Tzerero]";
mes "I trust that you are enjoying";
mes "life as a Super Novice? Ah,";
@@ -102,7 +103,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
mes "^FF000030 Resin^000000.";
close;
}
if (BaseClass == Job_Novice && upper != 1) {
if (BaseJob == Job_Novice && upper != 1) {
mes "[Tzerero]";
mes "...Hmm?";
mes "Stop.";
@@ -269,7 +270,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
}
}
else {
if (BaseClass == Job_SuperNovice) {
if (BaseJob == Job_SuperNovice) {
mes "[Tzerero]";
mes "How do you like living";
mes "life simply as a Super";

5
npc/merchants/alchemist.txt
View File

@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Team
//===== Current Version: =====================================
//= 1.5
//= 1.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -15,6 +15,7 @@
//= 1.3 Deleted Elemental Potions Guide due to original quest [Lupus]
//= 1.4 Alchemists can now purchase 2000 Medicine Bowls at once. [SinSloth]
//= 1.5 Updated to Aegis 10.3 Standards. [L0ne_W0lf]
//= 1.6 Corrected canceling purchase. [L0ne_W0lf]
//============================================================
alde_alche,24,188,3 script Guild Dealer 740,{
@@ -149,7 +150,7 @@ S_SellManual:
mes ""+getitemname(getarg(0))+"?";
mes "That'll be "+getarg(1)+" zeny.";
next;
switch(select("Purchase.:Quit.")) {
if (select("Purchase.:Quit.") == 1) {
set zeny,zeny-getarg(1);
getitem getarg(0),1;
mes "[Gever Al Sharp]";

7
npc/quests/quests_rachel.txt
View File

@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 2.5
//= 2.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -49,7 +49,8 @@
//= 2.4 Updated Zhed's Thor Vol. Base addition dialog to iRO's. [L0ne_W0lf]
//= 2.4a Further updates to Zhed's Veins addition. [L0ne_W0lf]
//= 2.5 Added Nameless Island quest addition. [L0ne_W0lf]
//= 2.6 Uncommented ontouchNPC label for Man Stuck in Ice. [L0ne_W0lf]
//= 2.6 Uncommented ontouchNPC label for Man Stuck in Ice. [L0ne_W0lf]
//= 2.7 Corrected overlaping warp coordinates. [L0ne_W0lf]
//============================================================
// Lost Child Quest (Prerequisite to High Priest quest)
@@ -3797,7 +3798,7 @@ OnTimer60000:
end;
}
ice_dun03,150,132,0 script #ice_4f_1 45,2,2,{
ice_dun03,150,137,0 script #ice_4f_1 45,2,2,{
OnTouch:
warp "ice_dun04",33,144;
end;

2
npc/scripts_athena.conf
View File

@@ -220,7 +220,7 @@ npc: npc/other/hugel_bingo.txt
npc: npc/other/mail.txt
npc: npc/other/marriage.txt
npc: npc/other/monster_museum.txt
npc: npc/other/msg_boards.txt
//npc: npc/other/msg_boards.txt
npc: npc/other/powernpc.txt
npc: npc/other/pvp.txt
npc: npc/other/resetskill.txt