提交: ed3414fcbdc601853d8014f8d3a8e93646694d82 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• 修訂: ed3414fcbdc601853d8014f8d3a8e93646694d82 (tree)
• 時間: 2022-09-04 23:09:42
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

GIVEFISTINGMEDAL and GIVESPAMMEDAL are now generic STFlags that can be added to projectiles or puffs. GIVEFISTINGMEDAL can still be added to weapons to award the player will the "fisting" medal when they kill another player with A_Punch or A_CustomPunch.

Change Summary

• modified: src/actor.h
• modified: src/g_doom/a_doomweaps.cpp
• modified: src/g_shared/a_pickups.h
• modified: src/medal.cpp
• modified: src/medal.h
• modified: src/p_interaction.cpp
• modified: src/p_local.h
• modified: src/p_map.cpp
• modified: src/thingdef/thingdef_data.cpp
• modified: wadsrc/static/actors/doom/doomweapons.txt

差異

diff -r b460d88f3a9e -r ed3414fcbdc6 src/actor.h
--- a/src/actor.h	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/actor.h	Sun Sep 04 10:09:42 2022 -0400
@@ -443,6 +443,12 @@
 	// or sv_dontpushallies are enabled.
 	STFL_FORCEALLYCOLLISION		= 0x10000000,
 
+	// [AK] A projectile/puff will give an attacking player a "fisting" medal when they frag another player
+	// or a "spam" medal when they frag more than one player in a single tic. If the former is applied to
+	// a weapon, then a melee attack (i.e. A_Punch or A_CustomPunch) from that weapon awards the medal.
+	STFL_GIVEFISTINGMEDAL		= 0x20000000,
+	STFL_GIVESPAMMEDAL			= 0x40000000,
+
 // More flags for Skulltag... these having to do with the network.
 
 	// This object does not have a network ID.

diff -r b460d88f3a9e -r ed3414fcbdc6 src/g_doom/a_doomweaps.cpp
--- a/src/g_doom/a_doomweaps.cpp	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/g_doom/a_doomweaps.cpp	Sun Sep 04 10:09:42 2022 -0400
@@ -1057,9 +1057,21 @@
 		for (j = 0; j < damagecnt; ++j)
 			damage += (pr_bfgspray() & 7) + 1;
 
+		// [AK] Added dmgflags, which will handle MF3_FOILINVUL and also check if the spray type should
+		// also award the player with the "spam" medal.
+		int dmgflags = 0;
+		if ( spray != NULL )
+		{
+			if ( spray->flags3 & MF3_FOILINVUL )
+				dmgflags |= DMG_FOILINVUL;
+
+			if ( spray->STFlags & STFL_GIVESPAMMEDAL )
+				dmgflags = DMG_GIVE_SPAM_MEDAL_ON_FRAG;
+		}
+
 		thingToHit = linetarget;
 		int newdam = P_DamageMobj (thingToHit, self->target, self->target, damage, spray != NULL? FName(spray->DamageType) : FName(NAME_BFGSplash), 
-			spray != NULL && (spray->flags3 & MF3_FOILINVUL)? DMG_FOILINVUL : 0);
+			/*spray != NULL && (spray->flags3 & MF3_FOILINVUL)? DMG_FOILINVUL : 0*/ dmgflags);
 		P_TraceBleed (newdam > 0 ? newdam : damage, thingToHit, self->target);
 	}
 }

diff -r b460d88f3a9e -r ed3414fcbdc6 src/g_shared/a_pickups.h
--- a/src/g_shared/a_pickups.h	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/g_shared/a_pickups.h	Sun Sep 04 10:09:42 2022 -0400
@@ -367,8 +367,6 @@
 	// [BC] New weapon info definitions.
 	WIF_ALLOW_WITH_RESPAWN_INVUL	= 0x00020000,	// The player can continue to wield this weapon even with respawn invulnerability active.
 	WIF_NOLMS						= 0x00040000,	// Don't give this weapon in LMS games.
-	WIF_GIVEFISTINGMEDAL			= 0x00080000,	// Gives the player a "fisting" medal when they get a frag with a melee attack from this weapon.
-	WIF_GIVESPAMMEDAL				= 0x00100000,	// Gives the player a "spam" medal when they frag more than one player in a single tic with this weapon.
 
 	WIF_CHEATNOTWEAPON	=	0x08000000,	// Give cheat considers this not a weapon (used by Sigil)
 

diff -r b460d88f3a9e -r ed3414fcbdc6 src/medal.cpp
--- a/src/medal.cpp	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/medal.cpp	Sun Sep 04 10:09:42 2022 -0400
@@ -147,7 +147,7 @@
 void	medal_SelectIcon( ULONG ulPlayer );
 void	medal_CheckForFirstFrag( ULONG ulPlayer );
 void	medal_CheckForDomination( ULONG ulPlayer );
-void	medal_CheckForSpam( ULONG ulPlayer );
+void	medal_CheckForFistingOrSpam( ULONG ulPlayer, int dmgflags );
 void	medal_CheckForExcellent( ULONG ulPlayer );
 void	medal_CheckForTermination( ULONG ulDeadPlayer, ULONG ulPlayer );
 void	medal_CheckForLlama( ULONG ulDeadPlayer, ULONG ulPlayer );
@@ -546,7 +546,7 @@
 
 //*****************************************************************************
 //
-void MEDAL_PlayerDied( ULONG ulPlayer, ULONG ulSourcePlayer )
+void MEDAL_PlayerDied( ULONG ulPlayer, ULONG ulSourcePlayer, int dmgflags )
 {
 	if ( PLAYER_IsValidPlayerWithMo ( ulPlayer ) == false )
 		return;
@@ -562,7 +562,7 @@
 
 		medal_CheckForFirstFrag( ulSourcePlayer );
 		medal_CheckForDomination( ulSourcePlayer );
-		medal_CheckForSpam( ulSourcePlayer );
+		medal_CheckForFistingOrSpam( ulSourcePlayer, dmgflags );
 		medal_CheckForExcellent( ulSourcePlayer );
 		medal_CheckForTermination( ulPlayer, ulSourcePlayer );
 		medal_CheckForLlama( ulPlayer, ulSourcePlayer );
@@ -1174,18 +1174,15 @@
 
 //*****************************************************************************
 //
-void medal_CheckForSpam( ULONG ulPlayer )
+void medal_CheckForFistingOrSpam( ULONG ulPlayer, int dmgflags )
 {
-	if ( players[ulPlayer].ReadyWeapon == NULL )
-		return;
+	// [AK] Check if we should award the player with a "fisting" medal.
+	if ( dmgflags & DMG_GIVE_FISTING_MEDAL_ON_FRAG )
+		MEDAL_GiveMedal( ulPlayer, MEDAL_FISTING );
 
-	// [AK] A weapon shouldn't cause this MeansOfDeath.
-	if ( MeansOfDeath == NAME_Telefrag )
-		return;
-
-	// [AK] If this is the second frag this player has gotten THIS TICK with a weapon
-	// that gives the "SPAM!" medal, award the player with one.
-	if ( players[ulPlayer].ReadyWeapon->WeaponFlags & WIF_GIVESPAMMEDAL )
+	// [AK] Check if we should award the player with a "spam" medal if this is the second
+	// frag this player has gotten THIS TICK with a projectile or puff that awards one.
+	if ( dmgflags & DMG_GIVE_SPAM_MEDAL_ON_FRAG )
 	{
 		if ( players[ulPlayer].ulLastSpamTick == static_cast<unsigned> (level.time) )
 		{

diff -r b460d88f3a9e -r ed3414fcbdc6 src/medal.h
--- a/src/medal.h	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/medal.h	Sun Sep 04 10:09:42 2022 -0400
@@ -184,7 +184,7 @@
 void	MEDAL_RenderAllMedalsFullscreen( player_t *pPlayer );
 ULONG	MEDAL_GetDisplayedMedal( ULONG ulPlayer );
 void	MEDAL_ClearMedalQueue( ULONG ulPlayer );
-void	MEDAL_PlayerDied( ULONG ulPlayer, ULONG ulSourcePlayer );
+void	MEDAL_PlayerDied( ULONG ulPlayer, ULONG ulSourcePlayer, int dmgflags );
 void	MEDAL_ResetFirstFragAwarded( void );
 
 //*****************************************************************************

diff -r b460d88f3a9e -r ed3414fcbdc6 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/p_interaction.cpp	Sun Sep 04 10:09:42 2022 -0400
@@ -454,10 +454,22 @@
 	if ( player )
 	{
 		const ULONG ulPlayer = player - players;
+		int dmgflagsCopy = dmgflags;
+
+		// [AK] If the inflictor has the GIVEFISTINGMEDAL or GIVESPAMMEDAL flags, then the attacker
+		// (assuming that they're also a player) can get a "fisting" or "spam" medal.
+		if ( inflictor )
+		{
+			if ( inflictor->STFlags & STFL_GIVEFISTINGMEDAL )
+				dmgflagsCopy |= DMG_GIVE_FISTING_MEDAL_ON_FRAG;
+
+			if ( inflictor->STFlags & STFL_GIVESPAMMEDAL )
+				dmgflagsCopy |= DMG_GIVE_SPAM_MEDAL_ON_FRAG;
+		}
 
 		// [BC] Check to see if any medals need to be awarded.
 		if ( NETWORK_InClientMode( ) == false )
-			MEDAL_PlayerDied( ulPlayer, (( source ) && ( source->player )) ? static_cast<ULONG>( source->player - players ) : MAXPLAYERS );
+			MEDAL_PlayerDied( ulPlayer, (( source ) && ( source->player )) ? static_cast<ULONG>( source->player - players ) : MAXPLAYERS, dmgflagsCopy );
 
 		// [AK] Increment this player's death count.
 		PLAYER_SetDeaths( &players[ulPlayer], players[ulPlayer].ulDeathCount + 1, false );

diff -r b460d88f3a9e -r ed3414fcbdc6 src/p_local.h
--- a/src/p_local.h	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/p_local.h	Sun Sep 04 10:09:42 2022 -0400
@@ -607,6 +607,10 @@
 	DMG_NO_FACTOR = 16,
 	DMG_PLAYERATTACK = 32,
 	DMG_FOILINVUL = 64,
+
+	// [AK] Zandronum additions.
+	DMG_GIVE_FISTING_MEDAL_ON_FRAG = 128,
+	DMG_GIVE_SPAM_MEDAL_ON_FRAG = 256,
 };
 
 

diff -r b460d88f3a9e -r ed3414fcbdc6 src/p_map.cpp
--- a/src/p_map.cpp	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/p_map.cpp	Sun Sep 04 10:09:42 2022 -0400
@@ -4441,6 +4441,12 @@
 					dmgflags |= DMG_NO_ARMOR;
 				}
 				
+				// [AK] If this is a melee attack from a player that's using a weapon which gives the "fisting"
+				// medal, add DMG_GIVE_FISTING_MEDAL_ON_FRAG. MEDAL_PlayerDied will award the medal upon fragging
+				// another player.
+				if (( flags & LAF_ISMELEEATTACK ) && ( t1->player ) && ( t1->player->ReadyWeapon ) && ( t1->player->ReadyWeapon->STFlags & STFL_GIVEFISTINGMEDAL ))
+					dmgflags |= DMG_GIVE_FISTING_MEDAL_ON_FRAG;
+
 				if (puff == NULL)
 				{
 					// Since the puff is the damage inflictor we need it here 
@@ -4455,14 +4461,6 @@
 				{
 					*actualdamage = newdam;
 				}
-
-				// [AK] If this was a melee attack from a player that's using a weapon that gives the "fisting"
-				// medal and they just killed another player with it, award them with the medal.
-				if (( flags & LAF_ISMELEEATTACK ) && ( trace.Actor->player ) && ( trace.Actor->health <= 0 ))
-				{
-					if (( t1->player ) && ( t1->player->ReadyWeapon ) && ( t1->player->ReadyWeapon->WeaponFlags & WIF_GIVEFISTINGMEDAL ))
-						MEDAL_GiveMedal( t1->player - players, MEDAL_FISTING );
-				}
 			}
 			if (!(puffDefaults != NULL && puffDefaults->flags3&MF3_BLOODLESSIMPACT))
 			{

diff -r b460d88f3a9e -r ed3414fcbdc6 src/thingdef/thingdef_data.cpp
--- a/src/thingdef/thingdef_data.cpp	Sun Aug 28 16:13:35 2022 -0400
+++ b/src/thingdef/thingdef_data.cpp	Sun Sep 04 10:09:42 2022 -0400
@@ -266,6 +266,8 @@
 	DEFINE_FLAG(STFL, EXPLODEONDEATH, AActor, STFlags),
 	DEFINE_FLAG(STFL, DONTIDENTIFYTARGET, AActor, STFlags), // [CK]
 	DEFINE_FLAG(STFL, FORCEALLYCOLLISION, AActor, STFlags), // [AK]
+	DEFINE_FLAG(STFL, GIVEFISTINGMEDAL, AWeapon, STFlags), // [AK]
+	DEFINE_FLAG(STFL, GIVESPAMMEDAL, AWeapon, STFlags), // [AK]
 
 	// [AK] Enables/disables GAMEEVENT_ACTOR_SPAWNED for the actor.
 	DEFINE_FLAG(STFL, USESPAWNEVENTSCRIPT, AActor, STFlags),
@@ -383,8 +385,6 @@
 	DEFINE_FLAG(WIF, ALLOW_WITH_RESPAWN_INVUL, AWeapon, WeaponFlags), // [BB] Marks weapons that can be used while respawn invulnerability is active.
 	DEFINE_FLAG(WIF, NOLMS, AWeapon, WeaponFlags), // [BB] Marks weapons that are not given to the player in LMS.
 	DEFINE_FLAG(WIF, ALT_USES_BOTH, AWeapon, WeaponFlags),
-	DEFINE_FLAG(WIF, GIVEFISTINGMEDAL, AWeapon, WeaponFlags), // [AK] Gives the "fisting" medal when the player gets a frag with a melee attack from this weapon.
-	DEFINE_FLAG(WIF, GIVESPAMMEDAL, AWeapon, WeaponFlags), // [AK] Gives the "spam" medal when the player frags more than one player in a single tic with this weapon.
 };
 
 static FFlagDef PlayerPawnFlags[] =

diff -r b460d88f3a9e -r ed3414fcbdc6 wadsrc/static/actors/doom/doomweapons.txt
--- a/wadsrc/static/actors/doom/doomweapons.txt	Sun Aug 28 16:13:35 2022 -0400
+++ b/wadsrc/static/actors/doom/doomweapons.txt	Sun Sep 04 10:09:42 2022 -0400
@@ -25,7 +25,7 @@
 	+WEAPON.WIMPY_WEAPON
 	+WEAPON.MELEEWEAPON
 	+WEAPON.ALLOW_WITH_RESPAWN_INVUL
-	+WEAPON.GIVEFISTINGMEDAL // [AK]
+	+GIVEFISTINGMEDAL // [AK]
 	States
 	{
 	Ready:
@@ -532,7 +532,6 @@
 	Weapon.AmmoType "Cell"
 	+WEAPON.NOAUTOFIRE
 	+WEAPON.NOLMS
-	+WEAPON.GIVESPAMMEDAL // [AK]
 	Inventory.PickupMessage "$GOTBFG9000"
 	Tag "$TAG_BFG9000"
 	States
@@ -579,6 +578,7 @@
 	Damage 100
 	Projectile
 	+RANDOMIZE
+	+GIVESPAMMEDAL // [AK]
 	RenderStyle Add
 	Alpha 0.75
 	DeathSound "weapons/bfgx"
@@ -600,6 +600,7 @@
 {
 	+NOBLOCKMAP
 	+NOGRAVITY
+	+GIVESPAMMEDAL // [AK]
 	RenderStyle Add
 	Alpha 0.75
 	DamageType "BFGSplash"