TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 12:14:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1643 from Azaezel/dmUI
Some checks failed
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
Details
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
Details
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Details

Browse source 
offload weapon/ammo counter update commands to the generic damagemodel
This commit is contained in:
Brian Roberts 2026-01-11 11:18:29 -06:00 committed by GitHub
parent 62ab78cb55 235be5eccd
commit f2a5b06803
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Templates/BaseGame/game/data/DamageModel/DamageModel.module
View file

@ -5,7 +5,6 @@
scriptFile="DamageModel.tscript"
CreateFunction="onCreate"
DestroyFunction="onDestroy"
Group="Game"
Dependencies="UI=1">
<DeclaredAssets
Extension="asset.taml"

2
Templates/BaseGame/game/data/DamageModel/DamageModel.tscript
View file

@ -23,6 +23,7 @@ function DamageModel::onCreateGameServer(%this)
%this.queueExec("./scripts/server/shapeBase");
%this.queueExec("./scripts/server/vehicle");
%this.queueExec("./scripts/server/player");
%this.queueExec("./scripts/server/commands");
}
//This is called when the server is shut down due to the game/map being exited
@ -35,6 +36,7 @@ function DamageModel::initClient(%this)
{
%this.queueExec("./guis/damageGuiOverlay.gui");
%this.queueExec("./scripts/client/playGui");
%this.queueExec("./scripts/client/client");
}
//This is called when a client connects to a server

67
Templates/BaseGame/game/data/DamageModel/scripts/client/client.tscript Normal file
View file

@ -0,0 +1,67 @@
// ----------------------------------------------------------------------------
// WeaponHUD
// ----------------------------------------------------------------------------
// Update the Ammo Counter with current ammo, if not any then hide the counter.
function clientCmdSetAmmoAmountHud(%amount, %amountInClips)
{
if (!%amount)
AmmoAmount.setVisible(false);
else
{
AmmoAmount.setVisible(true);
AmmoAmount.setText("Ammo: " @ %amount @ "/" @ %amountInClips);
}
}
// Here we update the Weapon Preview image & reticle for each weapon. We also
// update the Ammo Counter (just so we don't have to call it separately).
// Passing an empty parameter ("") hides the HUD component.
function clientCmdRefreshWeaponHUD(%amount, %preview, %ret, %zoomRet, %amountInClips)
{
if (!%amount)
AmmoAmount.setVisible(false);
else
{
AmmoAmount.setVisible(true);
AmmoAmount.setText("Ammo: " @ %amount @ "/" @ %amountInClips);
}
if (%preview $= "" || detag(%preview) $= "blank")
{
WeaponHUD.setVisible(false);
PreviewImage.setBitmap("");
}
else
{
WeaponHUD.setVisible(true);
PreviewImage.setbitmap(detag(%preview));
}
if (%ret $= "" || detag(%ret) $= "blank")
{
Reticle.setVisible(false);
Reticle.setBitmap("");
}
else
{
Reticle.setVisible(true);
Reticle.setbitmap(detag(%ret));
}
if (isObject(ZoomReticle) || detag(%zoomRet) $= "blank")
{
if (%zoomRet $= "" || detag(%zoomRet) $= "blank")
{
ZoomReticle.setVisible(false);
ZoomReticle.setBitmap("");
}
else
{
ZoomReticle.setVisible(true);
ZoomReticle.setBitmap(detag(%zoomRet));
}
}
}

12
Templates/BaseGame/game/data/DamageModel/scripts/server/commands.tscript Normal file
View file

@ -0,0 +1,12 @@
// ----------------------------------------------------------------------------
// weapon HUD
// ----------------------------------------------------------------------------
function GameConnection::setAmmoAmountHud(%client, %amount, %amountInClips )
{
commandToClient(%client, 'SetAmmoAmountHud', %amount, %amountInClips);
}
function GameConnection::RefreshWeaponHud(%client, %amount, %preview, %ret, %zoomRet, %amountInClips)
{
commandToClient(%client, 'RefreshWeaponHud', %amount, %preview, %ret, %zoomRet, %amountInClips);
}