add 'Lift Flags' - allow disabling shield/items while lifting

EmilyV99 · EmilyV99 · commit b084548e61a3 · 2023-05-29T22:10:39.000-04:00
diff --git a/resources/include/std_zh/std_constants.zh b/resources/include/std_zh/std_constants.zh
@@ -3914,4 +3914,11 @@ enum
 	SPLAYER_DARKROOM_OVER //Over dark room darkness
 };
 
+enum //for Hero->LiftFlags[]
+{
+	LIFTFL_DISABLE_SHIELD,
+	LIFTFL_DISABLE_ITEMS,
+	LIFTFL_MAX
+};
+
 
diff --git a/src/base/zdefs.h b/src/base/zdefs.h
@@ -2228,6 +2228,10 @@ struct guydata
 #define FLAG_USE_NEW_MOVEMENT         0x00004000
 #define FLAG_NOT_PUSHABLE             0x00008000
 
+#define LIFTFL_DIS_SHIELD             0x00000001
+#define LIFTFL_DIS_ITEMS              0x00000002
+#define NUM_LIFTFL 2
+
 #define MAX_PC dword(-1)
 class refInfo
 {
diff --git a/src/dialog/itemeditor.cpp b/src/dialog/itemeditor.cpp
@@ -342,6 +342,8 @@ void loadinfo(ItemNameInfo * inf, itemdata const& ref)
 			_SET(actionsnd[1], "Throw Sound", "SFX to play when an object is thrown");
 			_SET(flag[0], "Fake Z Throw", "Throws weapons in the fakez axis instead of the z axis");
 			_SET(flag[1], "Lift In Water", "Allows lifting while swimming");
+			_SET(flag[2], "Disable Shield", "Makes the shield not protect from projectiles, in the same way as when the player is attacking");
+			_SET(flag[3], "Disable Item Use", "Stop the use of items unrelated to lifting while an object is lifted");
 			break;
 		}
 		case itype_magicring:
diff --git a/src/parser/ByteCode.cpp b/src/parser/ByteCode.cpp
@@ -1985,7 +1985,7 @@ string ZScript::VarToString(int32_t ID)
 	case HEROLIFTMAXTIMER: return "HEROLIFTMAXTIMER";
 	case HEROLIFTHEIGHT: return "HEROLIFTHEIGHT";
 	case HEROHAMMERSTATE: return "HEROHAMMERSTATE";
-	case RESRVD_VAR_EMILY19: return "RESRVD_VAR_EMILY19";
+	case HEROLIFTFLAGS: return "HEROLIFTFLAGS";
 	case RESRVD_VAR_EMILY20: return "RESRVD_VAR_EMILY20";
 	case RESRVD_VAR_EMILY21: return "RESRVD_VAR_EMILY21";
 	case RESRVD_VAR_EMILY22: return "RESRVD_VAR_EMILY22";
diff --git a/src/parser/ByteCode.h b/src/parser/ByteCode.h
@@ -1457,7 +1457,7 @@
 #define HEROLIFTMAXTIMER      1373
 #define HEROLIFTHEIGHT      1374
 #define HEROHAMMERSTATE      1375
-#define RESRVD_VAR_EMILY19      1376
+#define HEROLIFTFLAGS      1376
 #define RESRVD_VAR_EMILY20      1377
 #define RESRVD_VAR_EMILY21      1378
 #define RESRVD_VAR_EMILY22      1379
diff --git a/src/parser/symbols/HeroSymbols.cpp b/src/parser/symbols/HeroSymbols.cpp
@@ -179,6 +179,8 @@ static AccessorTable HeroSTable[] =
 	{ "setLiftHeight",              0,          ZTID_VOID,   HEROLIFTHEIGHT,            0,  { ZTID_PLAYER, ZTID_FLOAT },{} },
 	{ "getHammerState",             0,         ZTID_FLOAT,   HEROHAMMERSTATE,           0,  { ZTID_PLAYER },{} },
 	{ "setHammerState",             0,          ZTID_VOID,   HEROHAMMERSTATE,           0,  { ZTID_PLAYER, ZTID_FLOAT },{} },
+	{ "getLiftFlags[]",             0,          ZTID_BOOL,   HEROLIFTFLAGS,             0,  { ZTID_PLAYER, ZTID_FLOAT },{} },
+	{ "setLiftFlags[]",             0,          ZTID_VOID,   HEROLIFTFLAGS,             0,  { ZTID_PLAYER, ZTID_FLOAT, ZTID_BOOL },{} },
 	
 	
 	//Intentionally undocumented
diff --git a/src/zc/ffscript.cpp b/src/zc/ffscript.cpp
@@ -3856,6 +3856,17 @@ int32_t get_register(const int32_t arg)
 			}
 			break;
 		}
+		case HEROLIFTFLAGS:
+		{
+			int32_t indx = ri->d[rINDEX]/10000;
+			if(BC::checkBounds(indx, 0, NUM_LIFTFL-1, "Hero->LiftFlags[]") != SH::_NoError)
+				ret = 0; //false
+			else
+			{
+				ret = (Hero.liftflags & (1<<indx)) ? 10000 : 0;
+			}
+			break;
+		}
 		
 		case HEROISWARPING:
 			ret = Hero.is_warping ? 10000L : 0L;
@@ -13974,6 +13985,19 @@ void set_register(int32_t arg, int32_t value)
 			}
 			break;
 		}
+		case HEROLIFTFLAGS:
+		{
+			int32_t indx = ri->d[rINDEX]/10000;
+			if(BC::checkBounds(indx, 0, NUM_LIFTFL-1, "Hero->LiftFlags[]") == SH::_NoError)
+			{
+				int32_t bit = 1<<indx;
+				if(value)
+					Hero.liftflags |= bit;
+				else
+					Hero.liftflags &= ~bit;
+			}
+			break;
+		}
 		
 		case CLOCKACTIVE:
 		{
@@ -41778,7 +41802,7 @@ script_variable ZASMVars[]=
 	{ "HEROLIFTMAXTIMER", HEROLIFTMAXTIMER, 0, 0 },
 	{ "HEROLIFTHEIGHT", HEROLIFTHEIGHT, 0, 0 },
 	{ "HEROHAMMERSTATE", HEROHAMMERSTATE, 0, 0 },
-	{ "RESRVD_VAR_EMILY19", RESRVD_VAR_EMILY19, 0, 0 },
+	{ "HEROLIFTFLAGS", HEROLIFTFLAGS, 0, 0 },
 	{ "RESRVD_VAR_EMILY20", RESRVD_VAR_EMILY20, 0, 0 },
 	{ "RESRVD_VAR_EMILY21", RESRVD_VAR_EMILY21, 0, 0 },
 	{ "RESRVD_VAR_EMILY22", RESRVD_VAR_EMILY22, 0, 0 },
diff --git a/src/zc/ffscript.h b/src/zc/ffscript.h
@@ -4784,7 +4784,7 @@ enum ASM_DEFINE
 #define HEROLIFTMAXTIMER      0x1493
 #define HEROLIFTHEIGHT      0x1494
 #define HEROHAMMERSTATE      0x1495
-#define RESRVD_VAR_EMILY19      0x1496
+#define HEROLIFTFLAGS      0x1496
 #define RESRVD_VAR_EMILY20      0x1497
 #define RESRVD_VAR_EMILY21      0x1498
 #define RESRVD_VAR_EMILY22      0x1499
diff --git a/src/zc/hero.cpp b/src/zc/hero.cpp
@@ -155,6 +155,7 @@ bool usingActiveShield(int32_t itmid)
 			break;
 		default: return false;
 	}
+	if(Hero.lift_wpn && (Hero.liftflags&LIFTFL_DIS_SHIELD)) return false;
 	if(itmid < 0)
 		itmid = (Hero.active_shield_id < 0
 			? current_item_id(itype_shield,true,true) : Hero.active_shield_id);
@@ -284,6 +285,14 @@ bool HeroClass::isLifting()
 	if(lift_wpn) return true;
 	return false;
 }
+void HeroClass::set_liftflags(int liftid)
+{
+	if(unsigned(liftid) >= MAXITEMS)
+		return;
+	itemdata const& itm = itemsbuf[liftid];
+	SETFLAG(liftflags, LIFTFL_DIS_SHIELD, itm.flags & ITEM_FLAG3);
+	SETFLAG(liftflags, LIFTFL_DIS_ITEMS, itm.flags & ITEM_FLAG4);
+}
 
 void HeroClass::set_respawn_point(bool setwarp)
 {
@@ -1455,6 +1464,7 @@ void HeroClass::init()
 	liftclk = 0;
 	tliftclk = 0;
 	liftheight = 0;
+	liftflags = 0;
     if ( dontdraw != 2 ) {  dontdraw = 0; } //scripted dontdraw == 2, normal == 1, draw hero == 0
     hookshot_used=false;
     justmoved = 0;
@@ -5967,16 +5977,18 @@ int32_t HeroClass::EwpnHit()
 			}
 			
 			int32_t itemid = getCurrentShield(false);
-			if(itemid<0 || !(checkbunny(itemid) && checkmagiccost(itemid))) return i;
+			if(itemid<0 || !(checkbunny(itemid) && checkmagiccost(itemid)))
+				return i;
 			itemdata const& shield = itemsbuf[itemid];
+			bool allow_inactive = (shield.flags & ITEM_FLAG9);
 			auto cmpdir = compareDir(ew->dir);
 			bool hitshield = compareShield(cmpdir, shield);
 			
+			if(!allow_inactive && ((lift_wpn && (liftflags & LIFTFL_DIS_SHIELD)) || (action==attacking||action==sideswimattacking) || action==swimming || action == sideswimming || action == sideswimattacking || charging > 0 || spins > 0 || hopclk==0xFF))
+				return i;
 			
-			if(!hitshield || (action==attacking||action==sideswimattacking) || action==swimming || action == sideswimming || action == sideswimattacking || charging > 0 || spins > 0 || hopclk==0xFF)
-			{
+			if(!hitshield)
 				return i;
-			}
 			
 			paymagiccost(itemid);
 			
@@ -6097,7 +6109,8 @@ int32_t HeroClass::LwpnHit()                                    //only here to c
 			
 			if (!(lw->id == wRefFireball || lw->id == wRefMagic || lw->id == wRefBeam || lw->id == wRefRock)) return -1;
 			int32_t itemid = getCurrentShield(false);
-			if(itemid<0 || !(checkbunny(itemid) && checkmagiccost(itemid))) return i;
+			if(itemid<0 || !(checkbunny(itemid) && checkmagiccost(itemid)))
+				return i;
 			itemdata const& shield = itemsbuf[itemid];
 			auto cmpdir = compareDir(lw->dir);
 			bool hitshield = compareShield(cmpdir, shield);
@@ -6152,7 +6165,11 @@ int32_t HeroClass::LwpnHit()                                    //only here to c
 				return -1;
 			}
 			
-			if(!hitshield || (action==attacking||action==sideswimattacking) || action==swimming || action == sideswimming || action == sideswimattacking || hopclk==0xFF)
+			bool allow_inactive = (shield.flags & ITEM_FLAG9);
+			if(!allow_inactive && ((lift_wpn && (liftflags & LIFTFL_DIS_SHIELD)) || (action==attacking||action==sideswimattacking) || action==swimming || action == sideswimming || action == sideswimattacking || charging > 0 || spins > 0 || hopclk==0xFF))
+				return i;
+			
+			if(!hitshield)
 				return i;
 				
 			if(itemid<0 || !(checkbunny(itemid) && checkmagiccost(itemid))) return i;
@@ -10568,6 +10585,7 @@ void HeroClass::do_liftglove(int32_t liftid, bool passive)
 		paidmagic = true;
 		paymagiccost(liftid);
 	}
+	set_liftflags(liftid);
 	if(passive)
 		getIntBtnInput(intbtn, true, true, false, false, false); //eat buttons
 	return;
@@ -10883,7 +10901,25 @@ bool HeroClass::startwpn(int32_t itemid)
 	if(((dir==up && y<24) || (dir==down && y>128) ||
 			(dir==left && x<32) || (dir==right && x>208)) && !(get_bit(quest_rules,qr_ITEMSONEDGES) || inlikelike))
 		return false;
-		
+	
+	bool liftonly = lift_wpn && (liftflags & LIFTFL_DIS_ITEMS);
+	if(liftonly)
+	{
+		dowpn = -1;
+		switch(itm.family)
+		{
+			case itype_bomb:
+			case itype_sbomb:
+				if(itm.flags & ITEM_FLAG4)
+					do_liftglove(-1,false);
+				break;
+			case itype_liftglove:
+				do_liftglove(-1,false);
+				break;
+		}
+		return false;
+	}
+	
 	int32_t wx=x;
 	int32_t wy=y-fakez;
 	int32_t wz=z;
@@ -11242,6 +11278,7 @@ bool HeroClass::startwpn(int32_t itemid)
 				if(liftid > -1 && (!itm.misc4 || itm.misc4 <= glove.fam_type))
 				{
 					lift(wpn,itm.misc5,itm.misc6);
+					set_liftflags(liftid);
 					lifted = true;
 				}
 			}
@@ -11296,6 +11333,7 @@ bool HeroClass::startwpn(int32_t itemid)
 				if(liftid > -1 && (!itm.misc4 || itm.misc4 <= glove.fam_type))
 				{
 					lift(wpn,itm.misc5,itm.misc6);
+					set_liftflags(liftid);
 					lifted = true;
 				}
 			}
@@ -12065,6 +12103,8 @@ bool HeroClass::startwpn(int32_t itemid)
 
 bool HeroClass::doattack()
 {
+	if(lift_wpn && (liftflags & LIFTFL_DIS_ITEMS))
+		return false;
 	//int32_t s = BSZ ? 0 : 11;
 	int32_t s = (zinit.heroAnimationStyle==las_bszelda) ? 0 : 11;
 	
@@ -13782,7 +13822,8 @@ void HeroClass::moveheroOld()
 	if(can_attack() && btnwpn>itype_sword && charging==0 && btnwpn!=itype_rupee) // This depends on item 0 being a rupee...
 	{
 		bool paidmagic = false;
-		if(btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))
+		bool liftonly = lift_wpn && (liftflags & LIFTFL_DIS_ITEMS);
+		if(!liftonly && btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))
 		{
 			attackid=directWpn>-1 ? directWpn : current_item_id(itype_wand);
 			no_jinx = checkitem_jinx(attackid);
@@ -13801,7 +13842,7 @@ void HeroClass::moveheroOld()
 				item_error();
 			}
 		}
-		else if((btnwpn==itype_hammer)&&!((action==attacking||action==sideswimattacking) && attack==wHammer)
+		else if(!liftonly && (btnwpn==itype_hammer)&&!((action==attacking||action==sideswimattacking) && attack==wHammer)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_hammer : false) : current_item(itype_hammer)))
 		{
 			no_jinx = checkitem_jinx(dowpn);
@@ -13819,7 +13860,7 @@ void HeroClass::moveheroOld()
 				attackclk=0;
 			}
 		}
-		else if((btnwpn==itype_candle)&&!((action==attacking||action==sideswimattacking) && attack==wFire)
+		else if(!liftonly && (btnwpn==itype_candle)&&!((action==attacking||action==sideswimattacking) && attack==wFire)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_candle : false) : current_item(itype_candle)))
 		{
 			//checkbunny handled where magic cost is paid
@@ -13832,7 +13873,7 @@ void HeroClass::moveheroOld()
 				attackclk=0;
 			}
 		}
-		else if((btnwpn==itype_cbyrna)&&!((action==attacking||action==sideswimattacking) && attack==wCByrna)
+		else if(!liftonly && (btnwpn==itype_cbyrna)&&!((action==attacking||action==sideswimattacking) && attack==wCByrna)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_cbyrna : false) : current_item(itype_cbyrna)))
 		{
 			attackid=directWpn>-1 ? directWpn : current_item_id(itype_cbyrna);
@@ -13852,7 +13893,7 @@ void HeroClass::moveheroOld()
 				item_error();
 			}
 		}
-		else if((btnwpn==itype_bugnet)&&!((action==attacking||action==sideswimattacking) && attack==wBugNet)
+		else if(!liftonly && (btnwpn==itype_bugnet)&&!((action==attacking||action==sideswimattacking) && attack==wBugNet)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) && itemsbuf[directWpn].family==itype_bugnet) : current_item(itype_bugnet)))
 		{
 			attackid = directWpn>-1 ? directWpn : current_item_id(itype_bugnet);
@@ -17726,7 +17767,8 @@ bool HeroClass::premove()
 	if(can_attack() && btnwpn>itype_sword && charging==0 && btnwpn!=itype_rupee) // This depends on item 0 being a rupee...
 	{
 		bool paidmagic = false;
-		if(btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))
+		bool liftonly = lift_wpn && (liftflags & LIFTFL_DIS_ITEMS);
+		if(!liftonly && btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))
 		{
 			attackid=directWpn>-1 ? directWpn : current_item_id(itype_wand);
 			no_jinx = checkitem_jinx(attackid);
@@ -17745,7 +17787,7 @@ bool HeroClass::premove()
 				item_error();
 			}
 		}
-		else if((btnwpn==itype_hammer)&&!((action==attacking||action==sideswimattacking) && attack==wHammer)
+		else if(!liftonly && (btnwpn==itype_hammer)&&!((action==attacking||action==sideswimattacking) && attack==wHammer)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_hammer : false) : current_item(itype_hammer)))
 		{
 			no_jinx = checkitem_jinx(dowpn);
@@ -17763,7 +17805,7 @@ bool HeroClass::premove()
 				attackclk=0;
 			}
 		}
-		else if((btnwpn==itype_candle)&&!((action==attacking||action==sideswimattacking) && attack==wFire)
+		else if(!liftonly && (btnwpn==itype_candle)&&!((action==attacking||action==sideswimattacking) && attack==wFire)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_candle : false) : current_item(itype_candle)))
 		{
 			//checkbunny handled where magic cost is paid
@@ -17776,7 +17818,7 @@ bool HeroClass::premove()
 				attackclk=0;
 			}
 		}
-		else if((btnwpn==itype_cbyrna)&&!((action==attacking||action==sideswimattacking) && attack==wCByrna)
+		else if(!liftonly && (btnwpn==itype_cbyrna)&&!((action==attacking||action==sideswimattacking) && attack==wCByrna)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_cbyrna : false) : current_item(itype_cbyrna)))
 		{
 			attackid=directWpn>-1 ? directWpn : current_item_id(itype_cbyrna);
@@ -17796,7 +17838,7 @@ bool HeroClass::premove()
 				item_error();
 			}
 		}
-		else if((btnwpn==itype_bugnet)&&!((action==attacking||action==sideswimattacking) && attack==wBugNet)
+		else if(!liftonly && (btnwpn==itype_bugnet)&&!((action==attacking||action==sideswimattacking) && attack==wBugNet)
 				&& (directWpn>-1 ? (!item_disabled(directWpn) && itemsbuf[directWpn].family==itype_bugnet) : current_item(itype_bugnet)))
 		{
 			attackid = directWpn>-1 ? directWpn : current_item_id(itype_bugnet);
diff --git a/src/zc/hero.h b/src/zc/hero.h
@@ -333,10 +333,11 @@ class HeroClass : public sprite
 	byte liftclk;
 	byte tliftclk;
 	zfix liftheight;
-	
+	uint32_t liftflags;
 	
 	// Methods below here.
 	bool isLifting();
+	void set_liftflags(int liftid);
 	void doSwitchHook(byte style);
 	bool isStanding(bool forJump = false);
 	void explode(int32_t type);
diff --git a/src/zq/ffasm.cpp b/src/zq/ffasm.cpp
@@ -2555,7 +2555,7 @@ script_variable variable_list[]=
 	{ "HEROLIFTMAXTIMER", HEROLIFTMAXTIMER, 0, 0 },
 	{ "HEROLIFTHEIGHT", HEROLIFTHEIGHT, 0, 0 },
 	{ "HEROHAMMERSTATE", HEROHAMMERSTATE, 0, 0 },
-	{ "RESRVD_VAR_EMILY19", RESRVD_VAR_EMILY19, 0, 0 },
+	{ "HEROLIFTFLAGS", HEROLIFTFLAGS, 0, 0 },
 	{ "RESRVD_VAR_EMILY20", RESRVD_VAR_EMILY20, 0, 0 },
 	{ "RESRVD_VAR_EMILY21", RESRVD_VAR_EMILY21, 0, 0 },
 	{ "RESRVD_VAR_EMILY22", RESRVD_VAR_EMILY22, 0, 0 },
diff --git a/webdocs/zsdocs_main.json b/webdocs/zsdocs_main.json
@@ -1651,7 +1651,7 @@
                         },
                         {
                             "name": "MoveFlags ;; Hero::MoveFlags",
-                            "val": "<h3>bool MoveFlags[];</h3>\nAccess the following flags:\n<ul><li>HEROMV_OBEYS_GRAVITY - If false, the player ignores gravity.</li>\n<li>HEROMV_CAN_PITFALL - If false, the player floats over pitfalls.</li>\n<li>HEROMV_NO_FAKE_Z - The player's Fake Z axis is disabled if true</li>\n<li>HEROMV_NO_REAL_Z - The player's Z axis is disabled if true</li></ul>"
+                            "val": "<h3>bool MoveFlags[];</h3>\nAccess the following flags:\n<ol start = \"0\"><li>HEROMV_OBEYS_GRAVITY - If false, the player ignores gravity.</li>\n<li>HEROMV_CAN_PITFALL - If false, the player floats over pitfalls.</li>\n<li>HEROMV_NO_FAKE_Z - The player's Fake Z axis is disabled if true</li>\n<li>HEROMV_NO_REAL_Z - The player's Z axis is disabled if true</li></ol>"
                         },
                         {
                             "name": "Respawn Position ;; Hero::RespawnX / Hero::RespawnY / Hero::RespawnDMap / Hero::RespawnScreen",
@@ -1666,8 +1666,8 @@
                             "val": "<h3>int Immortal;</h3>\nIf not 0, the player will not die, even when they have 0 hp. Effects such as bottled fairies will not trigger.\nIf '>0', automatically decrements by 1 each frame.\nIf this value becomes 0 while the player is at 0 hp, the death effect will trigger, including any bottled fairies.\n\n<h3>void Kill(bool bypass_revive);</h3>\nImmediately kills the player, setting their HP to 0, and ignoring 'Immortal'.\nIf 'bypass_revive' is true, revival effects such as bottled fairies will not trigger, and the 'one frame before death' that scripts would use to revive will also be skipped."
                         },
                         {
-                            "name": "Lifting ;; Hero::ReleaseLiftWeapon / Hero::LiftWeapon / Hero::LiftedWeapon / Hero::LiftTimer / Hero::LiftMaxTimer / Hero::LiftHeight",
-                            "val": "<h3>lweapon ReleaseLiftWeapon();</h3>\nReturns a pointer to the held weapon, and causes the player to let go of it.\n\n<h3>void LiftWeapon(lweapon weap, int timer, int height);</h3>\nCauses the player to lift the specified weapon in the same way they lift combos with the Lift Glove.\nIf an lweapon script lifts itself, this also functions as a ${Waitframe|Waitframe()}.\n\n<h3>lweapon LiftedWeapon;</h3>\nThe weapon currently held by the player. Overwriting this directly will delete any weapon previously held.\nIf an lweapon script lifts itself, this also functions as a ${Waitframe|Waitframe()}.\n\n<h3>int LiftTimer;\nint LiftMaxTimer;</h3>\nThe time the current lift operation takes. The LiftMaxTimer is the total time, the LiftTimer starts at the same value but ticks down each frame the lift continues.\n\n<h3>int LiftHeight;</h3>\nThe height that the object will be lifted above the player's head."
+                            "name": "Lifting ;; Hero::ReleaseLiftWeapon / Hero::LiftWeapon / Hero::LiftedWeapon / Hero::LiftTimer / Hero::LiftMaxTimer / Hero::LiftHeight / Hero::LiftFlags[]",
+                            "val": "<h3>lweapon ReleaseLiftWeapon();</h3>\nReturns a pointer to the held weapon, and causes the player to let go of it.\n\n<h3>void LiftWeapon(lweapon weap, int timer, int height);</h3>\nCauses the player to lift the specified weapon in the same way they lift combos with the Lift Glove.\nIf an lweapon script lifts itself, this also functions as a ${Waitframe|Waitframe()}.\n\n<h3>lweapon LiftedWeapon;</h3>\nThe weapon currently held by the player. Overwriting this directly will delete any weapon previously held.\nIf an lweapon script lifts itself, this also functions as a ${Waitframe|Waitframe()}.\n\n<h3>int LiftTimer;\nint LiftMaxTimer;</h3>\nThe time the current lift operation takes. The LiftMaxTimer is the total time, the LiftTimer starts at the same value but ticks down each frame the lift continues.\n\n<h3>int LiftHeight;</h3>\nThe height that the object will be lifted above the player's head.\n\n<h3>bool LiftFlags[LIFTFL_MAX];</h3>\nWhen the engine lifts an object, it will overwrite these flags.\nAccess the following flags:\n<ol start = \"0\"><li>LIFTFL_DISABLE_SHIELD - If true, the shield is disabled when lifting the same way it is when swinging a weapon.</li>\n<li>LIFTFL_DISABLE_ITEMS - If true, the player can't use any items unrelated to lifting. (Items related to lifting, such as bombs with the liftable flag set or a Lift Glove, will throw the held item regardless)</li></ol>"
                         },
                         {
                             "name": "&lt;&lt;-- Start ;; heroptr",

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,8 @@ void loadinfo(ItemNameInfo * inf, itemdata const& ref)`
`342`	`342`	`_SET(actionsnd[1], "Throw Sound", "SFX to play when an object is thrown");`
`343`	`343`	`_SET(flag[0], "Fake Z Throw", "Throws weapons in the fakez axis instead of the z axis");`
`344`	`344`	`_SET(flag[1], "Lift In Water", "Allows lifting while swimming");`
	`345`	`+ _SET(flag[2], "Disable Shield", "Makes the shield not protect from projectiles, in the same way as when the player is attacking");`
	`346`	`+ _SET(flag[3], "Disable Item Use", "Stop the use of items unrelated to lifting while an object is lifted");`
`345`	`347`	`break;`
`346`	`348`	`}`
`347`	`349`	`case itype_magicring:`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ bool usingActiveShield(int32_t itmid)`
`155`	`155`	`break;`
`156`	`156`	`default: return false;`
`157`	`157`	`}`
	`158`	`+ if(Hero.lift_wpn && (Hero.liftflags&LIFTFL_DIS_SHIELD)) return false;`
`158`	`159`	`if(itmid < 0)`
`159`	`160`	`itmid = (Hero.active_shield_id < 0`
`160`	`161`	`? current_item_id(itype_shield,true,true) : Hero.active_shield_id);`
`@@ -284,6 +285,14 @@ bool HeroClass::isLifting()`
`284`	`285`	`if(lift_wpn) return true;`
`285`	`286`	`return false;`
`286`	`287`	`}`
	`288`	`+void HeroClass::set_liftflags(int liftid)`
	`289`	`+{`
	`290`	`+ if(unsigned(liftid) >= MAXITEMS)`
	`291`	`+ return;`
	`292`	`+ itemdata const& itm = itemsbuf[liftid];`
	`293`	`+ SETFLAG(liftflags, LIFTFL_DIS_SHIELD, itm.flags & ITEM_FLAG3);`
	`294`	`+ SETFLAG(liftflags, LIFTFL_DIS_ITEMS, itm.flags & ITEM_FLAG4);`
	`295`	`+}`
`287`	`296`
`288`	`297`	`void HeroClass::set_respawn_point(bool setwarp)`
`289`	`298`	`{`
`@@ -1455,6 +1464,7 @@ void HeroClass::init()`
`1455`	`1464`	`liftclk = 0;`
`1456`	`1465`	`tliftclk = 0;`
`1457`	`1466`	`liftheight = 0;`
	`1467`	`+ liftflags = 0;`
`1458`	`1468`	`if ( dontdraw != 2 ) { dontdraw = 0; } //scripted dontdraw == 2, normal == 1, draw hero == 0`
`1459`	`1469`	`hookshot_used=false;`
`1460`	`1470`	`justmoved = 0;`
`@@ -5967,16 +5977,18 @@ int32_t HeroClass::EwpnHit()`
`5967`	`5977`	`}`
`5968`	`5978`
`5969`	`5979`	`int32_t itemid = getCurrentShield(false);`
`5970`		`- if(itemid<0 \|\| !(checkbunny(itemid) && checkmagiccost(itemid))) return i;`
	`5980`	`+ if(itemid<0 \|\| !(checkbunny(itemid) && checkmagiccost(itemid)))`
	`5981`	`+ return i;`
`5971`	`5982`	`itemdata const& shield = itemsbuf[itemid];`
	`5983`	`+ bool allow_inactive = (shield.flags & ITEM_FLAG9);`
`5972`	`5984`	`auto cmpdir = compareDir(ew->dir);`
`5973`	`5985`	`bool hitshield = compareShield(cmpdir, shield);`
`5974`	`5986`
	`5987`	`+ if(!allow_inactive && ((lift_wpn && (liftflags & LIFTFL_DIS_SHIELD)) \|\| (action==attacking\|\|action==sideswimattacking) \|\| action==swimming \|\| action == sideswimming \|\| action == sideswimattacking \|\| charging > 0 \|\| spins > 0 \|\| hopclk==0xFF))`
	`5988`	`+ return i;`
`5975`	`5989`
`5976`		`- if(!hitshield \|\| (action==attacking\|\|action==sideswimattacking) \|\| action==swimming \|\| action == sideswimming \|\| action == sideswimattacking \|\| charging > 0 \|\| spins > 0 \|\| hopclk==0xFF)`
`5977`		`- {`
	`5990`	`+ if(!hitshield)`
`5978`	`5991`	`return i;`
`5979`		`- }`
`5980`	`5992`
`5981`	`5993`	`paymagiccost(itemid);`
`5982`	`5994`
`@@ -6097,7 +6109,8 @@ int32_t HeroClass::LwpnHit() //only here to c`
`6097`	`6109`
`6098`	`6110`	`if (!(lw->id == wRefFireball \|\| lw->id == wRefMagic \|\| lw->id == wRefBeam \|\| lw->id == wRefRock)) return -1;`
`6099`	`6111`	`int32_t itemid = getCurrentShield(false);`
`6100`		`- if(itemid<0 \|\| !(checkbunny(itemid) && checkmagiccost(itemid))) return i;`
	`6112`	`+ if(itemid<0 \|\| !(checkbunny(itemid) && checkmagiccost(itemid)))`
	`6113`	`+ return i;`
`6101`	`6114`	`itemdata const& shield = itemsbuf[itemid];`
`6102`	`6115`	`auto cmpdir = compareDir(lw->dir);`
`6103`	`6116`	`bool hitshield = compareShield(cmpdir, shield);`
`@@ -6152,7 +6165,11 @@ int32_t HeroClass::LwpnHit() //only here to c`
`6152`	`6165`	`return -1;`
`6153`	`6166`	`}`
`6154`	`6167`
`6155`		`- if(!hitshield \|\| (action==attacking\|\|action==sideswimattacking) \|\| action==swimming \|\| action == sideswimming \|\| action == sideswimattacking \|\| hopclk==0xFF)`
	`6168`	`+ bool allow_inactive = (shield.flags & ITEM_FLAG9);`
	`6169`	`+ if(!allow_inactive && ((lift_wpn && (liftflags & LIFTFL_DIS_SHIELD)) \|\| (action==attacking\|\|action==sideswimattacking) \|\| action==swimming \|\| action == sideswimming \|\| action == sideswimattacking \|\| charging > 0 \|\| spins > 0 \|\| hopclk==0xFF))`
	`6170`	`+ return i;`
	`6171`	`+`
	`6172`	`+ if(!hitshield)`
`6156`	`6173`	`return i;`
`6157`	`6174`
`6158`	`6175`	`if(itemid<0 \|\| !(checkbunny(itemid) && checkmagiccost(itemid))) return i;`
`@@ -10568,6 +10585,7 @@ void HeroClass::do_liftglove(int32_t liftid, bool passive)`
`10568`	`10585`	`paidmagic = true;`
`10569`	`10586`	`paymagiccost(liftid);`
`10570`	`10587`	`}`
	`10588`	`+ set_liftflags(liftid);`
`10571`	`10589`	`if(passive)`
`10572`	`10590`	`getIntBtnInput(intbtn, true, true, false, false, false); //eat buttons`
`10573`	`10591`	`return;`
`@@ -10883,7 +10901,25 @@ bool HeroClass::startwpn(int32_t itemid)`
`10883`	`10901`	`if(((dir==up && y<24) \|\| (dir==down && y>128) \|\|`
`10884`	`10902`	`(dir==left && x<32) \|\| (dir==right && x>208)) && !(get_bit(quest_rules,qr_ITEMSONEDGES) \|\| inlikelike))`
`10885`	`10903`	`return false;`
`10886`		`-`
	`10904`	`+`
	`10905`	`+ bool liftonly = lift_wpn && (liftflags & LIFTFL_DIS_ITEMS);`
	`10906`	`+ if(liftonly)`
	`10907`	`+ {`
	`10908`	`+ dowpn = -1;`
	`10909`	`+ switch(itm.family)`
	`10910`	`+ {`
	`10911`	`+ case itype_bomb:`
	`10912`	`+ case itype_sbomb:`
	`10913`	`+ if(itm.flags & ITEM_FLAG4)`
	`10914`	`+ do_liftglove(-1,false);`
	`10915`	`+ break;`
	`10916`	`+ case itype_liftglove:`
	`10917`	`+ do_liftglove(-1,false);`
	`10918`	`+ break;`
	`10919`	`+ }`
	`10920`	`+ return false;`
	`10921`	`+ }`
	`10922`	`+`
`10887`	`10923`	`int32_t wx=x;`
`10888`	`10924`	`int32_t wy=y-fakez;`
`10889`	`10925`	`int32_t wz=z;`
`@@ -11242,6 +11278,7 @@ bool HeroClass::startwpn(int32_t itemid)`
`11242`	`11278`	`if(liftid > -1 && (!itm.misc4 \|\| itm.misc4 <= glove.fam_type))`
`11243`	`11279`	`{`
`11244`	`11280`	`lift(wpn,itm.misc5,itm.misc6);`
	`11281`	`+ set_liftflags(liftid);`
`11245`	`11282`	`lifted = true;`
`11246`	`11283`	`}`
`11247`	`11284`	`}`
`@@ -11296,6 +11333,7 @@ bool HeroClass::startwpn(int32_t itemid)`
`11296`	`11333`	`if(liftid > -1 && (!itm.misc4 \|\| itm.misc4 <= glove.fam_type))`
`11297`	`11334`	`{`
`11298`	`11335`	`lift(wpn,itm.misc5,itm.misc6);`
	`11336`	`+ set_liftflags(liftid);`
`11299`	`11337`	`lifted = true;`
`11300`	`11338`	`}`
`11301`	`11339`	`}`
`@@ -12065,6 +12103,8 @@ bool HeroClass::startwpn(int32_t itemid)`
`12065`	`12103`
`12066`	`12104`	`bool HeroClass::doattack()`
`12067`	`12105`	`{`
	`12106`	`+ if(lift_wpn && (liftflags & LIFTFL_DIS_ITEMS))`
	`12107`	`+ return false;`
`12068`	`12108`	`//int32_t s = BSZ ? 0 : 11;`
`12069`	`12109`	`int32_t s = (zinit.heroAnimationStyle==las_bszelda) ? 0 : 11;`
`12070`	`12110`
`@@ -13782,7 +13822,8 @@ void HeroClass::moveheroOld()`
`13782`	`13822`	`if(can_attack() && btnwpn>itype_sword && charging==0 && btnwpn!=itype_rupee) // This depends on item 0 being a rupee...`
`13783`	`13823`	`{`
`13784`	`13824`	`bool paidmagic = false;`
`13785`		`- if(btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))`
	`13825`	`+ bool liftonly = lift_wpn && (liftflags & LIFTFL_DIS_ITEMS);`
	`13826`	`+ if(!liftonly && btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))`
`13786`	`13827`	`{`
`13787`	`13828`	`attackid=directWpn>-1 ? directWpn : current_item_id(itype_wand);`
`13788`	`13829`	`no_jinx = checkitem_jinx(attackid);`
`@@ -13801,7 +13842,7 @@ void HeroClass::moveheroOld()`
`13801`	`13842`	`item_error();`
`13802`	`13843`	`}`
`13803`	`13844`	`}`
`13804`		`- else if((btnwpn==itype_hammer)&&!((action==attacking\|\|action==sideswimattacking) && attack==wHammer)`
	`13845`	`+ else if(!liftonly && (btnwpn==itype_hammer)&&!((action==attacking\|\|action==sideswimattacking) && attack==wHammer)`
`13805`	`13846`	`&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_hammer : false) : current_item(itype_hammer)))`
`13806`	`13847`	`{`
`13807`	`13848`	`no_jinx = checkitem_jinx(dowpn);`
`@@ -13819,7 +13860,7 @@ void HeroClass::moveheroOld()`
`13819`	`13860`	`attackclk=0;`
`13820`	`13861`	`}`
`13821`	`13862`	`}`
`13822`		`- else if((btnwpn==itype_candle)&&!((action==attacking\|\|action==sideswimattacking) && attack==wFire)`
	`13863`	`+ else if(!liftonly && (btnwpn==itype_candle)&&!((action==attacking\|\|action==sideswimattacking) && attack==wFire)`
`13823`	`13864`	`&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_candle : false) : current_item(itype_candle)))`
`13824`	`13865`	`{`
`13825`	`13866`	`//checkbunny handled where magic cost is paid`
`@@ -13832,7 +13873,7 @@ void HeroClass::moveheroOld()`
`13832`	`13873`	`attackclk=0;`
`13833`	`13874`	`}`
`13834`	`13875`	`}`
`13835`		`- else if((btnwpn==itype_cbyrna)&&!((action==attacking\|\|action==sideswimattacking) && attack==wCByrna)`
	`13876`	`+ else if(!liftonly && (btnwpn==itype_cbyrna)&&!((action==attacking\|\|action==sideswimattacking) && attack==wCByrna)`
`13836`	`13877`	`&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_cbyrna : false) : current_item(itype_cbyrna)))`
`13837`	`13878`	`{`
`13838`	`13879`	`attackid=directWpn>-1 ? directWpn : current_item_id(itype_cbyrna);`
`@@ -13852,7 +13893,7 @@ void HeroClass::moveheroOld()`
`13852`	`13893`	`item_error();`
`13853`	`13894`	`}`
`13854`	`13895`	`}`
`13855`		`- else if((btnwpn==itype_bugnet)&&!((action==attacking\|\|action==sideswimattacking) && attack==wBugNet)`
	`13896`	`+ else if(!liftonly && (btnwpn==itype_bugnet)&&!((action==attacking\|\|action==sideswimattacking) && attack==wBugNet)`
`13856`	`13897`	`&& (directWpn>-1 ? (!item_disabled(directWpn) && itemsbuf[directWpn].family==itype_bugnet) : current_item(itype_bugnet)))`
`13857`	`13898`	`{`
`13858`	`13899`	`attackid = directWpn>-1 ? directWpn : current_item_id(itype_bugnet);`
`@@ -17726,7 +17767,8 @@ bool HeroClass::premove()`
`17726`	`17767`	`if(can_attack() && btnwpn>itype_sword && charging==0 && btnwpn!=itype_rupee) // This depends on item 0 being a rupee...`
`17727`	`17768`	`{`
`17728`	`17769`	`bool paidmagic = false;`
`17729`		`- if(btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))`
	`17770`	`+ bool liftonly = lift_wpn && (liftflags & LIFTFL_DIS_ITEMS);`
	`17771`	`+ if(!liftonly && btnwpn==itype_wand && (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_wand : false) : current_item(itype_wand)))`
`17730`	`17772`	`{`
`17731`	`17773`	`attackid=directWpn>-1 ? directWpn : current_item_id(itype_wand);`
`17732`	`17774`	`no_jinx = checkitem_jinx(attackid);`
`@@ -17745,7 +17787,7 @@ bool HeroClass::premove()`
`17745`	`17787`	`item_error();`
`17746`	`17788`	`}`
`17747`	`17789`	`}`
`17748`		`- else if((btnwpn==itype_hammer)&&!((action==attacking\|\|action==sideswimattacking) && attack==wHammer)`
	`17790`	`+ else if(!liftonly && (btnwpn==itype_hammer)&&!((action==attacking\|\|action==sideswimattacking) && attack==wHammer)`
`17749`	`17791`	`&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_hammer : false) : current_item(itype_hammer)))`
`17750`	`17792`	`{`
`17751`	`17793`	`no_jinx = checkitem_jinx(dowpn);`
`@@ -17763,7 +17805,7 @@ bool HeroClass::premove()`
`17763`	`17805`	`attackclk=0;`
`17764`	`17806`	`}`
`17765`	`17807`	`}`
`17766`		`- else if((btnwpn==itype_candle)&&!((action==attacking\|\|action==sideswimattacking) && attack==wFire)`
	`17808`	`+ else if(!liftonly && (btnwpn==itype_candle)&&!((action==attacking\|\|action==sideswimattacking) && attack==wFire)`
`17767`	`17809`	`&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_candle : false) : current_item(itype_candle)))`
`17768`	`17810`	`{`
`17769`	`17811`	`//checkbunny handled where magic cost is paid`
`@@ -17776,7 +17818,7 @@ bool HeroClass::premove()`
`17776`	`17818`	`attackclk=0;`
`17777`	`17819`	`}`
`17778`	`17820`	`}`
`17779`		`- else if((btnwpn==itype_cbyrna)&&!((action==attacking\|\|action==sideswimattacking) && attack==wCByrna)`
	`17821`	`+ else if(!liftonly && (btnwpn==itype_cbyrna)&&!((action==attacking\|\|action==sideswimattacking) && attack==wCByrna)`
`17780`	`17822`	`&& (directWpn>-1 ? (!item_disabled(directWpn) ? itemsbuf[directWpn].family==itype_cbyrna : false) : current_item(itype_cbyrna)))`
`17781`	`17823`	`{`
`17782`	`17824`	`attackid=directWpn>-1 ? directWpn : current_item_id(itype_cbyrna);`
`@@ -17796,7 +17838,7 @@ bool HeroClass::premove()`
`17796`	`17838`	`item_error();`
`17797`	`17839`	`}`
`17798`	`17840`	`}`
`17799`		`- else if((btnwpn==itype_bugnet)&&!((action==attacking\|\|action==sideswimattacking) && attack==wBugNet)`
	`17841`	`+ else if(!liftonly && (btnwpn==itype_bugnet)&&!((action==attacking\|\|action==sideswimattacking) && attack==wBugNet)`
`17800`	`17842`	`&& (directWpn>-1 ? (!item_disabled(directWpn) && itemsbuf[directWpn].family==itype_bugnet) : current_item(itype_bugnet)))`
`17801`	`17843`	`{`
`17802`	`17844`	`attackid = directWpn>-1 ? directWpn : current_item_id(itype_bugnet);`