From 89e2ac5687d698f0843ac46612ee33b6692bbc93 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 5 Jul 2013 12:25:49 -0700 Subject: Move starting brace to new line --- world/map/npc/functions/dailyquest.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'world/map/npc/functions/dailyquest.txt') diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index 69270c79..9bc84c5b 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -27,7 +27,8 @@ // (DailyQuestBonus makes a good reward from non-daily quests) -function|script|DailyQuestPoints|{ +function|script|DailyQuestPoints| +{ set @dq_earliest, gettimetick(2) - 86400; if (DailyQuestTime < @dq_earliest) set DailyQuestTime, @dq_earliest; @@ -54,8 +55,8 @@ L_Bonus: return; } -function|script|DailyQuest|{ - +function|script|DailyQuest| +{ callfunc "DailyQuestPoints"; if (BaseLevel < @dq_level) -- cgit v1.2.3-70-g09d2 From 9f883e9770523d3ff2b2f79129cffb523419c6b6 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 5 Jul 2013 16:05:43 -0700 Subject: Make fourth word of functions non-empty, to appease the current server --- world/map/npc/001-1/elanore.txt | 2 +- world/map/npc/001-2/omar.txt | 2 +- world/map/npc/005-1/spirit.txt | 2 +- world/map/npc/005-1/tree.txt | 4 ++-- world/map/npc/007-1/witch.txt | 2 +- world/map/npc/008-1/annualeaster.txt | 2 +- world/map/npc/009-4/barriers.txt | 4 ++-- world/map/npc/009-4/torches.txt | 18 +++++++++--------- world/map/npc/011-1/oscar.txt | 2 +- world/map/npc/012-1/injured-mouboo.txt | 2 +- world/map/npc/013-1/sagatha.txt | 6 +++--- world/map/npc/022-1/tutorial.txt | 2 +- world/map/npc/027-1/graves.txt | 2 +- world/map/npc/048-2/bluesageConfig.txt | 6 +++--- world/map/npc/052-1/channelling.txt | 2 +- world/map/npc/functions/banker.txt | 2 +- world/map/npc/functions/barber.txt | 4 ++-- world/map/npc/functions/clear_vars.txt | 4 ++-- world/map/npc/functions/dailyquest.txt | 4 ++-- world/map/npc/functions/debug.txt | 2 +- world/map/npc/functions/evil_obelisk.txt | 2 +- world/map/npc/functions/ferry.txt | 2 +- world/map/npc/functions/game_rules.txt | 2 +- world/map/npc/functions/inn.txt | 2 +- world/map/npc/functions/lockpicking.txt | 2 +- world/map/npc/functions/magic.txt | 8 ++++---- world/map/npc/functions/mob_points.txt | 2 +- world/map/npc/functions/process_equip.txt | 2 +- world/map/npc/functions/slot_machine.txt | 2 +- world/map/npc/functions/soul_menhir.txt | 2 +- world/map/npc/functions/strangerquiz.txt | 2 +- world/map/npc/functions/time.txt | 2 +- world/map/npc/functions/water_bottle.txt | 2 +- world/map/npc/items/magic_gm_top_hat.txt | 2 +- world/map/npc/items/purification_potion.txt | 2 +- world/map/npc/items/require_stat.txt | 2 +- world/map/npc/items/restricted_item.txt | 2 +- world/map/npc/items/scissors.txt | 2 +- world/map/npc/items/shock_sweet.txt | 2 +- world/map/npc/items/unreleased_item.txt | 2 +- world/map/npc/items/warpTowels.txt | 20 ++++++++++---------- 41 files changed, 70 insertions(+), 70 deletions(-) (limited to 'world/map/npc/functions/dailyquest.txt') diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt index 99e8ac39..34b30766 100644 --- a/world/map/npc/001-1/elanore.txt +++ b/world/map/npc/001-1/elanore.txt @@ -1,6 +1,6 @@ // -function|script|ElanoreFix| +function|script|ElanoreFix|, { set @Q_MASK, NIBBLE_1_MASK; set @Q_SHIFT, NIBBLE_1_SHIFT; diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt index db1b3fa1..65f3e2d1 100644 --- a/world/map/npc/001-2/omar.txt +++ b/world/map/npc/001-2/omar.txt @@ -1,5 +1,5 @@ // -function|script|KadiyaSubquestConsts| +function|script|KadiyaSubquestConsts|, { set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; diff --git a/world/map/npc/005-1/spirit.txt b/world/map/npc/005-1/spirit.txt index 73123842..fa4e61a8 100644 --- a/world/map/npc/005-1/spirit.txt +++ b/world/map/npc/005-1/spirit.txt @@ -1,4 +1,4 @@ -function|script|EarthImpTouch| +function|script|EarthImpTouch|, { if (getskilllv(SKILL_MAGIC)) goto L_message; diff --git a/world/map/npc/005-1/tree.txt b/world/map/npc/005-1/tree.txt index ed45d9a3..2b63f8cb 100644 --- a/world/map/npc/005-1/tree.txt +++ b/world/map/npc/005-1/tree.txt @@ -1,4 +1,4 @@ -function|script|QuestTreeTrigger| +function|script|QuestTreeTrigger|, { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; @@ -46,7 +46,7 @@ S_update_var: return; } -function|script|QuestTreeTouch| +function|script|QuestTreeTouch|, { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt index 2af66c9f..4fddbc8e 100644 --- a/world/map/npc/007-1/witch.txt +++ b/world/map/npc/007-1/witch.txt @@ -872,7 +872,7 @@ L_Start: } -function|script|UpdateIlliaProgress| +function|script|UpdateIlliaProgress|, { if ($@illia_progress == 1) goto L_Torch1; diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index f656f46b..1ab74af3 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -9,7 +9,7 @@ // the event in these days. -function|script|AnnualEasterEvent| +function|script|AnnualEasterEvent|, { if ((gettimetick(2)-TUT_var < 5*7*86400) || (BaseLevel < 40)) //player must be created at least 5 weeks ago goto L_EndTooYoung; diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt index eedf2416..939f4ae2 100644 --- a/world/map/npc/009-4/barriers.txt +++ b/world/map/npc/009-4/barriers.txt @@ -1,5 +1,5 @@ //# see detailed description at orum.txt -function|script|GetBarrierColor| +function|script|GetBarrierColor|, { if (@Barrier < 0 || @Barrier > 2) goto L_Error; @@ -13,7 +13,7 @@ L_Error: close; } -function|script|SetBarrierColor| +function|script|SetBarrierColor|, { if (@Barrier < 0 || @Barrier > 2) goto L_Error; diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt index 8675826b..03acc6b0 100644 --- a/world/map/npc/009-4/torches.txt +++ b/world/map/npc/009-4/torches.txt @@ -1,6 +1,6 @@ //# see detailed description at orum.txt //# see detailed description at orum.txt -function|script|GetTorchColor| +function|script|GetTorchColor|, { if (@Torch < 0 || @Torch > 2) goto L_Error; @@ -14,7 +14,7 @@ L_Error: close; } -function|script|SetTorchColor| +function|script|SetTorchColor|, { if (@Torch < 0 || @Torch > 2) goto L_Error; if (@TorchColor < 1 || @TorchColor > 12) goto L_Error2; @@ -32,7 +32,7 @@ L_Error2: close; } -function|script|GetTorchIntensity| +function|script|GetTorchIntensity|, { if (@Torch < 0 || @Torch > 2) goto L_Error; @@ -46,7 +46,7 @@ L_Error: close; } -function|script|SetTorchIntensity| +function|script|SetTorchIntensity|, { if (@Torch < 0 || @Torch > 2) goto L_Error; if (@TorchIntensity < 0 || @TorchIntensity > 2) goto L_Error2; @@ -64,7 +64,7 @@ L_Error2: close; } -function|script|DoneWithTorches| +function|script|DoneWithTorches|, { if (OrumQuest < 11 && OrumQuest >= 8) return; @@ -85,21 +85,21 @@ L_Different: } // To make sure in range of torches -function|script|InRangeTorch1| +function|script|InRangeTorch1|, { if (isin("009-4.gat",67,20,69,25)) return; mes "You're too far away to do anything with that torch."; close; } -function|script|InRangeTorch2| +function|script|InRangeTorch2|, { if (isin("009-4.gat",65,41,69,46)) return; mes "You're too far away to do anything with that torch."; close; } -function|script|InRangeTorch3| +function|script|InRangeTorch3|, { if (isin("009-4.gat",33,84,37,88)) return; @@ -107,7 +107,7 @@ function|script|InRangeTorch3| close; } -function|script|TorchLoop| +function|script|TorchLoop|, { // Variables used here: // @Torch - pass before calling diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt index e10cd906..66f817c1 100644 --- a/world/map/npc/011-1/oscar.txt +++ b/world/map/npc/011-1/oscar.txt @@ -28,7 +28,7 @@ // 6: the player saved the farmer from the pumpkin invasion (all pumpkins / mobs killed) // 10: the player failed to save the farmer from the pumpkin invasion (player left the map, died -- logging off is allowed however) -function|script|HalloweenQuestWaterPumpkins| +function|script|HalloweenQuestWaterPumpkins|, { if (Quest_Halloween != 5 || $@HalloweenQuest_PumpkinHunter$ != "") end; diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt index 3a6f0e30..91042c13 100644 --- a/world/map/npc/012-1/injured-mouboo.txt +++ b/world/map/npc/012-1/injured-mouboo.txt @@ -1,6 +1,6 @@ // The following auxiliary function is used both by appropriate magic and within the regular script: -function|script|QuestMoubooHeal| +function|script|QuestMoubooHeal|, { set @Q_MASK, NIBBLE_2_MASK; set @Q_SHIFT, NIBBLE_2_SHIFT; diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt index e7d6a1a0..a25db145 100644 --- a/world/map/npc/013-1/sagatha.txt +++ b/world/map/npc/013-1/sagatha.txt @@ -1,7 +1,7 @@ // Sagatha the witch, expert for nature and astral magic //---------------------------------------- -function|script|QuestSagathaHappy| +function|script|QuestSagathaHappy|, { set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if (@unhappiness < @value) @@ -19,7 +19,7 @@ L_write: } //---------------------------------------- -function|script|QuestSagathaAnnoy| +function|script|QuestSagathaAnnoy|, { set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if ((@unhappiness + @value) > 15) @@ -37,7 +37,7 @@ L_write: } //---------------------------------------- -function|script|SagathaStatus| +function|script|SagathaStatus|, { if (getequipid(equip_head) != 1216 && getequipid(equip_head) != 752) goto L_next; diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt index 0d9056f6..1ecbb1a8 100644 --- a/world/map/npc/022-1/tutorial.txt +++ b/world/map/npc/022-1/tutorial.txt @@ -9,7 +9,7 @@ end; } -function|script|TutorialCompleted| +function|script|TutorialCompleted|, { set hasan, 0; set kaan, 0; diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt index 30a3ad06..b33ad67e 100644 --- a/world/map/npc/027-1/graves.txt +++ b/world/map/npc/027-1/graves.txt @@ -1,6 +1,6 @@ // Easter egg graves -function|script|GraveTooFar| +function|script|GraveTooFar|, { if (isin("027-1.gat",89,54,122,76)) return; diff --git a/world/map/npc/048-2/bluesageConfig.txt b/world/map/npc/048-2/bluesageConfig.txt index e0112abc..cb237441 100644 --- a/world/map/npc/048-2/bluesageConfig.txt +++ b/world/map/npc/048-2/bluesageConfig.txt @@ -94,19 +94,19 @@ OnInit: set $@BlueSageSlime6_Amount, 1; } -function|script|updateBlueSageBookPages| +function|script|updateBlueSageBookPages|, { set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageBookPages_MASK) | (@bookpages << $@Q_BlueSageBookPages_SHIFT)); return; } -function|script|updateBlueSageInvestigate| +function|script|updateBlueSageInvestigate|, { set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageInvestigate_MASK) | (@investigate << $@Q_BlueSageInvestigate_SHIFT)); return; } -function|script|blueSageNumberOfClearedNests| +function|script|blueSageNumberOfClearedNests|, { set @slimenests, 0; if (QUEST_BlueSage & $@Q_BlueSageSlime0) diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt index 52d71e45..3575dcbe 100644 --- a/world/map/npc/052-1/channelling.txt +++ b/world/map/npc/052-1/channelling.txt @@ -92,7 +92,7 @@ L_SuggestChannelling: } -function|script|StartChannelling| +function|script|StartChannelling|, { if (isat("052-1.gat",53,38) == 0) end; diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt index 09cfdef6..8ecb85fb 100644 --- a/world/map/npc/functions/banker.txt +++ b/world/map/npc/functions/banker.txt @@ -1,6 +1,6 @@ // -function|script|Banker| +function|script|Banker|, { if (BankAccount == 0) goto L_Start; diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt index 4ad5ee1f..dc7f0329 100644 --- a/world/map/npc/functions/barber.txt +++ b/world/map/npc/functions/barber.txt @@ -9,7 +9,7 @@ // or using GM commands, but scripts (such as this one) can set // any value 0-255 -function|script|Barber| +function|script|Barber|, { set @style, getlook(LOOK_HAIR_STYLE); set @color, getlook(LOOK_HAIR_COLOR); @@ -114,7 +114,7 @@ L_Done: // Since this is a function, not an NPC, OnInit doesn't work // So call this from a real NPC's OnInit (001-1/barber.txt) -function|script|OnInitBarber| +function|script|OnInitBarber|, { setarray $@HairStyles$, "Bald", "Flat ponytail", "Bowl cut", "Combed back", "Emo", "Mohawk", diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt index db94680f..1aa84d2b 100644 --- a/world/map/npc/functions/clear_vars.txt +++ b/world/map/npc/functions/clear_vars.txt @@ -1,6 +1,6 @@ // Clears old variables -function|script|ClearVariables| +function|script|ClearVariables|, { set EasterQuest, 0; @@ -185,7 +185,7 @@ L_Fix_Full: // The variable TMW_Quest was used to save the progress in several subquests linearly. // The subquests are moved to different nibbles of other variables // to make it possible to do some of the quests in parallel. -function|script|ClearVarTMW_Quest| +function|script|ClearVarTMW_Quest|, { if (TMW_Quest == 0) goto L_Done; if (TMW_Quest <= 6) goto L_Bernard_Mikhail; diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index 9bc84c5b..9b9d626e 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -27,7 +27,7 @@ // (DailyQuestBonus makes a good reward from non-daily quests) -function|script|DailyQuestPoints| +function|script|DailyQuestPoints|, { set @dq_earliest, gettimetick(2) - 86400; if (DailyQuestTime < @dq_earliest) @@ -55,7 +55,7 @@ L_Bonus: return; } -function|script|DailyQuest| +function|script|DailyQuest|, { callfunc "DailyQuestPoints"; diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt index 9f9559ea..5bf82356 100755 --- a/world/map/npc/functions/debug.txt +++ b/world/map/npc/functions/debug.txt @@ -1,6 +1,6 @@ // Authors: alastrim, Jenalya, Ali-G -function|script|Debug| +function|script|Debug|, { L_Begin: set @debug_mask, 65535; diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt index e3e40f79..0875abb5 100644 --- a/world/map/npc/functions/evil_obelisk.txt +++ b/world/map/npc/functions/evil_obelisk.txt @@ -1,4 +1,4 @@ -function|script|EvilObelisk| +function|script|EvilObelisk|, { mes "[Evil Obelisk]"; mes "(A mystical aura surrounds this stone. It seems to crave money.)"; diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt index a28f0511..0b66f68e 100644 --- a/world/map/npc/functions/ferry.txt +++ b/world/map/npc/functions/ferry.txt @@ -1,6 +1,6 @@ // The ferry system -function|script|Ferry| +function|script|Ferry|, { if (BaseLevel < 20) goto L_LowerCost; diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt index f735bf4a..caf13cb1 100644 --- a/world/map/npc/functions/game_rules.txt +++ b/world/map/npc/functions/game_rules.txt @@ -1,6 +1,6 @@ // -function|script|GameRules| +function|script|GameRules|, { set @read, 0; menu diff --git a/world/map/npc/functions/inn.txt b/world/map/npc/functions/inn.txt index aad9e6c1..271a4652 100644 --- a/world/map/npc/functions/inn.txt +++ b/world/map/npc/functions/inn.txt @@ -1,6 +1,6 @@ // INN -function|script|Inn| +function|script|Inn|, { mes "[" + @npcname$ + "]"; mes "\"Would you like to rest? It's only " + @cost + " gp.\""; diff --git a/world/map/npc/functions/lockpicking.txt b/world/map/npc/functions/lockpicking.txt index 638e3914..dc05fc53 100644 --- a/world/map/npc/functions/lockpicking.txt +++ b/world/map/npc/functions/lockpicking.txt @@ -4,7 +4,7 @@ // The player has to find the good number of times to hit a pin //----------------------------------------------------------------------------- -function|script|LockPicking| +function|script|LockPicking|, { set @lock_picking_success, 0; setarray @pins, rand(1,3), rand(1,3), rand(1,3); diff --git a/world/map/npc/functions/magic.txt b/world/map/npc/functions/magic.txt index 9fcb5226..a1faea94 100644 --- a/world/map/npc/functions/magic.txt +++ b/world/map/npc/functions/magic.txt @@ -10,7 +10,7 @@ // ------------------------------------------------------------ // Gain initial magic skill // ------------------------------------------------------------ -function|script|MagicGainBasic| +function|script|MagicGainBasic|, { set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DRANK_POTION; close; @@ -20,7 +20,7 @@ function|script|MagicGainBasic| // ------------------------------------------------------------ // Initialise Menu for selecting a choice of things to ask about // ------------------------------------------------------------ -function|script|MagicTalkOptionsSetup| +function|script|MagicTalkOptionsSetup|, { set @QQ_ELANORE, 1; set @QQ_MANASEED, 2; @@ -41,7 +41,7 @@ function|script|MagicTalkOptionsSetup| // ------------------------------------------------------------ -function|script|MagicTalkMenu| +function|script|MagicTalkMenu|, { setarray @choice$, "", "", "", "", "", "", "", "", "", ""; set @choices_nr, 0; @@ -161,7 +161,7 @@ L_Q_post_astralsoul: // @SUP_name$ name of the skill to level up // @SUP_xp # of experience points to award if the level up succeeds // ------------------------------------------------------------ -function|script|SkillUp| +function|script|SkillUp|, { if (getskilllv(@SUP_id) >= @SUP_lvl) goto L_shortcut; diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt index aae10658..c5c7b7bd 100644 --- a/world/map/npc/functions/mob_points.txt +++ b/world/map/npc/functions/mob_points.txt @@ -1,6 +1,6 @@ // Mob points -function|script|MobPoints| +function|script|MobPoints|, { if (@mobID < 1002) return; diff --git a/world/map/npc/functions/process_equip.txt b/world/map/npc/functions/process_equip.txt index 4b8e1ccd..1e93320a 100644 --- a/world/map/npc/functions/process_equip.txt +++ b/world/map/npc/functions/process_equip.txt @@ -1,6 +1,6 @@ // -function|script|ProcessEquip| +function|script|ProcessEquip|, { set @head, getequipid(equip_head); set @torso, getequipid(equip_torso); diff --git a/world/map/npc/functions/slot_machine.txt b/world/map/npc/functions/slot_machine.txt index 4081adca..5d7e1ee6 100644 --- a/world/map/npc/functions/slot_machine.txt +++ b/world/map/npc/functions/slot_machine.txt @@ -1,6 +1,6 @@ // -function|script|SlotMachine| +function|script|SlotMachine|, { mes "Pull the lever..."; next; diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt index 315c89d4..02907210 100644 --- a/world/map/npc/functions/soul_menhir.txt +++ b/world/map/npc/functions/soul_menhir.txt @@ -1,4 +1,4 @@ -function|script|SoulMenhir| +function|script|SoulMenhir|, { mes "[Soul Menhir]"; mes "(A mystical aura surrounds this stone. You feel mysteriously attracted to it. Something tells you to touch it. What do you do?)"; diff --git a/world/map/npc/functions/strangerquiz.txt b/world/map/npc/functions/strangerquiz.txt index 6290dbab..211e7e4b 100644 --- a/world/map/npc/functions/strangerquiz.txt +++ b/world/map/npc/functions/strangerquiz.txt @@ -1,5 +1,5 @@ -function|script|StrangerQuiz| +function|script|StrangerQuiz|, { // param @quizparam$$ // return in @quizanswer$ diff --git a/world/map/npc/functions/time.txt b/world/map/npc/functions/time.txt index a8236cb4..5f728639 100644 --- a/world/map/npc/functions/time.txt +++ b/world/map/npc/functions/time.txt @@ -6,7 +6,7 @@ // output @ts_date$ "yyyy-mm-dd" // output @ts_time$ "hh:mm:ss" -function|script|time_stamp| +function|script|time_stamp|, { // local variables // if there is reasonable demand, these might be exported diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt index e65009da..f24f2bc5 100644 --- a/world/map/npc/functions/water_bottle.txt +++ b/world/map/npc/functions/water_bottle.txt @@ -1,6 +1,6 @@ // Fills empty bottles with water -function|script|WaterBottle| +function|script|WaterBottle|, { set @COST_PER_BOTTLE, 150; diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt index 181df1a2..bd35846e 100644 --- a/world/map/npc/items/magic_gm_top_hat.txt +++ b/world/map/npc/items/magic_gm_top_hat.txt @@ -1,4 +1,4 @@ -function|script|ActivateMagicGMTophat| +function|script|ActivateMagicGMTophat|, { if (getgmlevel() < 60) return; getinventorylist; diff --git a/world/map/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt index 46dd46fd..2a8c47d3 100644 --- a/world/map/npc/items/purification_potion.txt +++ b/world/map/npc/items/purification_potion.txt @@ -1,6 +1,6 @@ // This is the function to use the PurificationPotion -function|script|usePurificationPotion| +function|script|usePurificationPotion|, { if (isat("011-1.gat", 88,67)) goto L_Wyara_Pond; diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt index df05d37c..e16e6b24 100644 --- a/world/map/npc/items/require_stat.txt +++ b/world/map/npc/items/require_stat.txt @@ -5,7 +5,7 @@ // @minbStatVal The minimum stat value to accept this item. // ------------------------------------------------------------ -function|script|RequireStat| +function|script|RequireStat|, { if (@bStat$ == "" || @minbStatVal < 0) return; set @bStatVal, 0; diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt index 0367cf5d..423b2c63 100644 --- a/world/map/npc/items/restricted_item.txt +++ b/world/map/npc/items/restricted_item.txt @@ -6,7 +6,7 @@ // @minLvl The minimum required GM level to equip this item. When not set or set to 0, it is set to 60 as a default. // ------------------------------------------------------------ -function|script|RestrictedItem| +function|script|RestrictedItem|, { if (!@minLvl) set @minLvl, 60; if (debug || getgmlevel() >= @minLvl) return; // If the active character is staff, do nothing. diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt index 122254fe..71e1f52c 100644 --- a/world/map/npc/items/scissors.txt +++ b/world/map/npc/items/scissors.txt @@ -1,4 +1,4 @@ -function|script|useScissors| +function|script|useScissors|, { if (rand(3)) goto L_Change; diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt index a4078e5f..9bcfc875 100644 --- a/world/map/npc/items/shock_sweet.txt +++ b/world/map/npc/items/shock_sweet.txt @@ -1,4 +1,4 @@ -function|script|useShockSweet| +function|script|useShockSweet|, { if (rand(5)) goto L_Change; diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt index 14271e1a..708cc1e0 100644 --- a/world/map/npc/items/unreleased_item.txt +++ b/world/map/npc/items/unreleased_item.txt @@ -3,7 +3,7 @@ // @slotId The slot in which the item would have been equipped in. This is passed automagically when called in an equip script. // ------------------------------------------------------------ -function|script|UnreleasedItem| +function|script|UnreleasedItem|, { if (debug || getgmlevel()) end; // If the server allows equipping unreleased items or if the active character is staff, do nothing. message strcharinfo(0), "You have difficulties equipping this item, as if it is not yet fully in this world."; diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index cbbb462f..75209523 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -1,4 +1,4 @@ -function|script|useWhiteWarpTowel| +function|script|useWhiteWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -34,7 +34,7 @@ L_Keep: getitem "WhiteHitchhikersTowel", 1; end; } -function|script|useRedWarpTowel| +function|script|useRedWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -70,7 +70,7 @@ L_Keep: getitem "RedHitchhikersTowel", 1; end; } -function|script|useGreenWarpTowel| +function|script|useGreenWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -106,7 +106,7 @@ L_Keep: getitem "GreenHitchhikersTowel", 1; end; } -function|script|useBlueWarpTowel| +function|script|useBlueWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -142,7 +142,7 @@ L_Keep: getitem "BlueHitchhikersTowel", 1; end; } -function|script|useYellowWarpTowel| +function|script|useYellowWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -178,7 +178,7 @@ L_Keep: getitem "YellowHitchhikersTowel", 1; end; } -function|script|usePurpleWarpTowel| +function|script|usePurpleWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -214,7 +214,7 @@ L_Keep: getitem "PurpleHitchhikersTowel", 1; end; } -function|script|useOrangeWarpTowel| +function|script|useOrangeWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -250,7 +250,7 @@ L_Keep: getitem "OrangeHitchhikersTowel", 1; end; } -function|script|usePinkWarpTowel| +function|script|usePinkWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -286,7 +286,7 @@ L_Keep: getitem "PinkHitchhikersTowel", 1; end; } -function|script|useTealWarpTowel| +function|script|useTealWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; @@ -322,7 +322,7 @@ L_Keep: getitem "TealHitchhikersTowel", 1; end; } -function|script|useLimeWarpTowel| +function|script|useLimeWarpTowel|, { if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; -- cgit v1.2.3-70-g09d2