From 36c8e753e7767d3913a26d2133ea50bf760d089f Mon Sep 17 00:00:00 2001 From: Space V <40030799+spacevx@users.noreply.github.com> Date: Thu, 12 Nov 2026 23:11:15 +0100 Subject: [PATCH 1/3] Trigger, SetHealth and scripted_scene fixes like GMod --- Game.Server/AI_BaseNPC.cs | 11 ++ Game.Server/BaseCombatCharacter.cs | 7 ++ Game.Server/BaseEntity.cs | 2 +- Game.Server/FuncBreak.cs | 1 + Game.Server/Player.cs | 39 +++++++ Game.Server/Props.cs | 1 + Game.Server/SceneEntity.cs | 168 ++++++++++++++++++++++++++- Game.Server/TriggerPlayerMovement.cs | 47 ++++++++ Game.Server/Triggers.cs | 29 +++++ Game.Shared/BaseEntityShared.cs | 7 ++ Source.Engine/Host.cs | 2 +- 11 files changed, 309 insertions(+), 5 deletions(-) diff --git a/Game.Server/AI_BaseNPC.cs b/Game.Server/AI_BaseNPC.cs index da8c30ede..b974463fe 100644 --- a/Game.Server/AI_BaseNPC.cs +++ b/Game.Server/AI_BaseNPC.cs @@ -379,9 +379,20 @@ public static ReadOnlySpan GetActivityName(Activity actID) { DEFINE.FIELD(nameof(DidDeathCleanup), FieldType.Boolean), DEFINE.OUTPUT(nameof(OnDeath), "OnDeath", eventFuncs), DEFINE.OUTPUT(nameof(OnDenyCommanderUse), "OnDenyCommanderUse", eventFuncs), + + DEFINE.INPUTFUNC(FieldType.Integer, "SetHealth", nameof(InputSetHealth), (INPUTFUNCPTR)((self, data) => ((AI_BaseNPC)self).InputSetHealth(data))), ]); public override DataMap? GetDataDescMap() => DataDesc; + public void InputSetHealth(InputData inputdata) { + int newHealth = inputdata.Value.Int(); + int delta = Math.Abs(GetHealth() - newHealth); + if (newHealth > GetHealth()) + TakeHealth(delta, DamageType.Generic); + else if (newHealth < GetHealth()) + TakeDamage(new TakeDamageInfo(this, this, delta, DamageType.Generic)); + } + [NetworkVar("m_bPerformAvoidance")] public partial bool PerformAvoidance { get; set; } [NetworkVar("m_bIsMoving")] diff --git a/Game.Server/BaseCombatCharacter.cs b/Game.Server/BaseCombatCharacter.cs index ee5a9f599..edea5b0ca 100644 --- a/Game.Server/BaseCombatCharacter.cs +++ b/Game.Server/BaseCombatCharacter.cs @@ -76,6 +76,13 @@ public BaseCombatCharacter() { public bool ForceServerRagdoll; + public override int TakeHealth(float health, DamageType damageType) { + if (m_takedamage == 0) + return 0; + + return base.TakeHealth(health, damageType); + } + public virtual Source.Common.Mathematics.QAngle BodyAngles() => GetAbsAngles(); public virtual Vector3 BodyDirection2D() { diff --git a/Game.Server/BaseEntity.cs b/Game.Server/BaseEntity.cs index e6c7dfc12..9f16e637c 100644 --- a/Game.Server/BaseEntity.cs +++ b/Game.Server/BaseEntity.cs @@ -2060,7 +2060,7 @@ public float HealthFraction() { return fraction; } - public int TakeHealth(float health, DamageType damageType) { + public virtual int TakeHealth(float health, DamageType damageType) { if (Edict() == null || (Damage)m_takedamage < Damage.Yes) return 0; diff --git a/Game.Server/FuncBreak.cs b/Game.Server/FuncBreak.cs index 93ffc890b..6f6bf4056 100644 --- a/Game.Server/FuncBreak.cs +++ b/Game.Server/FuncBreak.cs @@ -7,6 +7,7 @@ namespace Game.Server; [LinkEntityToClass("func_breakable")] public class Breakable : BaseEntity, IBreakableWithPropData { + // todo: SetHealth/AddHealth/RemoveHealth inputs, they need UpdateHealth, OnHealthChanged and Break ported first public void SetDmgModBullet(float dmgMod) => DmgModBullet = dmgMod; public void SetDmgModClub(float dmgMod) => DmgModClub = dmgMod; public void SetDmgModExplosive(float dmgMod) => DmgModExplosive = dmgMod; diff --git a/Game.Server/Player.cs b/Game.Server/Player.cs index ab490e26e..4d888fbc8 100644 --- a/Game.Server/Player.cs +++ b/Game.Server/Player.cs @@ -268,6 +268,37 @@ public void SetArmorValue(int value) { } } + public static readonly new DataMap DataDesc = new(typeof(BasePlayer), BaseCombatCharacter.DataDesc, [ + DEFINE.INPUTFUNC(FieldType.Integer, "SetHealth", nameof(InputSetHealth), (INPUTFUNCPTR)((self, data) => ((BasePlayer)self).InputSetHealth(data))), + ]); + public override DataMap? GetDataDescMap() => DataDesc; + + public override int TakeHealth(float health, DamageType damageType) { +#if !GMOD_DLL + if (!IsAlive()) + return 0; +#endif + if (m_takedamage != 0) { + DamageType bitsDmgTimeBased = g_pGameRules.Damage_GetTimeBased(); + bitsDamageType &= ~(damageType & ~bitsDmgTimeBased); + } + + return base.TakeHealth(health, damageType); + } + + public void InputSetHealth(InputData inputdata) { + int newHealth = inputdata.Value.Int(); + int delta = Math.Abs(GetHealth() - newHealth); + if (newHealth > GetHealth()) + TakeHealth(delta, DamageType.Generic); + else if (newHealth < GetHealth()) { + int armor = ArmorValue; + ArmorValue = 0; + TakeDamage(new TakeDamageInfo(this, this, delta, DamageType.Generic)); + ArmorValue = armor; + } + } + static InlineArray1024 InfoBuffer; public ReadOnlySpan GetInfo(ReadOnlySpan name) { @@ -696,6 +727,14 @@ public void UnforceButtons(InButtons buttons) { AfButtonForced &= ~buttons; } + public void DisableButtons(InButtons buttons) { + AfButtonDisabled |= buttons; + } + + public void EnableButtons(InButtons buttons) { + AfButtonDisabled &= ~buttons; + } + public bool GamePaused; public virtual void EquipSuit(bool playEffects = false) { diff --git a/Game.Server/Props.cs b/Game.Server/Props.cs index bc105b892..22053b05d 100644 --- a/Game.Server/Props.cs +++ b/Game.Server/Props.cs @@ -59,6 +59,7 @@ public void ParsePropData() { } [NetworkName("CBreakableProp")] public partial class BreakableProp : BaseProp, IBreakableWithPropData, IPlayerPickupVPhysics { + // todo: SetHealth/AddHealth/RemoveHealth inputs, they need UpdateHealth, OnHealthChanged and Break ported first [NetworkTable] public static readonly new NetworkProp[] Props = [ ]; diff --git a/Game.Server/SceneEntity.cs b/Game.Server/SceneEntity.cs index 89435a593..94c6b62ca 100644 --- a/Game.Server/SceneEntity.cs +++ b/Game.Server/SceneEntity.cs @@ -541,6 +541,13 @@ public struct SpeakEventSound DEFINE.INPUTFUNC(FieldType.Float, "PitchShift", nameof(InputPitchShiftPlayback), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputPitchShiftPlayback(data))), DEFINE.INPUTFUNC(FieldType.Void, "StopWaitingForActor", nameof(InputStopWaitingForActor), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputStopWaitingForActor(data))), DEFINE.INPUTFUNC(FieldType.Integer, "Trigger", nameof(InputTriggerEvent), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputTriggerEvent(data))), + // todo: InterjectResponse input, it needs the response system (CAI_BaseActor::SpeakFindResponse/SpeakDispatchResponse) ported first +#if GMOD_DLL + DEFINE.INPUTFUNC(FieldType.String, "SetTarget1", nameof(InputSetTarget1), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputSetTarget1(data))), + DEFINE.INPUTFUNC(FieldType.String, "SetTarget2", nameof(InputSetTarget2), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputSetTarget2(data))), + DEFINE.INPUTFUNC(FieldType.String, "SetTarget3", nameof(InputSetTarget3), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputSetTarget3(data))), + DEFINE.INPUTFUNC(FieldType.String, "SetTarget4", nameof(InputSetTarget4), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputSetTarget4(data))), +#endif DEFINE.KEYFIELD(nameof(PlayerDeathBehavior), FieldType.Integer, "onplayerdeath"), DEFINE.INPUTFUNC(FieldType.Void, "ScriptPlayerDeath", nameof(InputScriptPlayerDeath), (INPUTFUNCPTR)((self, data) => ((SceneEntity)self).InputScriptPlayerDeath(data))), @@ -718,7 +725,151 @@ public override void UpdateOnRemove() { GetSceneManager()?.RemoveSceneEntity(this); } - ChoreoScene? GenerateSceneForSound(BaseFlex? flexActor, ReadOnlySpan soundname) => throw new NotImplementedException(); + ChoreoScene? GenerateSceneForSound(BaseFlex? flexActor, ReadOnlySpan soundname) { + float duration = GetSoundDuration(soundname, flexActor != null ? flexActor.GetModelName() : null); + if (duration <= 0.0f) { + Warning($"CSceneEntity::GenerateSceneForSound: Couldn't determine duration of {soundname}\n"); + return null; + } + + ChoreoScene scene = new(this); + scene.SetPrintFunc(Scene_Printf); + + ChoreoActor actor = scene.AllocActor(); + ChoreoChannel channel = scene.AllocChannel(); + ChoreoEvent ev = scene.AllocEvent(); + + actor.SetName("!self"); + actor.SetActive(true); + + channel.SetName(SceneFile); + channel.SetActor(actor); + + actor.AddChannel(channel); + + ev.SetType(EventType.Speak); + ev.SetName(soundname); + ev.SetParameters(soundname); + ev.SetStartTime(0.0f); + ev.SetUsingRelativeTag(false); + ev.SetEndTime(duration); + ev.SnapTimes(); + + channel.AddEvent(ev); + + ev.SetChannel(channel); + ev.SetActor(actor); + + return scene; + } + + public void PrecacheScene(ChoreoScene scene) { + Assert(scene != null); + + for (int i = 0; i < scene.GetNumEvents(); i++) { + ChoreoEvent? ev = scene.GetEvent(i); + if (ev == null) + continue; + + switch (ev.GetType()) { + default: + break; + case EventType.Speak: + PrecacheScriptSound(ev.GetParameters()); + // todo: precache the close caption token sound of CC_MASTER events with slaves once ChoreoEvent has close captions + break; + case EventType.SubScene: + if (!scene.IsSubScene()) { + ChoreoScene? subscene = ev.GetSubScene(); + if (subscene == null) { + subscene = LoadScene(ev.GetParameters(), this); + if (subscene == null) + break; + subscene.SetSubScene(true); + ev.SetSubScene(subscene); + + PrecacheScene(subscene); + } + } + break; + } + } + } + + public override void OnRestore() { + base.OnRestore(); + + if (Pitch < SCENE_MIN_PITCH || Pitch > SCENE_MAX_PITCH) + Pitch = 1.0f; + + if (!IsPlayingBack) + return; + + if (Scene == null) { + Scene = LoadScene(SceneFile, this); + if (Scene == null) { + SceneMissing = true; + return; + } + + OnLoaded(); + + if (ShouldNetwork()) + SceneStringIndex = g_pStringTableClientSideChoreoScenes!.AddString(IsServer(), SceneFile); + + UpdateTransmitState(); + } + + SceneMissing = false; + + for (int i = 0; i < Scene.GetNumActors(); i++) { + BaseFlex? testActor = FindNamedActor(i); + if (testActor == null) + continue; + + if (testActor.MyCombatCharacterPointer() == null) + continue; + + testActor.StartChoreoScene(Scene); + } + + TimeUnit_t dt = SCENE_THINK_INTERVAL; + + bool paused = Paused; + + Paused = false; + + Scene.ResetSimulation(true, (float)(CurrentTime - SCENE_THINK_INTERVAL), (float)CurrentTime); + Scene.SetTime(CurrentTime - SCENE_THINK_INTERVAL); + + SetCurrentTime(CurrentTime, true); + + SetRestoring(true); + + DoThink(dt); + + SetRestoring(false); + + if (paused) + PausePlayback(); + + NetworkProp().NetworkStateForceUpdate(); + } + +#if GMOD_DLL + void SetTargetFromInput(ref string? target, ref EHANDLE handle, in InputData inputdata) { + ReadOnlySpan value = inputdata.Value.String(); + target = value.IsEmpty ? null : new string(value); + ActorList.Clear(); + NetworkProp().NetworkStateForceUpdate(); + handle.Set(FindNamedTarget(target, false)); + } + + public void InputSetTarget1(InputData inputdata) => SetTargetFromInput(ref Target1, ref HTarget1, in inputdata); + public void InputSetTarget2(InputData inputdata) => SetTargetFromInput(ref Target2, ref HTarget2, in inputdata); + public void InputSetTarget3(InputData inputdata) => SetTargetFromInput(ref Target3, ref HTarget3, in inputdata); + public void InputSetTarget4(InputData inputdata) => SetTargetFromInput(ref Target4, ref HTarget4, in inputdata); +#endif public override void Activate() { if (Generated && Scene == null) @@ -1330,8 +1481,19 @@ public virtual void PitchShiftPlayback(float fPitch) { } public virtual void QueueResumePlayback() { - if (!string.IsNullOrEmpty(ResumeSceneFile)) - throw new NotImplementedException(); + if (!string.IsNullOrEmpty(ResumeSceneFile)) { + bool startedScene = false; + + if (!stristr(ResumeSceneFile, ".vcd").IsEmpty) + startedScene = InstancedScriptedScene(null, ResumeSceneFile, ref WaitingForThisResumeScene, 0, false) != 0; + + // todo: if no scene started, find a response for the first actor (CAI_BaseActor::SpeakFindResponse) and play it, once the response system is ported + + if (startedScene) + WaitingForResumeScene = true; + else + ResumePlayback(); + } else ResumePlayback(); } diff --git a/Game.Server/TriggerPlayerMovement.cs b/Game.Server/TriggerPlayerMovement.cs index ebd71e634..3c1ae1959 100644 --- a/Game.Server/TriggerPlayerMovement.cs +++ b/Game.Server/TriggerPlayerMovement.cs @@ -1,4 +1,5 @@ using Source.Common; +using Source.Common.Engine; using Source; using Game.Shared; using System.Numerics; @@ -17,6 +18,10 @@ public enum SF { MoveAutoDisable = 0x80, // disable auto movement AutoDuck = 0x800, // Duck automatically +#if GMOD_DLL + AutoWalk = 0x1000, + DisableJump = 0x2000, +#endif } //----------------------------------------------------------------------------- @@ -32,7 +37,21 @@ public override void Spawn() { base.Spawn(); InitTrigger(); + +#if GMOD_DLL + if (HasSpawnFlags(SF.AutoDuck) || HasSpawnFlags(SF.AutoWalk) || HasSpawnFlags(SF.DisableJump)) { + ClientSidePredicted = true; + SetTransmitState(EdictFlags.Always); + } +#endif + } + +#if GMOD_DLL + public override void UpdateOnRemove() { + EndTouchOnAllTouchers(); + base.UpdateOnRemove(); } +#endif // UNDONE: This will not support a player touching more than one of these // UNDONE: Do we care? If so, ref count automovement in the player? @@ -40,6 +59,10 @@ public override void StartTouch(BaseEntity? other) { if (other == null || !PassesTriggerFilters(other)) return; +#if GMOD_DLL + base.StartTouch(other); +#endif + BasePlayer? player = ToBasePlayer(other); if (player == null) @@ -48,12 +71,26 @@ public override void StartTouch(BaseEntity? other) { if (HasSpawnFlags(SF.AutoDuck)) player.ForceButtons(InButtons.Duck); +#if GMOD_DLL + if (HasSpawnFlags(SF.AutoWalk)) { + player.ForceButtons(InButtons.Walk); + player.DisableButtons(InButtons.Speed); + } + + if (HasSpawnFlags(SF.DisableJump)) + player.DisableButtons(InButtons.Jump); +#endif + // UNDONE: Currently this is the only operation this trigger can do if (HasSpawnFlags(SF.MoveAutoDisable)) player.Local.AllowAutoMovement = false; } public override void EndTouch(BaseEntity? other) { +#if GMOD_DLL + base.EndTouch(other); +#endif + if (other == null || !PassesTriggerFilters(other)) return; @@ -65,6 +102,16 @@ public override void EndTouch(BaseEntity? other) { if (HasSpawnFlags(SF.AutoDuck)) player.UnforceButtons(InButtons.Duck); +#if GMOD_DLL + if (HasSpawnFlags(SF.AutoWalk)) { + player.UnforceButtons(InButtons.Walk); + player.EnableButtons(InButtons.Speed); + } + + if (HasSpawnFlags(SF.DisableJump)) + player.EnableButtons(InButtons.Jump); +#endif + if (HasSpawnFlags(SF.MoveAutoDisable)) player.Local.AllowAutoMovement = true; } diff --git a/Game.Server/Triggers.cs b/Game.Server/Triggers.cs index 8f302a349..b8a3b19b2 100644 --- a/Game.Server/Triggers.cs +++ b/Game.Server/Triggers.cs @@ -167,6 +167,9 @@ public virtual void InputDisable(InputData inputdata) { // turn off this trigger //------------------------------------------------------------------------------ public virtual void InputDisableAndEndTouch(InputData inputdata) { +#if GMOD_DLL + EndTouchOnAllTouchers(); +#else for (int i = TouchingEntities.Count - 1; i >= 0; i--) { BaseEntity? touching = (BaseEntity?)TouchingEntities[i].Get(); if (touching != null) @@ -175,8 +178,23 @@ public virtual void InputDisableAndEndTouch(InputData inputdata) { TouchingEntities.RemoveAt(i); } + Disable(); +#endif + } + +#if GMOD_DLL + public void EndTouchOnAllTouchers() { + while (TouchingEntities.Count > 0) { + BaseEntity? touching = (BaseEntity?)TouchingEntities[^1].Get(); + if (touching != null) + EndTouch(touching); + else + TouchingEntities.RemoveAt(TouchingEntities.Count - 1); + } + Disable(); } +#endif public virtual void InputTouchTest(InputData inputdata) { TouchTest(); @@ -602,6 +620,17 @@ public override void UpdateOnRemove() { base.UpdateOnRemove(); } +#if GMOD_DLL + public override bool KeyValue(ReadOnlySpan keyName, ReadOnlySpan value) { + if (FStrEq(keyName, "damagetype")) { + BitsDamageInflict = atoi(value); + return true; + } + + return base.KeyValue(keyName, value); + } +#endif + //----------------------------------------------------------------------------- // Purpose: Called when spawning, after keyvalues have been handled. //----------------------------------------------------------------------------- diff --git a/Game.Shared/BaseEntityShared.cs b/Game.Shared/BaseEntityShared.cs index c6489c091..796832ab3 100644 --- a/Game.Shared/BaseEntityShared.cs +++ b/Game.Shared/BaseEntityShared.cs @@ -801,6 +801,13 @@ internal static short PrecacheScriptSound(ReadOnlySpan sound) { public static void PrefetchScriptSound(ReadOnlySpan soundname) => g_SoundEmitterSystem.PrefetchScriptSound(soundname); + public static float GetSoundDuration(ReadOnlySpan soundname, ReadOnlySpan actormodel) { + ReadOnlySpan wavname = !stristr(soundname, ".wav").IsEmpty || !stristr(soundname, ".mp3").IsEmpty + ? soundname + : soundemitterbase.GetWavFileForSound(soundname, actormodel); + return (float)enginesound.GetSoundDuration(SoundCharsUtils.SkipSoundChars(wavname)); + } + public static bool PrecacheSound(ReadOnlySpan name) { #if GAME_DLL if (!IsPrecacheAllowed()) diff --git a/Source.Engine/Host.cs b/Source.Engine/Host.cs index 94fac476f..bee23c953 100644 --- a/Source.Engine/Host.cs +++ b/Source.Engine/Host.cs @@ -649,7 +649,7 @@ public void WriteConfiguration(ReadOnlySpan filename = default, bool allVa if (configBuff.Length == 0) return; - // TODO: see if we are doing the steam cloud logic + // todo: see if we are doing the steam cloud logic fileSystem.WriteFile(fileName, "MOD", Encoding.UTF8.GetBytes(configBuff.ToString())); ConMsg($"Host_WriteConfiguration: Wrote {fileName}\n"); From 1dba6ed3cb7270dd0d6afaaa50878b54f0fe8689 Mon Sep 17 00:00:00 2001 From: Space V <40030799+spacevx@users.noreply.github.com> Date: Fri, 13 Nov 2026 01:09:16 +0100 Subject: [PATCH 2/3] Remove IsAlive check from player TakeHealth --- Game.Server/Player.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Game.Server/Player.cs b/Game.Server/Player.cs index 4d888fbc8..7714fd1b2 100644 --- a/Game.Server/Player.cs +++ b/Game.Server/Player.cs @@ -274,10 +274,6 @@ public void SetArmorValue(int value) { public override DataMap? GetDataDescMap() => DataDesc; public override int TakeHealth(float health, DamageType damageType) { -#if !GMOD_DLL - if (!IsAlive()) - return 0; -#endif if (m_takedamage != 0) { DamageType bitsDmgTimeBased = g_pGameRules.Damage_GetTimeBased(); bitsDamageType &= ~(damageType & ~bitsDmgTimeBased); From 38e2d8128894c156eec1d1856612d778a8a7b01a Mon Sep 17 00:00:00 2001 From: Space V <40030799+spacevx@users.noreply.github.com> Date: Fri, 13 Nov 2026 01:20:28 +0100 Subject: [PATCH 3/3] Use PVSCheck transmit state for trigger_playermovement --- Game.Server/TriggerPlayerMovement.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Game.Server/TriggerPlayerMovement.cs b/Game.Server/TriggerPlayerMovement.cs index 3c1ae1959..8c95d293c 100644 --- a/Game.Server/TriggerPlayerMovement.cs +++ b/Game.Server/TriggerPlayerMovement.cs @@ -41,7 +41,7 @@ public override void Spawn() { #if GMOD_DLL if (HasSpawnFlags(SF.AutoDuck) || HasSpawnFlags(SF.AutoWalk) || HasSpawnFlags(SF.DisableJump)) { ClientSidePredicted = true; - SetTransmitState(EdictFlags.Always); + SetTransmitState(EdictFlags.PVSCheck); } #endif }