Skip to content

Create indexed TubeFiredN and sum TubeFired hardware variables for mi… #2813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CMDR-Vulkarius wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Open

Create indexed TubeFiredN and sum TubeFired hardware variables for mi… #2813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/missiletubes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class MissileTubes : public ShipSystem {
State state = State::Empty;
float delay = 0.0f;
int fire_count = 0;
int fired = 0;

bool canLoad(EMissileWeapons type) {
return (type_allowed_mask & (1 << type));
Expand Down
12 changes: 12 additions & 0 deletions src/hardware/hardwareController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

#include "hardwareMappingEffects.h"

#include <numeric>

HardwareController::~HardwareController()
{
for(HardwareOutputDevice* device : devices)
Expand Down Expand Up @@ -355,6 +357,14 @@ HardwareMappingEffect* HardwareController::createEffect(std::unordered_map<strin
return nullptr;
}

namespace
{
template <typename Container, typename Function> float SUM(Container items, Function func)
{
return static_cast<float>(std::transform_reduce(items.cbegin(), items.cend(), 0, std::plus{}, func));
}
}

#define SHIP_VARIABLE(name, COMP, formula) if (variable_name == name) { if (auto c = ship.getComponent<COMP>()) { value = (formula); return true; } return false; }
#define SHIP_VARIABLE2(name, formula) if (variable_name == name) { if (c) { value = (formula); return true; } return false; }
bool HardwareController::getVariableValue(string variable_name, float& value)
Expand Down Expand Up @@ -410,7 +420,9 @@ bool HardwareController::getVariableValue(string variable_name, float& value)
SHIP_VARIABLE("TubeLoading" + string(n), MissileTubes, c->mounts.size() > n && c->mounts[n].state == MissileTubes::MountPoint::State::Loading ? 1.0f : 0.0f);
SHIP_VARIABLE("TubeUnloading" + string(n), MissileTubes, c->mounts.size() > n && c->mounts[n].state == MissileTubes::MountPoint::State::Unloading ? 1.0f : 0.0f);
SHIP_VARIABLE("TubeFiring" + string(n), MissileTubes, c->mounts.size() > n && c->mounts[n].state == MissileTubes::MountPoint::State::Firing ? 1.0f : 0.0f);
SHIP_VARIABLE("TubeFired" + string(n), MissileTubes, c->mounts.size() > n ? static_cast<float>(c->mounts[n].fired) : 0.0f);
}
SHIP_VARIABLE("TubeFired", MissileTubes, SUM(c->mounts, [](const MissileTubes::MountPoint & tube){return tube.fired;}));
for(int n=0; n<ShipSystem::COUNT; n++)
{
auto c = ShipSystem::get(ship, static_cast<ShipSystem::Type>(n));
Expand Down
3 changes: 3 additions & 0 deletions src/systems/missilesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ void MissileSystem::update(float delta)
if (game_server)
{
spawnProjectile(entity, tube, 0, {});
tube.fired += 1;

tube.fire_count -= 1;
if (tube.fire_count > 0)
Expand Down Expand Up @@ -194,6 +195,7 @@ void MissileSystem::startLoad(sp::ecs::Entity source, MissileTubes::MountPoint&
if (tubes->storage[type] <= 0)
return;

tube.fired = 0;
tube.state = MissileTubes::MountPoint::State::Loading;
tube.delay = tube.load_time;
tube.type_loaded = type;
Expand Down Expand Up @@ -227,6 +229,7 @@ void MissileSystem::fire(sp::ecs::Entity source, MissileTubes::MountPoint& tube,
tube.delay = 0.0;
}else{
spawnProjectile(source, tube, target_angle, target);
tube.fired += 1;
tube.state = MissileTubes::MountPoint::State::Empty;
tube.type_loaded = MW_None;
}
Expand Down