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/items/magic_gm_top_hat.txt | 3 ++- world/map/npc/items/purification_potion.txt | 3 ++- world/map/npc/items/require_stat.txt | 3 ++- world/map/npc/items/restricted_item.txt | 3 ++- world/map/npc/items/scissors.txt | 3 ++- world/map/npc/items/shock_sweet.txt | 3 ++- world/map/npc/items/unreleased_item.txt | 3 ++- world/map/npc/items/warpTowels.txt | 30 +++++++++++++++++++---------- 8 files changed, 34 insertions(+), 17 deletions(-) (limited to 'world/map/npc/items') diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt index cd9a0302..181df1a2 100644 --- a/world/map/npc/items/magic_gm_top_hat.txt +++ b/world/map/npc/items/magic_gm_top_hat.txt @@ -1,4 +1,5 @@ -function|script|ActivateMagicGMTophat|{ +function|script|ActivateMagicGMTophat| +{ if (getgmlevel() < 60) return; getinventorylist; if ((checkweight("MurdererCrown", 1) == 0) || (@inventorylist_count == 100)) diff --git a/world/map/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt index 59c55eb1..46dd46fd 100644 --- a/world/map/npc/items/purification_potion.txt +++ b/world/map/npc/items/purification_potion.txt @@ -1,6 +1,7 @@ // 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 87fd9d72..df05d37c 100644 --- a/world/map/npc/items/require_stat.txt +++ b/world/map/npc/items/require_stat.txt @@ -5,7 +5,8 @@ // @minbStatVal The minimum stat value to accept this item. // ------------------------------------------------------------ -function|script|RequireStat|{ +function|script|RequireStat| +{ if (@bStat$ == "" || @minbStatVal < 0) return; set @bStatVal, 0; if (@bStat$ == "Str") diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt index eddce38d..0367cf5d 100644 --- a/world/map/npc/items/restricted_item.txt +++ b/world/map/npc/items/restricted_item.txt @@ -6,7 +6,8 @@ // @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. message strcharinfo(0), "This item repells you with extreme force. It does not seem to be meant for you."; diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt index 7b64ce61..122254fe 100644 --- a/world/map/npc/items/scissors.txt +++ b/world/map/npc/items/scissors.txt @@ -1,4 +1,5 @@ -function|script|useScissors|{ +function|script|useScissors| +{ if (rand(3)) goto L_Change; message strcharinfo(0), "Whoops!"; diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt index a9226c39..a4078e5f 100644 --- a/world/map/npc/items/shock_sweet.txt +++ b/world/map/npc/items/shock_sweet.txt @@ -1,4 +1,5 @@ -function|script|useShockSweet|{ +function|script|useShockSweet| +{ if (rand(5)) goto L_Change; message strcharinfo(0), "Yuck, this tastes like earwax!"; diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt index 64072484..14271e1a 100644 --- a/world/map/npc/items/unreleased_item.txt +++ b/world/map/npc/items/unreleased_item.txt @@ -3,7 +3,8 @@ // @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."; unequipbyid @slotId; diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index 3ef92ee7..cbbb462f 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -1,4 +1,5 @@ -function|script|useWhiteWarpTowel|{ +function|script|useWhiteWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -33,7 +34,8 @@ L_Keep: getitem "WhiteHitchhikersTowel", 1; end; } -function|script|useRedWarpTowel|{ +function|script|useRedWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -68,7 +70,8 @@ L_Keep: getitem "RedHitchhikersTowel", 1; end; } -function|script|useGreenWarpTowel|{ +function|script|useGreenWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -103,7 +106,8 @@ L_Keep: getitem "GreenHitchhikersTowel", 1; end; } -function|script|useBlueWarpTowel|{ +function|script|useBlueWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -138,7 +142,8 @@ L_Keep: getitem "BlueHitchhikersTowel", 1; end; } -function|script|useYellowWarpTowel|{ +function|script|useYellowWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -173,7 +178,8 @@ L_Keep: getitem "YellowHitchhikersTowel", 1; end; } -function|script|usePurpleWarpTowel|{ +function|script|usePurpleWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -208,7 +214,8 @@ L_Keep: getitem "PurpleHitchhikersTowel", 1; end; } -function|script|useOrangeWarpTowel|{ +function|script|useOrangeWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -243,7 +250,8 @@ L_Keep: getitem "OrangeHitchhikersTowel", 1; end; } -function|script|usePinkWarpTowel|{ +function|script|usePinkWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -278,7 +286,8 @@ L_Keep: getitem "PinkHitchhikersTowel", 1; end; } -function|script|useTealWarpTowel|{ +function|script|useTealWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) @@ -313,7 +322,8 @@ L_Keep: getitem "TealHitchhikersTowel", 1; end; } -function|script|useLimeWarpTowel|{ +function|script|useLimeWarpTowel| +{ if (isin("botcheck.gat",25,27,51,47)) goto L_Botcheck; if (isin("052-1.gat",1,1,100,80) || isin("052-2.gat",1,1,150,100)) -- cgit v1.2.3-60-g2f50