Remove unequipcb (deprecated)

4 files changed, 24 insertions, 45 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index f19b4fd9..dc5d6753 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -260,7 +260,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSPEAR"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -281,7 +281,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSPEAR"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -302,7 +302,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HAXE"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -323,7 +323,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HAXE"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -398,7 +398,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSWORD"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -419,7 +419,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSWORD"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 		bonus bDoubleAddRate, 40;
 		bonus bHit,  -25;
 		bonus bCritical,  -25;
@@ -443,7 +443,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSPEAR"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -464,7 +464,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_BOW"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 	AllowAmmo: {
 		Id529: 1
@@ -522,7 +522,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_HUUMA"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -585,7 +585,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_STAFF"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -606,7 +606,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_STAFF"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -627,7 +627,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_STAFF"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -648,7 +648,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_STAFF"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -669,7 +669,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSWORD"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 		bonus bDoubleAddRate, 30;
 	">
 },
@@ -691,7 +691,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSWORD"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -712,7 +712,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSWORD"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -733,7 +733,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSWORD"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
@@ -754,7 +754,7 @@ item_db: (
 	ViewSprite: 1
 	Subtype: "W_1HSPEAR"
 	Script: <"
-		callfunc "UnreleasedItem";
+		callfunc "UnreleasedItem", EQI_HAND_R;
 	">
 },
 {
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:
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 52ac9b26..938eaea7 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -61,7 +61,6 @@
 "npc/items/unreleased_item.txt",
 "npc/items/require_stat.txt",
 "npc/items/warpTowels.txt",
-"npc/items/unequipcb.txt",
 "npc/items/check_wand.txt",
 "npc/items/mirror.txt",
 "npc/items/rubber_bat.txt",