summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-03 14:56:29 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-03 14:56:29 +0000
commit8b332024d2f21cffdab22f31cc9016cde7fc75e5 (patch)
tree0c39181430965d778c4a436c22b047f0771fc2cf
parent98c42dd9f7401a77f326c22263785515a9b9a7e9 (diff)
downloadhercules-8b332024d2f21cffdab22f31cc9016cde7fc75e5.tar.gz
hercules-8b332024d2f21cffdab22f31cc9016cde7fc75e5.tar.bz2
hercules-8b332024d2f21cffdab22f31cc9016cde7fc75e5.tar.xz
hercules-8b332024d2f21cffdab22f31cc9016cde7fc75e5.zip
Fixed some condition checks in archer, mage, and swordie, jobs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13038 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/jobs/1-1/archer.txt5
-rw-r--r--npc/jobs/1-1/merchant.txt5
-rw-r--r--npc/jobs/1-1/swordman.txt5
4 files changed, 10 insertions, 6 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0c319f2db..455d2327d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2008/08/03
+ * Rev. 13038 Fixed some condition checks in archer, mage, and swordie, jobs. [L0ne_W0lf]
* Rev. 13037 Implemnted Hugel Monster Races. [L0ne_W0lf]
2008/07/31
* Rev. 13026 Added iRO Repeatable EXP quests care of Kisuka. [L0ne_W0lf]
diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt
index e63cbde43..1d9fb697b 100644
--- a/npc/jobs/1-1/archer.txt
+++ b/npc/jobs/1-1/archer.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.7a
+//= 1.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,11 +20,12 @@
//= Arrow reward is now equal to the type sof trunks brought.
//= No longer uses function "F_ToHigh"
//= 1.7a Fixed minor dialogue bug at Grade==25 [Lupus]
+//= 1.8 Fixed mistake in condition check. [L0ne_W0lf]
//============================================================
payon_in02,64,71,4 script Archer Guildsman#archer 85,{
if (Upper == 1) {
- if (Class == Job_Novice_High && ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy) {
+ if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
mes "[Archer Guildsman]";
mes "Hey, I know you.";
mes "You took this test";
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 4b2fe8218..232b98f17 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -25,11 +25,12 @@
//= 1.9a Added a missing next; (Barron-Monster) [L0ne_W0lf]
//= 1.9b Typo. "nextl" -> "next;" (Barron-Monster) [L0ne_W0lf]
//= 2.0 Should "fix" the problem with the Biliban Kafra. [L0ne_W0lf]
+//= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
//============================================================
alberta_in,53,43,6 script Merchant#mer 86,{
if (Upper == 1) {
- if (Class == Job_Novice_High && ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator) {
+ if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
mes "[Chief Mahnsoo]";
mes "Long time no see!";
mes "Hey, you didn't quit";
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 77ea8dfe2..1a99e6d89 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -33,11 +33,12 @@
//= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf]
//= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage]
//= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
+//= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
//============================================================
izlude_in,74,172,4 script Swordman#swd_1 119,{
if (Upper == 1) {
- if (Class == Job_Novice_High && ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin) {
+ if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
mes "[Swordman]";
mes "It...";
mes "Can't be...";