summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/airports/airships.txt5
-rw-r--r--npc/custom/dye.txt5
-rw-r--r--npc/other/Global_Functions.txt8
4 files changed, 13 insertions, 9 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f705a5eec..cdb5b4df9 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2008/03/15
+ * Fixed Job_Change Function to properly jobchange babies. (bugreport: 943) [Paradox924X]
+ * Updated Airship Typing Challenge to not fail you when you get both strings correct. (bugreport: 1008) [Paradox924X]
+ * Renamed custom Stylist to Stylist#customstylist to avoid conflicts with official one. (bugreport: 1042) [Paradox924X]
2008/03/14
* Fixed a bug allowing Ferlock#Lab to get disabled mid-speech. (bugreport: 1129) [Paradox924X]
* Fixed the autotimer on an npc warp in Juperos Quest. [Paradox924X]
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 7253eca90..02dd7f93f 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 1.1
+//= 1.1a
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -29,6 +29,7 @@
//= 0.9b Fixed a typo and bad variable use in the Typing Challenge [ultramage]
//= 1.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//= 1.1 Touch-ups, and changed references of "Yuno" to "Juno", [L0ne_W0lf]
+//= 1.1a Small fix to comparison check. [Paradox924X]
//============================================================
//============================================================
@@ -515,7 +516,7 @@ s_Play:
if(@string2c$ != "")mes @string2c$;
input @comparisonvar$[2];
next;
- if(@comparisonvar$[1] == @typingstring1$ && @comparisonvar$[2] == @typingstring2$) goto s_Fail;
+ if(@comparisonvar$[1] != @typingstring1$ || @comparisonvar$[2] != @typingstring2$) goto s_Fail;
set @time,(gettime(3)*60*60+gettime(2)*60+gettime(1))-@start; //seconds taken
set @mypoints,(@typingkeys * 100) / @time;
mes "[Nils]";
diff --git a/npc/custom/dye.txt b/npc/custom/dye.txt
index 9b7167ecb..abc1f363e 100644
--- a/npc/custom/dye.txt
+++ b/npc/custom/dye.txt
@@ -4,12 +4,13 @@
//= eAthena Dev team
//= Revised by Nekosume [pyRO v3.0]
//===== Current Version: =====================================
-//= 4.0
+//= 4.2
//===== Compatible With: =====================================
//= Any eAthena Version
//===== Description: =========================================
//= Revised dye NPC
//===== Additional Comments: =================================
+//= v4.2 - Renamed to avoid conflict [Paradox924X]
//= v4.1 - New hairstyles added [Mass Zero]
//= v4.0 - Refined and Combined [Darkchild]
//= v3.0 - Added the 'Browse' options
@@ -21,7 +22,7 @@
//Stylist------------------------------------------------------------------------------------------------------------
-prontera,170,180,1 script Stylist 122,{
+prontera,170,180,1 script Stylist#custom_stylist 122,{
mes "[^FF8000Stylist^000000]";
mes "I'm the greatest stylist in all of Rune-Midgard~~!";
mes "I can change your hair style or color!";
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index a9add7eca..d72621074 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Lupus, kobra_k88
//===== Current Version: =====================================
-//= 2.10
+//= 2.11
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -33,6 +33,7 @@
//= 2.09 Cleared F_ClearGarbage [Lupus]
//= 2.10 Added F_CheckMaxCount to check count of carrid items. [L0ne_w0lf]
//= 2.10a Removed fuction F_CheckMaxCount. Not needed. [L0ne_W0lf]
+//= 2.11 Updated function Job_Change to jobchange based on Upper value. [Paradox924X]
//============================================================
@@ -98,10 +99,7 @@ function script F_ClearGarbage {
//////////////////////////////////////////////////////////////////////////////////
function script Job_Change {
- if (Upper<2)
- jobchange getarg(0); // Common jobchange
- else
- jobchange getarg(0) + Job_Baby; //Change Job For Baby Class
+ jobchange getarg(0),Upper; //Jobchange based on Upper
logmes "CLASS CHANGE: " +strcharinfo(0)+ " become a "+jobname(Class);
return;
}