summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2011-01-01 17:16:42 +0100
committerStefan Beller <stefanbeller@googlemail.com>2011-01-02 21:22:17 +0100
commit630c8f6e73f509efcae5bf3274619ceb65cabeb2 (patch)
tree2b2a9477b941d227fed53af1d7d8d46a6d94a614
parent6c7dbd1fb03fcd18dd33a3c8852084e677d4d278 (diff)
downloadserverdata-630c8f6e73f509efcae5bf3274619ceb65cabeb2.tar.gz
serverdata-630c8f6e73f509efcae5bf3274619ceb65cabeb2.tar.bz2
serverdata-630c8f6e73f509efcae5bf3274619ceb65cabeb2.tar.xz
serverdata-630c8f6e73f509efcae5bf3274619ceb65cabeb2.zip
bug fix in scripting language
you should not write if(!getskilllv(FOO)) please write if(!(getskilllv(FOO))) instead. gwendolin only: fix to the right const. (there is a difference in const_db and in skill_db)
-rw-r--r--npc/011-1_Woodland/auldsbel.txt2
-rw-r--r--npc/013-2_Magic_house/wizard.txt2
-rw-r--r--npc/016-1_Woodland/gwendolyn.txt14
3 files changed, 9 insertions, 9 deletions
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index 0b2174f1..1c6487c0 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -516,7 +516,7 @@ L_question:
goto L_main_menu;
L_Q_astralsoul:
- if (!getskilllv(SKILL_ASTRAL_SOUL))
+ if (!(getskilllv(SKILL_ASTRAL_SOUL)))
goto L_Q_astralsoul_L;
next;
mes "[Auldsbel the Wizard]";
diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
index 616c5da1..f3964cc0 100644
--- a/npc/013-2_Magic_house/wizard.txt
+++ b/npc/013-2_Magic_house/wizard.txt
@@ -45,7 +45,7 @@ L_new_student:
next;
// check if the player has the knowledge of any skill
- if (!getskilllv(SKILL_POOL))
+ if (!(getskilllv(SKILL_POOL)))
menu
"That would be very kind of you!", L_teachspell,
"No, but thank you!", nothx;
diff --git a/npc/016-1_Woodland/gwendolyn.txt b/npc/016-1_Woodland/gwendolyn.txt
index 6fada83a..c81fefd1 100644
--- a/npc/016-1_Woodland/gwendolyn.txt
+++ b/npc/016-1_Woodland/gwendolyn.txt
@@ -9,14 +9,14 @@
//# Reward: 10000 Exp
//# Quest2: Hitting the Target
//# Needed: win the minigame and hit the target depending on the wind, dex and agi
-//# Reward: Skill Hawk's Eye
+//# Reward: Skill Hawk's Eye
//#
//# Variables used: @QUEST_Forestbow_state, nibble 6
//#
//# This nibble will have these values:
//# 0, state0: never talked to Gwendolyn
//# 1, state1: talked with her, but not a student yet
-//# 2, state2: student, but no bow (from alan of course)
+//# 2, state2: student, but no bow (from alan of course)
//# 3, state3: heard first lesson, she is waiting for the snake eggs
//# 4, state4: quest done, but too young, or having the ability for skills not learned
//# 5, state5: you are ready to do the targeting minigame
@@ -143,7 +143,7 @@ state3:
state4:
if (baselevel < @BASELEVEL_GAME) goto not_ready;
- if (!getskilllv(SKILL_POOL)) goto not_ready;
+ if (!(getskilllv(SKILL_POOL))) goto not_ready;
mes "Gwendolyn takes an analyzing look at you. Then she noods.";
next;
@@ -220,7 +220,7 @@ game:
if (@wp_sq < 19) goto wp3;
goto wp4;
-
+
wp0:
mes "[Gwendolyn Bowmaker]";
mes "\"You're lucky. It is windless now.\"";
@@ -411,7 +411,7 @@ target_hit:
set @Q_hawkseye, 6;
callsub S_Update_Var;
- setskill AC_OWL, 1;
+ setskill SKILL_MALLARDS_EYE, 1;
getexp @QUEST_HAWK_EXP, 0;
mes "\"You proved that you are worthy to call yourself a graduate of the School of Archery.\"";
@@ -491,7 +491,7 @@ S_getDirection:
// returns an index where these parameters are in relation to origin
// 123
// 456 whereas 5 is the origin. (3,6,9 there is paramX>0); (1,2,3 there is paramY>0)
- // 789
+ // 789
//first check the quadrants and after check more precisely
if(@paramX>0 && @paramY>0) set @returnIndex, 3;
if(@paramX>0 && @paramY<0) set @returnIndex, 9;
@@ -511,7 +511,7 @@ S_getDirection:
if ( (@paramY < 0) && (@paramX >= @paramY/2) && (-@paramX >= @paramY/2) ) set @returnIndex, 8;
//check the origin, because the origin is found by the "straight" lines as well. (should not, but is.. maybe a bug?)
- if( @paramX==0 && @paramY==0 ) set @returnIndex, 5;
+ if( @paramX==0 && @paramY==0 ) set @returnIndex, 5;
return;
}