Some reworking of bombs

Author: EmilyV99

src/base/zdefs.h

@@ -294,7 +294,7 @@ enum {ENC_METHOD_192B104=0, ENC_METHOD_192B105, ENC_METHOD_192B185, ENC_METHOD_2
 #define V_SFX              8
 #define V_FAVORITES        3
 
-#define V_COMPATRULE       42
+#define V_COMPATRULE       43
 #define V_ZINFO            3
 
 //= V_SHOPS is under V_MISC
@@ -1119,7 +1119,7 @@ enum
 	qr_OLD_FFC_FUNCTIONALITY = 50*8, qr_OLD_SHALLOW_SFX, qr_BUGGED_LAYERED_FLAGS, qr_HARDCODED_FFC_BUSH_DROPS,
 	qr_POUNDLAYERS1AND2, qr_MOVINGBLOCK_FAKE_SOLID, qr_NEW_HERO_MOVEMENT2, qr_CARRYABLE_NO_ACROSS_SCREEN,
 	//51
-	qr_NO_SCROLL_WHILE_CARRYING, qr_HELD_BOMBS_EXPLODE, qr_BROKEN_MOVING_BOMBS,
+	qr_NO_SCROLL_WHILE_CARRYING, qr_HELD_BOMBS_EXPLODE, qr_BROKEN_MOVING_BOMBS, qr_OLD_BOMB_HITBOXES,
 	//60
 	//70
 

src/dialog/itemeditor.cpp

@@ -411,7 +411,9 @@ void loadinfo(ItemNameInfo * inf, itemdata const& ref)
 			inf->misc[1] = "Max. On Screen:";
 			inf->misc[2] = "Damage to Player:";
 			_SET(misc[3], "Lift Level", "If 0, the weapon is not liftable. Otherwise, liftable using Lift Gloves of at least this level.");
-			_SET(misc[4], "Lift Height", "The Z height above the player's head to lift the weapon.");
+			_SET(misc[4], "Lift Time", "The time, in frames, to lift the weapon above the player's head.");
+			_SET(misc[5], "Lift Height", "The Z height above the player's head to lift the weapon.");
+			_SET(misc[6], "Boom Radius", "If 0, uses a classic boxy hitbox- otherwise uses a circular radius of this many pixels." + QRHINT({qr_OLD_BOMB_HITBOXES}));
 			inf->flag[1] = "Explosion Hurts Player";
 			_SET(flag[2], "Stops Movement on Landing", "If the weapon lands due to gravity, it's step will be set to 0.");
 			_SET(flag[3], "Auto-Lift", "If the player owns a Lift Glove, place the bomb directly in the player's hands.");
@@ -429,6 +431,7 @@ void loadinfo(ItemNameInfo * inf, itemdata const& ref)
 			_SET(misc[3], "Lift Level", "If 0, the weapon is not liftable. Otherwise, liftable using Lift Gloves of at least this level.");
 			_SET(misc[4], "Lift Time", "The time, in frames, to lift the weapon above the player's head.");
 			_SET(misc[5], "Lift Height", "The Z height above the player's head to lift the weapon.");
+			_SET(misc[6], "Boom Radius", "If 0, uses a classic boxy hitbox- otherwise uses a circular radius of this many pixels." + QRHINT({qr_OLD_BOMB_HITBOXES}));
 			inf->flag[0] = "Use 1.92 Timing";
 			inf->flag[1] = "Explosion Hurts Player";
 			_SET(flag[2], "Stops Movement on Landing", "If the weapon lands due to gravity, it's step will be set to 0.");

src/dialog/quest_rules.cpp

@@ -882,7 +882,10 @@ static GUI::ListData compatRulesList
 		" Note that you can access the real engine uid with ->HitBy[HIT_BY_(thing)_ENGINE_UID] regardless of this rule."},
 	{ "Broken Moving && Air Bombs", qr_BROKEN_MOVING_BOMBS,
 		"If enabled, bombs exploding while moving will behave oddly and broken, and bomb explosions"
-		" will continue obeying gravity." }
+		" will continue obeying gravity." },
+	{ "Old Bomb Hitboxes", qr_OLD_BOMB_HITBOXES,
+		"If enabled, the outer ring of bombs' hitboxes will not count for triggering combos/secrets,"
+		" and giving bombs custom radii will not work."}
 };
 
 static GUI::ListData enemiesRulesList

src/items.cpp

@@ -315,6 +315,12 @@ void item::draw(BITMAP *dest)
 	}
 }
 
+void item::draw_hitbox()
+{
+	if(subscreenItem) return;
+	sprite::draw_hitbox();
+}
+
 item::item(zfix X,zfix Y,zfix Z,int32_t i,int32_t p,int32_t c, bool isDummy) : sprite()
 {
 	x=X;
@@ -447,6 +453,7 @@ void putitem(BITMAP *dest,int32_t x,int32_t y,int32_t item_id)
 {
 	item temp((zfix)x,(zfix)y,(zfix)0,item_id,0,0);
 	temp.yofs=0;
+	temp.hide_hitbox = true;
 
 	if ( itemsbuf[item_id].overrideFLAGS > 0 ) {
 		temp.extend = 3; 
@@ -573,6 +580,7 @@ void putitem2(BITMAP *dest,int32_t x,int32_t y,int32_t item_id, int32_t &aclk, i
 	temp.yofs=0;
 	temp.aclk=aclk;
 	temp.aframe=aframe;
+	temp.hide_hitbox = true;
 
 	if(flash)
 	{

src/items.h

@@ -55,6 +55,7 @@ class item : public sprite
 	virtual int32_t run_script(int32_t mode);
 #endif
 	virtual ALLEGRO_COLOR hitboxColor(byte opacity = 255) const;
+	virtual void draw_hitbox();
 	void set_forcegrab(bool val)
 	{
 		if(force_grab && !val)

src/qst.cpp

@@ -3746,6 +3746,8 @@ int32_t readrules(PACKFILE *f, zquestheader *Header, bool keepdata)
 		set_bit(quest_rules,qr_BROKENHITBY,1);
 	if(compatrule_version < 42)
 		set_bit(quest_rules,qr_BROKEN_MOVING_BOMBS,1);
+	if(compatrule_version < 43)
+		set_bit(quest_rules,qr_OLD_BOMB_HITBOXES,1);
 
 	set_bit(quest_rules,qr_ANIMATECUSTOMWEAPONS,0);
 	if (s_version < 16)

src/sprite.cpp

@@ -178,6 +178,7 @@ sprite::sprite(): solid_object()
 	spr_death_anim_frm = 0;
 	spr_spawn_anim_clk = 0;
 	spr_spawn_anim_frm = 0;
+	hide_hitbox = false;
 }
 
 sprite::sprite(sprite const & other):
@@ -1583,14 +1584,9 @@ void sprite::draw(BITMAP* dest)
 		}
 	}
 
-#ifndef IS_ZQUEST
 	if(show_hitboxes)
-	{
-		start_info_bmp();
-		al_draw_rectangle(x+hxofs,y+playing_field_offset+hyofs-(z+zofs)-fakez,x+hxofs+hxsz,(y+playing_field_offset+hyofs+hysz-(z+zofs)-fakez),hitboxColor(info_opacity),1);
-		end_info_bmp();
-	}
-#endif
+		draw_hitbox();
+	
 	if ( sprBMP2 ) 
 	{
 		//if there is still somehow data in the scaling bitmap
@@ -1600,6 +1596,16 @@ void sprite::draw(BITMAP* dest)
 	yofs = tyoffs;
 }
 
+void sprite::draw_hitbox()
+{
+	if(hide_hitbox) return;
+#ifndef IS_ZQUEST
+	start_info_bmp();
+	al_draw_rectangle(x+hxofs,y+playing_field_offset+hyofs-(z+zofs)-fakez,x+hxofs+hxsz,(y+playing_field_offset+hyofs+hysz-(z+zofs)-fakez),hitboxColor(info_opacity),1);
+	end_info_bmp();
+#endif
+}
+
 
 //Z1 bosses draw tiles from guys.cpp, direct to the 'dest'
 void sprite::drawzcboss(BITMAP* dest)
@@ -1958,14 +1964,8 @@ void sprite::drawzcboss(BITMAP* dest)
         }
     }
 
-#ifndef IS_ZQUEST
     if(show_hitboxes)
-	{
-		start_info_bmp();
-		al_draw_rectangle(x+hxofs,y+playing_field_offset+hyofs-(z+zofs)-fakez,x+hxofs+hxsz,(y+playing_field_offset+hyofs+hysz-(z+zofs)-fakez),hitboxColor(info_opacity),1);
-		end_info_bmp();
-	}
-#endif
+		draw_hitbox();
 }
 
 void sprite::draw8(BITMAP* dest)

src/sprite.h

@@ -131,6 +131,7 @@ class sprite : public solid_object
 	int32_t drownCombo; // Pitfall fallen combo
 	bool isspawning;
 	bool can_flicker;
+	bool hide_hitbox;
 
 	byte spr_shadow, spr_death, spr_spawn;
 	int16_t spr_death_anim_clk, spr_spawn_anim_clk;
@@ -184,6 +185,7 @@ class sprite : public solid_object
 	virtual int32_t run_script(int32_t mode);
 
 	virtual ALLEGRO_COLOR hitboxColor(byte opacity = 255) const;
+	virtual void draw_hitbox();
 };
 
 enum //run_script modes

src/subscr.cpp

@@ -3106,6 +3106,7 @@ void add_subscr_item(item *newItem)
 {
 	//al_trace("Adding a subscreen item, ID: %d\n",newItem->id); //Logging stuff to remove, later.
     newItem->subscreenItem=true;
+    newItem->hide_hitbox=true;
     Sitems.add(newItem);
 }
 
@@ -4125,6 +4126,7 @@ void buttonitem(BITMAP *dest, int32_t button, int32_t x, int32_t y)
         {
             Aitem->x=x;
             Aitem->y=y;
+            Aitem->hide_hitbox = true;
 
             switch(itemsbuf[Aitem->id].family)
             {
@@ -4152,6 +4154,7 @@ void buttonitem(BITMAP *dest, int32_t button, int32_t x, int32_t y)
         {
             Bitem->x=x;
             Bitem->y=y;
+            Bitem->hide_hitbox = true;
 
             switch(itemsbuf[Bitem->id].family)
             {
@@ -4181,6 +4184,7 @@ void buttonitem(BITMAP *dest, int32_t button, int32_t x, int32_t y)
 		//zprint2("Drawing X Item\n");
             Xitem->x=x;
             Xitem->y=y;
+            Xitem->hide_hitbox = true;
 
             switch(itemsbuf[Xitem->id].family)
             {
@@ -4211,6 +4215,7 @@ void buttonitem(BITMAP *dest, int32_t button, int32_t x, int32_t y)
 		//zprint2("Drawing Y Item\n");
             Yitem->x=x;
             Yitem->y=y;
+            Yitem->hide_hitbox = true;
 
             switch(itemsbuf[Yitem->id].family)
             {

src/zc/guys.cpp

@@ -23720,7 +23720,8 @@ void check_collisions()
 			{
 				enemy *e = (enemy*)guys.spr(j);
 
-				if(e->hit(w)) //boomerangs and such that last for more than a frame can write hitby[] for more than one frame, 
+				bool didhit = w->hit(e);
+				if(didhit) //boomerangs and such that last for more than a frame can write hitby[] for more than one frame, 
 				//because this only checks `if(dying || clk<0 || hclk>0 || superman)`
 				{
 					// !(e->stunclk)