Commit: 2d248057a368c8bfd3fa4a5a6f3205dc6742d325 - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Revisión: 2d248057a368c8bfd3fa4a5a6f3205dc6742d325 (tree)
• Tiempo: 2021-11-29 04:28:02
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added a variant of GAMEEVENT_ACTOR_DAMAGED that is triggered just before an actor's armor can absorb any damage, called GAMEEVENT_ACTOR_ARMORDAMAGED.

Cambiar Resumen

• modified: docs/zandronum-history.txt
• modified: src/gamemode.cpp
• modified: src/gamemode.h
• modified: src/p_acs.cpp
• modified: src/p_acs.h
• modified: src/p_interaction.cpp

Diferencia incremental

diff -r 59193cc88f92 -r 2d248057a368 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Mon Nov 29 08:21:26 2021 +1100
+++ b/docs/zandronum-history.txt	Sun Nov 28 14:28:02 2021 -0500
@@ -58,6 +58,7 @@
 +	- Added all of the text colors from "New Text Colors", originally made by FuzzballFox. [Kaminsky]
 +	- Added the EVENT script type: GAMEEVENT_PLAYERCONNECT, indicating when a client or bot joins the server. [Kaminsky]
 +	- Added the EVENT script type GAMEEVENT_ACTOR_SPAWNED and GAMEVENT_ACTOR_DAMAGED, which are triggered just before an actor's first tic and when an actor takes damage. Note that for performance reasons, these events are disabled by default so modders have to enable them by themselves. [Kaminsky]
++	- Added the EVENT script type GAMEEVENT_ACTOR_ARMORDAMAGED that's triggered just before an actor's armor absorbs any damage inflicted on it. [Kaminsky]
 +	- Added DMFlags: "sv_shootthroughallies" and "sv_dontpushallies", so a player's attacks can pass through and not push their allies. [Kaminsky]
 +	- Added packet loss mitigation, which the client can control using the CVar "cl_backupcommands". [Kaminsky]
 +	- Added the server CVAR "sv_country", which allows servers to present their country to launchers. [Sean]

diff -r 59193cc88f92 -r 2d248057a368 src/gamemode.cpp
--- a/src/gamemode.cpp	Mon Nov 29 08:21:26 2021 +1100
+++ b/src/gamemode.cpp	Sun Nov 28 14:28:02 2021 -0500
@@ -1093,7 +1093,7 @@
 	// actor pointers that were responsible for calling the event
 	// become NULL after one tic.
 	// Also allow chat events to be executed immediately.
-	bool bRunNow = ( Event == GAMEEVENT_ACTOR_SPAWNED || Event == GAMEEVENT_ACTOR_DAMAGED || Event == GAMEEVENT_CHAT );
+	const bool bRunNow = ( Event == GAMEEVENT_ACTOR_SPAWNED || Event == GAMEEVENT_ACTOR_DAMAGED || Event == GAMEEVENT_ACTOR_ARMORDAMAGED || Event == GAMEEVENT_CHAT );
 
 	// [BB] The activator of the event activates the event script.
 	// The first argument is the type, e.g. GAMEEVENT_PLAYERFRAGS,
@@ -1111,7 +1111,7 @@
 
 //*****************************************************************************
 //
-bool GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int &damage, FName mod )
+bool GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int &damage, FName mod, bool bBeforeArmor )
 {
 	// [AK] Don't run any scripts if the target doesn't allow executing GAMEEVENT_ACTOR_DAMAGED.
 	if ( target->STFlags & STFL_NODAMAGEEVENTSCRIPT )
@@ -1122,6 +1122,8 @@
 	if ((( target->STFlags & STFL_USEDAMAGEEVENTSCRIPT ) == false ) && ( gameinfo.bForceDamageEventScripts == false ))
 		return true;
 	
+	const GAMEEVENT_e DamageEvent = bBeforeArmor ? GAMEEVENT_ACTOR_ARMORDAMAGED : GAMEEVENT_ACTOR_DAMAGED;
+
 	// [AK] We somehow need to pass all the actor pointers into the script itself. A simple way
 	// to do this is temporarily spawn a temporary actor and change its actor pointers to the target,
 	// source, and inflictor. We can then use these to initialize the AAPTR_DAMAGE_TARGET,
@@ -1133,7 +1135,7 @@
 	temp->tracer = inflictor;
 
 	GAMEMODE_SetEventResult( damage );
-	damage = GAMEMODE_HandleEvent( GAMEEVENT_ACTOR_DAMAGED, temp, damage, GlobalACSStrings.AddString( mod ));
+	damage = GAMEMODE_HandleEvent( DamageEvent, temp, damage, GlobalACSStrings.AddString( mod ));
 
 	// [AK] Destroy the temporary actor after executing all event scripts.
 	temp->Destroy( );

diff -r 59193cc88f92 -r 2d248057a368 src/gamemode.h
--- a/src/gamemode.h	Mon Nov 29 08:21:26 2021 +1100
+++ b/src/gamemode.h	Sun Nov 28 14:28:02 2021 -0500
@@ -132,6 +132,7 @@
 	GAMEEVENT_PLAYERCONNECT,
 	GAMEEVENT_ACTOR_SPAWNED,
 	GAMEEVENT_ACTOR_DAMAGED,
+	GAMEEVENT_ACTOR_ARMORDAMAGED,
 } GAMEEVENT_e;
 
 //*****************************************************************************
@@ -213,7 +214,7 @@
 GAMESTATE_e	GAMEMODE_GetState ( void );
 void		GAMEMODE_SetState ( GAMESTATE_e GameState );
 LONG		GAMEMODE_HandleEvent ( const GAMEEVENT_e Event, AActor *pActivator = NULL, const int DataOne = 0, const int DataTwo = 0 );
-bool		GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int &damage, FName mod );
+bool		GAMEMODE_HandleDamageEvent ( AActor *target, AActor *inflictor, AActor *source, int &damage, FName mod, bool bBeforeArmor = false );
 LONG		GAMEMODE_GetEventResult ( void );
 void		GAMEMODE_SetEventResult ( LONG lResult );
 

diff -r 59193cc88f92 -r 2d248057a368 src/p_acs.cpp
--- a/src/p_acs.cpp	Mon Nov 29 08:21:26 2021 +1100
+++ b/src/p_acs.cpp	Sun Nov 28 14:28:02 2021 -0500
@@ -11721,11 +11721,11 @@
 	// [TP] We need to store this as activefontname instead.
 	activefontname = "SmallFont";
 
-	// [AK] Check if this is an event script triggered by GAMEEVENT_ACTOR_DAMAGED. This is
-	// where we initialize the script's target, source, and inflictor pointers by using the
-	// temporary activator's own pointers.
+	// [AK] Check if this is an event script triggered by GAMEEVENT_ACTOR_DAMAGED or
+	// GAMEEVENT_ACTOR_ARMORDAMAGED. This is where we initialize the script's target,
+	// source, and inflictor pointers by using the temporary activator's own pointers.
 	if (( NETWORK_InClientMode( ) == false ) && ( who != NULL ) &&
-		( code->Type == SCRIPT_Event ) && ( args[0] == GAMEEVENT_ACTOR_DAMAGED ))
+		( code->Type == SCRIPT_Event ) && ( args[0] == GAMEEVENT_ACTOR_DAMAGED || args[0] == GAMEEVENT_ACTOR_ARMORDAMAGED ))
 	{
 		pDamageTarget = who->target;
 		pDamageSource = who->master;

diff -r 59193cc88f92 -r 2d248057a368 src/p_acs.h
--- a/src/p_acs.h	Mon Nov 29 08:21:26 2021 +1100
+++ b/src/p_acs.h	Sun Nov 28 14:28:02 2021 -0500
@@ -1074,8 +1074,8 @@
 	int				InModuleScriptNumber;
 	FString			activefontname; // [TP]
 
-	// [AK] Pointers to the source, inflictor, and target actors that triggered a GAMEEVENT_ACTOR_DAMAGED event.
-	// In all other cases, these pointers should be equal to NULL.
+	// [AK] Pointers to the source, inflictor, and target actors that triggered a GAMEEVENT_ACTOR_DAMAGED or
+	// GAMEEVENT_ACTOR_ARMORDAMAGED event. In all other cases, these pointers should be equal to NULL.
 	TObjPtr<AActor>	pDamageSource;
 	TObjPtr<AActor> pDamageInflictor;
 	TObjPtr<AActor> pDamageTarget;
@@ -1121,7 +1121,7 @@
 	friend class ServerCommands::ReplaceTextures;
 	// [AK] We need to access protected variables from this class when we tell the clients to print a HUD message.
 	friend void SERVERCOMMANDS_PrintACSHUDMessage( DLevelScript *pScript, const char *pszString, float fX, float fY, LONG lType, LONG lColor, float fHoldTime, float fInTime, float fOutTime, fixed_t Alpha, LONG lID, ULONG ulPlayerExtra, ServerCommandFlags flags );
-	// [AK] If the current running script is a GAMEEVENT_ACTOR_DAMAGED event, this will return a pointer to the source, inflictor, or target actor.
+	// [AK] If the current running script is a GAMEEVENT_ACTOR_DAMAGED or GAMEEVENT_ACTOR_ARMORDAMAGED event, this returns a pointer to the source, inflictor, or target actor.
 	friend AActor *ACS_GetScriptDamagePointers( unsigned int pointer );
 };
 

diff -r 59193cc88f92 -r 2d248057a368 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Mon Nov 29 08:21:26 2021 +1100
+++ b/src/p_interaction.cpp	Sun Nov 28 14:28:02 2021 -0500
@@ -1552,6 +1552,11 @@
 
 			if (!(flags & DMG_NO_ARMOR) && player->mo->Inventory != NULL)
 			{
+				// [AK] Trigger an event script indicating that the player has taken damage before any damage
+				// can be absorbed by their armor. If the event returns 0, don't do anything else.
+				if ( GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod, true ) == false )
+					return -1;
+
 				int newdam = damage;
 				player->mo->Inventory->AbsorbDamage (damage, mod, newdam);
 				damage = newdam;
@@ -1647,6 +1652,11 @@
 		// Armor for monsters.
 		if (!(flags & (DMG_NO_ARMOR|DMG_FORCED)) && target->Inventory != NULL && damage > 0)
 		{
+			// [AK] Trigger an event script indicating that the actor has taken damage before any damage
+			// can be absorbed by their armor. If the event returns 0, don't do anything else.
+			if ( GAMEMODE_HandleDamageEvent( target, inflictor, source, damage, mod, true ) == false )
+				return -1;
+
 			int newdam = damage;
 			target->Inventory->AbsorbDamage (damage, mod, newdam);
 			damage = newdam;