diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2010-12-31 01:31:54 +0100 |
|---|---|---|
| committer | Stefan Beller <stefanbeller@googlemail.com> | 2010-12-31 01:31:54 +0100 |
| commit | 95234e75fe057c580ac147a2653555b3d14f4cf4 (patch) | |
| tree | 9a7c9d5f88b08ce41ffbc29296c44276b18db51b /npc | |
| parent | c13e2933778fbff7d61061041ac38e1f1f5d4fa9 (diff) | |
| parent | d21d470338b6ad5f6d9d540cb61212a4c3bfb064 (diff) | |
| download | serverdata-95234e75fe057c580ac147a2653555b3d14f4cf4.tar.gz serverdata-95234e75fe057c580ac147a2653555b3d14f4cf4.tar.bz2 serverdata-95234e75fe057c580ac147a2653555b3d14f4cf4.tar.xz serverdata-95234e75fe057c580ac147a2653555b3d14f4cf4.zip | |
Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/031-3_Cave/cindyCave.txt | 9 | ||||
| -rwxr-xr-x | npc/031-3_Cave/labyrinth.txt | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt index 77046422..03bb0bde 100644 --- a/npc/031-3_Cave/cindyCave.txt +++ b/npc/031-3_Cave/cindyCave.txt @@ -90,7 +90,7 @@ L_Reward: getinventorylist; if (@inventorylist_count == 100) goto L_Full_Inv; - set @reward, rand(1); + set @reward, rand(2); if (@reward == 1) goto L_Wizard_Hat; //TODO: set right, when quarterstaff is in item_db //getitem "WoodenStaff", 1; @@ -100,8 +100,8 @@ L_Reward: L_Wizard_Hat: //TODO: set right, when quarterstaff is in item_db - //getitem "WizardHat", 1; - mes "DEBUG: GET ACORN INSTEAD OF WIZARDHAT"; + //getitem "BugLeg", 1; + mes "DEBUG: GET BUGLEG INSTEAD OF WIZARDHAT"; getitem "acorn", 1; L_Visit: @@ -183,11 +183,12 @@ onReward: if (isdead(0)) end; //TODO: determine, if and how many boss points should be added set BOSS_POINTS, BOSS_POINTS + 100; -//TODO: check, if two messages for the player works message strcharinfo(0), "You gain 100 Boss Points giving you a total of " + BOSS_POINTS; + if (@rescue_Cindy < 1) goto L_No_Progress; set @rescue_Cindy, 2; callsub S_Update_Mask; message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you."; +L_No_Progress: end; ///////// diff --git a/npc/031-3_Cave/labyrinth.txt b/npc/031-3_Cave/labyrinth.txt index 89a0623a..a73085e3 100755 --- a/npc/031-3_Cave/labyrinth.txt +++ b/npc/031-3_Cave/labyrinth.txt @@ -264,10 +264,18 @@ } 031-3.gat,120,81,0 script #ChristmasBarrier 127,1,1,{ + if ($@FIGHT_YETI_STATUS == 1) goto L_Block; warp "031-3.gat", 46, 27; + end; +L_Block: + message strcharinfo(0), "Some force seems to be blocking you from exiting."; end; } 031-3.gat,46,24,0 script #ChristmasBarrier 127,1,1,{ +if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked; warp "031-3.gat", 120, 79; + end; +L_Blocked: + message strcharinfo(0), "Some force seems to be blocking you from entering."; end; } |