New entity trigger_bomb_reset (#796)

* Init

* Implementation

* Add `trigger_bomb_reset` to `.fgd`

* Set CC4 position on CC4::AttachToPlayer()

* move to `addons/trigger_bomb_reset`

* rename method & member

* CTriggerBombReset: Add `SetUse()`

regamedll/CMakeLists.txt

@@ -228,6 +228,7 @@ set(GAMEDLL_SRCS
 	"dlls/API/CSPlayerItem.cpp"
 	"dlls/addons/item_airbox.cpp"
 	"dlls/addons/point_command.cpp"
+	"dlls/addons/trigger_bomb_reset.cpp"
 	"dlls/addons/trigger_random.cpp"
 	"dlls/addons/trigger_setorigin.cpp"
 	"dlls/wpn_shared/wpn_ak47.cpp"

regamedll/dlls/addons/trigger_bomb_reset.cpp

@@ -0,0 +1,39 @@
+/*
+*
+*   This program is free software; you can redistribute it and/or modify it
+*   under the terms of the GNU General Public License as published by the
+*   Free Software Foundation; either version 2 of the License, or (at
+*   your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful, but
+*   WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*   General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software Foundation,
+*   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#include "precompiled.h"
+
+LINK_ENTITY_TO_CLASS(trigger_bomb_reset, CTriggerBombReset, CCSTriggerBombReset)
+
+void CTriggerBombReset::Spawn()
+{
+	InitTrigger();
+	SetTouch(&CTriggerBombReset::Touch);
+	SetUse(&CTriggerBombReset::ToggleUse);
+}
+
+void CTriggerBombReset::Touch(CBaseEntity *pOther)
+{
+	CWeaponBox *pWeaponBox = dynamic_cast<CWeaponBox *>(pOther);
+
+	if (pWeaponBox && pWeaponBox->m_bIsBomb)
+	{
+		// If the bomb touches this trigger, tell it to reset to its last known valid position.
+		pWeaponBox->ResetToLastValidPlayerHeldC4Position();
+	}
+}

regamedll/dlls/addons/trigger_bomb_reset.h

@@ -0,0 +1,28 @@
+/*
+*
+*   This program is free software; you can redistribute it and/or modify it
+*   under the terms of the GNU General Public License as published by the
+*   Free Software Foundation; either version 2 of the License, or (at
+*   your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful, but
+*   WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*   General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software Foundation,
+*   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#pragma once
+
+#include "triggers.h"
+
+class CTriggerBombReset: public CBaseTrigger
+{
+public:
+	virtual void Spawn();
+	virtual void Touch(CBaseEntity *pOther);
+};

regamedll/dlls/player.cpp

@@ -8028,6 +8028,7 @@ CBaseEntity *EXT_FUNC CBasePlayer::__API_HOOK(DropPlayerItem)(const char *pszIte
 			pWeaponBox->m_bIsBomb = true;
 			pWeaponBox->SetThink(&CWeaponBox::BombThink);
 			pWeaponBox->pev->nextthink = gpGlobals->time + 1.0f;
+			pWeaponBox->SetLastValidHeldC4Position(((CC4 *)pWeapon)->GetLastValidHeldPosition());
 
 			if (TheCSBots())
 			{

regamedll/dlls/weapons.cpp

@@ -2181,6 +2181,24 @@ void CWeaponBox::SetObjectCollisionBox()
 	pev->absmax = pev->origin + Vector(16, 16, 16);
 }
 
+void CWeaponBox::ResetToLastValidPlayerHeldC4Position()
+{
+	if (pev->origin == m_vecLastValidPlayerHeldC4Position)
+	{
+		return;
+	}
+
+	Vector const vecResetPos = m_vecLastValidPlayerHeldC4Position + Vector(0.0f, 0.0f, 8.0f);
+	Vector const angResetAng = Vector(0.0f, RANDOM_FLOAT(0.0f, 360.0f), 0.0f);
+
+	// Teleport
+	pev->velocity = Vector(0.0f, 0.0f, 0.0f);
+	pev->movetype = MOVETYPE_NONE;
+	pev->flags |= FL_ONGROUND;
+	pev->angles = angResetAng;
+	UTIL_SetOrigin(pev, vecResetPos);
+}
+
 char *CArmoury::m_ItemModels[] = {
 	"models/w_mp5.mdl",
 	"models/w_tmp.mdl",

regamedll/dlls/weapons.h

@@ -483,6 +483,9 @@ class CWeaponBox: public CBaseEntity
 	void SetModel_OrigFunc(const char *pszModelName);
 #endif
 
+	void SetLastValidHeldC4Position(const Vector &vecPositon) { m_vecLastValidPlayerHeldC4Position = vecPositon; }
+	void ResetToLastValidPlayerHeldC4Position();
+
 public:
 	static TYPEDESCRIPTION m_SaveData[];
 
@@ -491,6 +494,9 @@ class CWeaponBox: public CBaseEntity
 	int m_rgAmmo[MAX_AMMO_SLOTS];
 	int m_cAmmoTypes;
 	bool m_bIsBomb;
+
+private:
+	Vector m_vecLastValidPlayerHeldC4Position;
 };
 
 
@@ -843,6 +849,7 @@ class CAWP: public CBasePlayerWeapon
 
 const float C4_MAX_SPEED      = 250.0f;
 const float C4_ARMING_ON_TIME = 3.0f;
+constexpr float WEAPON_C4_UPDATE_LAST_VALID_PLAYER_HELD_POSITION_INTERVAL = 0.2f;
 
 enum c4_e
 {
@@ -862,6 +869,8 @@ class CC4: public CBasePlayerWeapon
 	virtual int GetItemInfo(ItemInfo *p);
 	virtual BOOL Deploy();
 	virtual void Holster(int skiplocal);
+	virtual void AttachToPlayer(CBasePlayer* pPlayer);
+	virtual void Think();
 	virtual float GetMaxSpeed();
 	virtual int iItemSlot() { return C4_SLOT; }
 	virtual void PrimaryAttack();
@@ -875,13 +884,16 @@ class CC4: public CBasePlayerWeapon
 	#endif
 	}
 
+	Vector GetLastValidHeldPosition() const { return m_vecLastValidPlayerHeldPosition; }
+
 public:
 	bool m_bStartedArming;
 	bool m_bBombPlacedAnimation;
 	float m_fArmedTime;
 
 private:
 	bool m_bHasShield;
+	Vector m_vecLastValidPlayerHeldPosition;
 };
 
 

regamedll/dlls/wpn_shared/wpn_c4.cpp

@@ -382,3 +382,37 @@ float CC4::GetMaxSpeed()
 
 	return C4_MAX_SPEED;
 }
+
+void CC4::AttachToPlayer(CBasePlayer* pPlayer)
+{
+	CBasePlayerWeapon::AttachToPlayer(pPlayer);
+
+#ifdef REGAMEDLL_ADD
+	SetThink(&CC4::Think);
+	pev->nextthink = gpGlobals->time + WEAPON_C4_UPDATE_LAST_VALID_PLAYER_HELD_POSITION_INTERVAL;
+
+	if (pPlayer->IsPlayer() && pPlayer->IsAlive())
+	{
+		entvars_t* pevPlayer = pPlayer->pev;
+		m_vecLastValidPlayerHeldPosition = pevPlayer->origin + pevPlayer->mins;
+	}
+#endif
+}
+
+void CC4::Think()
+{
+#ifdef REGAMEDLL_ADD
+	pev->nextthink = gpGlobals->time + WEAPON_C4_UPDATE_LAST_VALID_PLAYER_HELD_POSITION_INTERVAL;
+
+	// If the bomb is held by an alive player standing on the ground, then we can use this
+	// position as the last known valid position to respawn the bomb if it gets reset.
+
+	if (m_pPlayer && m_pPlayer->IsPlayer() && m_pPlayer->IsAlive() && (m_pPlayer->pev->flags & FL_ONGROUND))
+	{
+		entvars_t* pevPlayer = m_pPlayer->pev;
+		m_vecLastValidPlayerHeldPosition = pevPlayer->origin + pevPlayer->mins;
+	}
+#else
+	CBasePlayerWeapon::Think();
+#endif
+}

regamedll/extra/Toolkit/GameDefinitionFile/regamedll-cs.fgd

@@ -2272,6 +2272,10 @@
 	]
 ]
 
+@SolidClass base(Trigger) = trigger_bomb_reset  : "Trigger bomb reset" 
+[
+]
+
 // Function entities
 @SolidClass = func_bomb_target : "Bomb target zone"
 [

regamedll/msvc/ReGameDLL.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug Play|Win32">
@@ -25,6 +25,7 @@
   <ItemGroup>
     <ClCompile Include="..\dlls\addons\item_airbox.cpp" />
     <ClCompile Include="..\dlls\addons\point_command.cpp" />
+    <ClCompile Include="..\dlls\addons\trigger_bomb_reset.cpp" />
     <ClCompile Include="..\dlls\addons\trigger_random.cpp" />
     <ClCompile Include="..\dlls\addons\trigger_setorigin.cpp" />
     <ClCompile Include="..\dlls\airtank.cpp" />
@@ -616,6 +617,7 @@
     <ClInclude Include="..\dlls\activity.h" />
     <ClInclude Include="..\dlls\addons\item_airbox.h" />
     <ClInclude Include="..\dlls\addons\point_command.h" />
+    <ClInclude Include="..\dlls\addons\trigger_bomb_reset.h" />
     <ClInclude Include="..\dlls\addons\trigger_random.h" />
     <ClInclude Include="..\dlls\addons\trigger_setorigin.h" />
     <ClInclude Include="..\dlls\airtank.h" />

regamedll/msvc/ReGameDLL.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="engine">
@@ -549,6 +549,9 @@
     <ClCompile Include="..\dlls\addons\point_command.cpp">
       <Filter>dlls\addons</Filter>
     </ClCompile>
+    <ClCompile Include="..\dlls\addons\trigger_bomb_reset.cpp">
+      <Filter>dlls\addons</Filter>
+    </ClCompile>
     <ClCompile Include="..\public\FileSystem.cpp">
       <Filter>public</Filter>
     </ClCompile>
@@ -1049,5 +1052,8 @@
     <ClInclude Include="..\dlls\addons\point_command.h">
       <Filter>dlls\addons</Filter>
     </ClInclude>
+    <ClInclude Include="..\dlls\addons\trigger_bomb_reset.h">
+      <Filter>dlls\addons</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

regamedll/public/regamedll/API/CSInterfaces.h

@@ -213,6 +213,7 @@ class CCSChangeLevel: public CCSTrigger {};
 class CCSLadder: public CCSTrigger {};
 class CCSTriggerPush: public CCSTrigger {};
 class CCSTriggerTeleport: public CCSTrigger {};
+class CCSTriggerBombReset: public CCSTrigger {};
 class CCSBuyZone: public CCSTrigger {};
 class CCSBombTarget: public CCSTrigger {};
 class CCSHostageRescue: public CCSTrigger {};

regamedll/regamedll/dlls.h

@@ -134,6 +134,7 @@ using FloatRef = float;
 #include "addons/trigger_setorigin.h"
 #include "addons/trigger_random.h"
 #include "addons/point_command.h"
+#include "addons/trigger_bomb_reset.h"
 
 // Tutor
 #include "tutor.h"