diff options
Diffstat (limited to 'world/map/npc/annuals/xmas')
-rw-r--r-- | world/map/npc/annuals/xmas/barriers.txt | 8 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/config.txt | 2 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/core.txt | 26 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/debug.txt | 12 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/helpers.txt | 2 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/list.txt | 6 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/mobmanager.txt | 10 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/reagents.txt | 8 | ||||
-rw-r--r-- | world/map/npc/annuals/xmas/states.txt | 2 |
9 files changed, 38 insertions, 38 deletions
diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt index 07bff6f7..551c59f6 100644 --- a/world/map/npc/annuals/xmas/barriers.txt +++ b/world/map/npc/annuals/xmas/barriers.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|ThrowOutTheBum|, +function|script|ThrowOutTheBum { if((@xmas_thrown_out) && ($@xmas_time)) goto L_SideOut; @@ -31,7 +31,7 @@ L_Return: } // Annual Xmas Boss Fight Door -030-2.gat,153,21,0|script|#DarkDoor|45,0,0, +030-2.gat,153,21,0|script|#DarkDoor|45,0,0 { callfunc "XmasStates"; @@ -67,7 +67,7 @@ L_Close: // Annual Xmas secret passage to a trapdoor in Santa's Inn Basement -030-3.gat,100,49,0|script|SmallCrack#XmasPassage|400,0,1, +030-3.gat,100,49,0|script|SmallCrack#XmasPassage|400,0,1 { callfunc "XmasStates"; @@ -134,7 +134,7 @@ L_Close: } // Annual Xmas Escape Hatch -030-2.gat,48,44,0|script|#BasementDoor|45,0,0, +030-2.gat,48,44,0|script|#BasementDoor|45,0,0 { callfunc "XmasStates"; diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt index e8ac5cc2..5a982c5c 100644 --- a/world/map/npc/annuals/xmas/config.txt +++ b/world/map/npc/annuals/xmas/config.txt @@ -38,7 +38,7 @@ // 30: Helper Bit // 31: Side Choosen: Naughty vs. Nice --|script|#XmasConfig|-1, +-|script|#XmasConfig|-1 { end; diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt index c925b6eb..30562e13 100644 --- a/world/map/npc/annuals/xmas/core.txt +++ b/world/map/npc/annuals/xmas/core.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasNaughty|, +function|script|XmasNaughty { set @xmas_karma, ((XMASTIME & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); if((@xmas_karma - @karma_bonus) >= 0) @@ -23,7 +23,7 @@ L_Return: return; } -function|script|XmasNice|, +function|script|XmasNice { set @xmas_karma, ((XMASTIME & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); if((@xmas_karma + @karma_bonus) < 16) @@ -45,7 +45,7 @@ L_Return: } // Called for a basic reward for quests state completion -function|script|XmasXpReward|, +function|script|XmasXpReward { if (BaseLevel >= 10) goto L_HigherLevel; @@ -63,44 +63,44 @@ L_Return: return; } -function|script|XmasSetState|, +function|script|XmasSetState { set XMASTIME, (XMASTIME & ~(NIBBLE_0_MASK) | (@xmas_state << NIBBLE_0_SHIFT)); return; } -function|script|XmasSetSide|, +function|script|XmasSetSide { set XMASTIME, XMASTIME | $@xmas_side_bit; return; } -function|script|XmasSetRoute|, +function|script|XmasSetRoute { set XMASTIME, XMASTIME | $@xmas_route_bit; return; } -function|script|XmasThrowOut|, +function|script|XmasThrowOut { set XMASTIME, XMASTIME | $@xmas_thrown_out_bit; return; } -function|script|XmasSetBossStart|, +function|script|XmasSetBossStart { set XMASTIME, XMASTIME | $@xmas_boss_start_bit; return; } -function|script|XmasSetBossHero|, +function|script|XmasSetBossHero { set XMASTIME, XMASTIME | $@xmas_boss_hero_bit; return; } // Tallys the players quest -function|script|XmasSetReward|, +function|script|XmasSetReward { set @xmas_endgame, 0; set @xmas_reward_side, 0; @@ -138,7 +138,7 @@ L_SetRewardBonus: } // Main quest completion reward -function|script|XmasMainXpBpReward|, +function|script|XmasMainXpBpReward { callfunc "XmasSetReward"; @@ -169,7 +169,7 @@ L_XmasExp: } // Final Item reward -function|script|XmasMainItemReward|, +function|script|XmasMainItemReward { callfunc "XmasSetReward"; @@ -237,7 +237,7 @@ L_Return: // Checks for an expired event key // Each new annual event needs a new key // or it will allow completion from last year -function|script|XmasCheckOld|, +function|script|XmasCheckOld { if(XMASYEAR == $XMAS_TIME_KEY[5]) goto L_Return; diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt index a26565b6..248321fb 100644 --- a/world/map/npc/annuals/xmas/debug.txt +++ b/world/map/npc/annuals/xmas/debug.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasDebug|, +function|script|XmasDebug { if(debug) goto L_Debug; @@ -171,7 +171,7 @@ L_Close: close; } -030-1.gat,91,48,0|script|XmasDebug#1|105, +030-1.gat,91,48,0|script|XmasDebug#1|105 { callfunc "XmasDebug"; goto L_End; @@ -185,7 +185,7 @@ L_End: end; } -030-2.gat,193,62,0|script|XmasDebug#2|105, +030-2.gat,193,62,0|script|XmasDebug#2|105 { callfunc "XmasDebug"; goto L_End; @@ -199,7 +199,7 @@ L_End: end; } -030-3.gat,26,26,0|script|XmasDebug#3|105, +030-3.gat,26,26,0|script|XmasDebug#3|105 { callfunc "XmasDebug"; goto L_End; @@ -213,7 +213,7 @@ L_End: end; } -030-4.gat,30,30,0|script|XmasDebug#4|111, +030-4.gat,30,30,0|script|XmasDebug#4|111 { callfunc "XmasDebug"; goto L_End; @@ -227,7 +227,7 @@ L_End: end; } -020-1.gat,86,76,0|script|XmasDebug#5|105, +020-1.gat,86,76,0|script|XmasDebug#5|105 { callfunc "XmasDebug"; goto L_End; diff --git a/world/map/npc/annuals/xmas/helpers.txt b/world/map/npc/annuals/xmas/helpers.txt index eeb8c50c..0d566de7 100644 --- a/world/map/npc/annuals/xmas/helpers.txt +++ b/world/map/npc/annuals/xmas/helpers.txt @@ -3,7 +3,7 @@ // please see #XmasConfig // TODO: Make Helpers static functions -function|script|XmasHelperPoints|, +function|script|XmasHelperPoints { set @xmas_helper_count, 0; set @xmas_helper_loop, 0; diff --git a/world/map/npc/annuals/xmas/list.txt b/world/map/npc/annuals/xmas/list.txt index 94dc4b23..1805e6a8 100644 --- a/world/map/npc/annuals/xmas/list.txt +++ b/world/map/npc/annuals/xmas/list.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasCheckList|, +function|script|XmasCheckList { set @xmas_list_count, 0; set @xmas_list_loop, 0; @@ -47,7 +47,7 @@ L_Return: return; } -function|script|XmasList|, +function|script|XmasList { callfunc "XmasStates"; @@ -79,7 +79,7 @@ L_Return: return; } -function|script|XmasListList|, +function|script|XmasListList { set @xmas_list_loop, 0; set @xmas_child_loop, 0; diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt index 71393290..59f48cb7 100644 --- a/world/map/npc/annuals/xmas/mobmanager.txt +++ b/world/map/npc/annuals/xmas/mobmanager.txt @@ -1,6 +1,6 @@ // Spawns mobs -019-1.gat,0,0,0|script|XmasSpawnManager|400, +019-1.gat,0,0,0|script|XmasSpawnManager|400 { end; @@ -54,7 +54,7 @@ L_End: end; } -019-1.gat,0,0,0|script|XmasSpawnCounter#0|400, +019-1.gat,0,0,0|script|XmasSpawnCounter#0|400 { end; @@ -63,7 +63,7 @@ OnTally: end; } -019-3.gat,0,0,0|script|XmasSpawnCounter#1|400, +019-3.gat,0,0,0|script|XmasSpawnCounter#1|400 { end; @@ -72,7 +72,7 @@ OnTally: end; } -030-1.gat,0,0,0|script|XmasSpawnCounter#2|400, +030-1.gat,0,0,0|script|XmasSpawnCounter#2|400 { end; @@ -81,7 +81,7 @@ OnTally: end; } -030-3.gat,0,0,0|script|XmasSpawnCounter#3|400, +030-3.gat,0,0,0|script|XmasSpawnCounter#3|400 { end; diff --git a/world/map/npc/annuals/xmas/reagents.txt b/world/map/npc/annuals/xmas/reagents.txt index 0b4eaa8b..4adcaf12 100644 --- a/world/map/npc/annuals/xmas/reagents.txt +++ b/world/map/npc/annuals/xmas/reagents.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|CheckReagents|, +function|script|CheckReagents { set @xmas_reagent_loop, 0; if((@xmas_reagent_done_state) || !(@xmas_reagent_start_state)) @@ -42,7 +42,7 @@ L_Return: return; } -function|script|DeleteReagents|, +function|script|DeleteReagents { set @xmas_reagent_loop, 0; if(@xmas_side) @@ -73,7 +73,7 @@ L_Return: return; } -function|script|ListReagents|, +function|script|ListReagents { set @xmas_reagent_loop, 0; mes "\"I'm going to need \""; @@ -109,7 +109,7 @@ L_AllReagents: return; } -function|script|BadPowderMake|, +function|script|BadPowderMake { if(countitem("PileOfAsh") < ($@xmas_red_amount + $@xmas_yellow_amount)) goto L_NotEnough; diff --git a/world/map/npc/annuals/xmas/states.txt b/world/map/npc/annuals/xmas/states.txt index 8d81864f..49f51000 100644 --- a/world/map/npc/annuals/xmas/states.txt +++ b/world/map/npc/annuals/xmas/states.txt @@ -2,7 +2,7 @@ // author: Jenalya, Chayenne, cinderweb, wushin // please see #XmasConfig -function|script|XmasStates|, +function|script|XmasStates { // Check for Old Quest Line Keys. Reset Quest if so. callfunc "XmasCheckOld"; |