summaryrefslogtreecommitdiff
path: root/npc/items
diff options
context:
space:
mode:
Diffstat (limited to 'npc/items')
-rw-r--r--npc/items/unequipcb.txt22
-rw-r--r--npc/items/unreleased_item.txt10
2 files changed, 6 insertions, 26 deletions
diff --git a/npc/items/unequipcb.txt b/npc/items/unequipcb.txt
deleted file mode 100644
index a1c7881d..00000000
--- a/npc/items/unequipcb.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-- script UnequipCB NPC32767,{
- end;
-
-OnUnequip:
- unequipbyid (@unequip_slot - 1);
- @unequip_slot = 0;
- end;
-}
-
-function script UnequipLater {
- // if there are multiple items that want to be removed,
- // only schedule one timer - scripts will be called again
- if (@unequip_slot)
- goto L_Return;
-
- @unequip_slot = (@slotId + 1);
- addtimer 0, "UnequipCB::OnUnequip";
- goto L_Return;
-
-L_Return:
- return;
-}
diff --git a/npc/items/unreleased_item.txt b/npc/items/unreleased_item.txt
index c88df137..de7ac0f0 100644
--- a/npc/items/unreleased_item.txt
+++ b/npc/items/unreleased_item.txt
@@ -1,10 +1,12 @@
-
+// Unreleased items
function script UnreleasedItem {
// If the server allows equipping unreleased items or if the active character is staff, do nothing.
- if (debug || getgmlevel())
- goto L_Return;
+ // If you can equip *anything*, this restriction is moot
+ if (debug || has_permission(PERM_USE_ALL_EQUIPMENT, getcharid(3)))
+ return;
+ .@me=getarg(0);
message strcharinfo(0), "You have difficulties equipping this item, as if it is not yet fully in this world.";
- callfunc "UnequipLater";
+ unequip(.@me);
goto L_Return;
L_Return: