func_breakable gib speed

Mikk155 · Aug 25, 2024 · b859030 · b859030
1 parent 19b5112
commit b859030
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/docs/src/sentences.json b/docs/src/sentences.json
@@ -1938,6 +1938,10 @@
 {
 "english": "Direction (Gibs Direction 2)"
 },
+"Breakable::direction_speed":
+{
+"english": "Direction speed"
+},
 "Breakable::delay":
 {
 "english": "Delay before fire"

diff --git a/src/data/base/Breakable.json b/src/data/base/Breakable.json
@@ -83,11 +83,17 @@
             "description": "Breakable::explosion::description"
         },
         "direction": {
-            "variable": "studio",
+            "variable": "vector",
             "value": "",
             "title": "Breakable::direction",
             "description": "Breakable::direction::description"
         },
+        "direction_speed": {
+            "variable": "float",
+            "value": "200",
+            "title": "Breakable::direction_speed",
+            "description": "Breakable::direction_speed::description"
+        },
         "delay": {
             "variable": "string",
             "value": "0",

diff --git a/src/game/server/entities/func_break.cpp b/src/game/server/entities/func_break.cpp
@@ -45,6 +45,13 @@ bool CBreakable::KeyValue(KeyValueData* pkvd)
 		UTIL_StringToVector(m_VecDirection, pkvd->szValue);
 		return true;
 	}
+	else if (FStrEq(pkvd->szKeyName, "direction_speed"))
+	{
+		m_DirectionSpeed = atoi( pkvd->szValue );
+		if( m_DirectionSpeed < 10 )
+			m_DirectionSpeed = 10;
+		return true;
+	}
 	else if (FStrEq(pkvd->szKeyName, "material"))
 	{
 		int i = atoi(pkvd->szValue);
@@ -101,6 +108,7 @@ DEFINE_FIELD(m_Material, FIELD_INTEGER),
 	DEFINE_FIELD(m_iszGibModel, FIELD_STRING),
 	DEFINE_FIELD(m_iszSpawnObject, FIELD_STRING),
 	DEFINE_FIELD(m_VecDirection, FIELD_VECTOR),
+	DEFINE_FIELD(m_DirectionSpeed, FIELD_FLOAT),
 	DEFINE_FUNCTION(BreakTouch),
 	DEFINE_FUNCTION(Die),
 
@@ -641,9 +649,9 @@ void CBreakable::Die()
 
 
 	if (m_Explosion == expDirected)
-		vecVelocity = -g_vecAttackDir * 200;
+		vecVelocity = -g_vecAttackDir * m_DirectionSpeed;
 	else if (m_Explosion == expSpecific)
-		vecVelocity = m_VecDirection * 200;
+		vecVelocity = m_VecDirection * m_DirectionSpeed;
 	else
 	{
 		vecVelocity.x = 0;

diff --git a/src/game/server/entities/func_break.h b/src/game/server/entities/func_break.h
@@ -98,4 +98,5 @@ class CBreakable : public CBaseDelay
 	string_t m_iszSpawnObject;
 
 	Vector m_VecDirection = g_vecZero;
+	float m_DirectionSpeed = 200;
 };