diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-01-30 12:32:45 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-01-30 12:32:45 +0100 |
| commit | 64f3cae74306c3c619bc65255145e4b18e4f1b95 (patch) | |
| tree | e8e9361f41ce707aa987762e72532c8ab6eca9a5 /npc | |
| parent | 69c423dc427f16f26ad3a2e91bbc7048528343a0 (diff) | |
| parent | a91376e4efeef4beaa59e05a04249ff65038a23e (diff) | |
| download | serverdata-64f3cae74306c3c619bc65255145e4b18e4f1b95.tar.gz serverdata-64f3cae74306c3c619bc65255145e4b18e4f1b95.tar.bz2 serverdata-64f3cae74306c3c619bc65255145e4b18e4f1b95.tar.xz serverdata-64f3cae74306c3c619bc65255145e4b18e4f1b95.zip | |
Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/002-3_Desert_mines/mine_triggertwo.txt | 4 | ||||
| -rw-r--r-- | npc/002-3_Desert_mines/naem.txt | 8 | ||||
| -rw-r--r-- | npc/functions/clear_vars.txt | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/npc/002-3_Desert_mines/mine_triggertwo.txt b/npc/002-3_Desert_mines/mine_triggertwo.txt index 21e1d965..5d005620 100644 --- a/npc/002-3_Desert_mines/mine_triggertwo.txt +++ b/npc/002-3_Desert_mines/mine_triggertwo.txt @@ -4,7 +4,7 @@ if (TMW_Quest == 36) goto L_Trigger_2; if (TMW_Quest == 35) goto L_Trigger_Wrong_2; - if (TMW_Quest == 34) goto L_Trigger_Wrong_2; + if (TMW_Quest == 34) goto L_Trigger_Wrong_2; mes "There is a large button on the ground. A key hole appears on the button."; close; @@ -42,7 +42,7 @@ L_Right_2: L_Left_2: set TMW_Quest, 37; - set Open_Underground_Palace_Barrier, 1; + set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND; mes "You turn the key left. A clicking sound echoes throughout the mine, followed by a loud thump."; close; diff --git a/npc/002-3_Desert_mines/naem.txt b/npc/002-3_Desert_mines/naem.txt index aca3e0c2..5f0f9bd6 100644 --- a/npc/002-3_Desert_mines/naem.txt +++ b/npc/002-3_Desert_mines/naem.txt @@ -2,8 +2,8 @@ 002-3.gat,85,97,6 script Naem 109,{ - if (Naem_Quest_Done == 1) goto L_Naem_Complete; - if (Open_Underground_Palace_Barrier == 1) goto L_Naem_Gloves; + if (FLAGS & FLAG_GOT_NAEM_GLOVES) goto L_Naem_Complete; + if (FLAGS & FLAG_OPENED_UNDERGROUND) goto L_Naem_Gloves; if (TMW_Quest == 34) goto L_Naem_Code; if (TMW_Quest == 33) goto L_Naem_Lt; if (TMW_Quest == 32) goto L_Naem_Memory; @@ -113,12 +113,12 @@ L_Naem_Code: L_Naem_Gloves: getinventorylist; if (@inventorylist_count == 100) goto L_Nathan_TooMany; - set Naem_Quest_Done, 1; + set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES; getitem "MinerGloves", 1; mes "[Naem]"; mes "\"Hey, good job on getting that together! Take these gloves, they might prove useful in the underground palace.\""; close; - + L_Naem_TooMany: mes "[Naem]"; mes "\"You have too many items for me to give you a reward.\""; diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt index ae83968f..62eada3d 100644 --- a/npc/functions/clear_vars.txt +++ b/npc/functions/clear_vars.txt @@ -94,6 +94,14 @@ function script ClearVariables { set Xmas2010, 0; set Golbenez_Inn_Cost, 0; + + //These lines are needed to migrate stuff from variables to flags + if (Open_Underground_Palace_Barrier) set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND; + set Open_Underground_Palace_Barrier, 0; + + if (Naem_Quest_Done) set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES; + set Naem_Quest_Done, 0; + if (#BankAccount < 0) goto FixBank; return; |