diff options
Diffstat (limited to 'world/map/npc/items')
-rw-r--r-- | world/map/npc/items/magic_gm_top_hat.txt | 5 | ||||
-rw-r--r-- | world/map/npc/items/require_stat.txt | 7 | ||||
-rw-r--r-- | world/map/npc/items/restricted_item.txt | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/world/map/npc/items/magic_gm_top_hat.txt b/world/map/npc/items/magic_gm_top_hat.txt index bd35846e..35b5fbd7 100644 --- a/world/map/npc/items/magic_gm_top_hat.txt +++ b/world/map/npc/items/magic_gm_top_hat.txt @@ -1,6 +1,6 @@ function|script|ActivateMagicGMTophat|, { - if (getgmlevel() < 60) return; + if (getgmlevel() < 60) goto L_Return; getinventorylist; if ((checkweight("MurdererCrown", 1) == 0) || (@inventorylist_count == 100)) goto L_Inventory; @@ -15,4 +15,7 @@ function|script|ActivateMagicGMTophat|, L_Inventory: message strcharinfo(0), "You cannot create this item. You're too heavy or you don't have a free slot."; return; + +L_Return: + return; } diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt index 699cb8f9..01ca1600 100644 --- a/world/map/npc/items/require_stat.txt +++ b/world/map/npc/items/require_stat.txt @@ -7,7 +7,7 @@ function|script|RequireStat|, { - if (@bStat$ == "" || @minbStatVal < 0) return; + if (@bStat$ == "" || @minbStatVal < 0) goto L_Return; set @bStatVal, 0; if (@bStat$ == "Str") set @bStatVal, readparam(bStr); @@ -21,8 +21,11 @@ function|script|RequireStat|, set @bStatVal, readparam(bInt); if (@bStat$ == "Luk") set @bStatVal, readparam(bLuk); - if (@bStatVal >= @minbStatVal) return; + if (@bStatVal >= @minbStatVal) goto L_Return; // If the requirement isn't met, then we end the script. // Hence, subsequent item modifiers won't be applied. end; + +L_Return: + return; } diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt index 423b2c63..2aa69c7e 100644 --- a/world/map/npc/items/restricted_item.txt +++ b/world/map/npc/items/restricted_item.txt @@ -9,11 +9,14 @@ function|script|RestrictedItem|, { if (!@minLvl) set @minLvl, 60; - if (debug || getgmlevel() >= @minLvl) return; // If the active character is staff, do nothing. + if (debug || getgmlevel() >= @minLvl) goto L_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."; unequipbyid @slotId; - if (getgmlevel()) return; + if (getgmlevel()) goto L_Return; gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'."; gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'."; end; + +L_Return: + return; } |