From 3b2578da3d7be6724312de452ba9ae51911fb07c Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Sun, 14 Nov 2010 19:09:45 +0100 Subject: gwendolin and nurse fully done, luca uncommented and corrected. now 2 skills are completely working. luca needs another rework to focus on skills. --- npc/016-1_Woodland/gwendolyn.txt | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'npc/016-1_Woodland/gwendolyn.txt') diff --git a/npc/016-1_Woodland/gwendolyn.txt b/npc/016-1_Woodland/gwendolyn.txt index 8c6728da..6fada83a 100644 --- a/npc/016-1_Woodland/gwendolyn.txt +++ b/npc/016-1_Woodland/gwendolyn.txt @@ -142,9 +142,8 @@ state3: next; state4: - // TODO - // check if skills are enabled, if not, goto not_ready if (baselevel < @BASELEVEL_GAME) goto not_ready; + if (!getskilllv(SKILL_POOL)) goto not_ready; mes "Gwendolyn takes an analyzing look at you. Then she noods."; next; @@ -215,9 +214,6 @@ game: set @wp_sq, (@wdX * @wdX) + (@wdY * @wdY); -//TODO: remove -//mes "wdX:"+@wdX+" wdY:"+@wdY+" wp_sq:"+@wp_sq+" wdIndex:"+@wdIndex; - if (@wp_sq == 0) goto wp0; if (@wp_sq < 3) goto wp1; if (@wp_sq < 9) goto wp2; @@ -346,9 +342,6 @@ choose_shotpower: set @pointX, @wdX + @spX; set @pointY, @wdY + @sp; -//TODO: remove -//mes "pointX:"+@pointX+" pointY:"+@pointY+" spX:"+@spX+" sp:"+@sp; - if( @pointX==0 && @pointY==0 ) goto target_hit; //set @targethit to these numbers: @@ -436,9 +429,7 @@ target_nohit: state6: mes "[Gwendolyn Bowmaker]"; mes "\"You really have a reason to be proud.\""; - //close; - //TODO: uncomment close! - mes "here is an uncommented close; for testing purpose, you can try once more :-D"; + close; state1: mes "[Gwendoly Bowmaker]"; @@ -522,21 +513,6 @@ S_getDirection: //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; return; - -//TODO: remove: -testoutput: - set @paramX ,-4; -loopouter: - set @paramY ,-4; -loopinner: -callsub S_getDirection; -mes " "+@paramX+" / "+@paramY+" = "+@returnIndex; -set @paramY, @paramY+1; -if(@paramY<5)goto loopinner; -next; -set @paramX, @paramX+1; -if(@paramX<5)goto loopouter; -return; } //////////////////////////////////// -- cgit v1.2.3-70-g09d2