Skip to content

Work in progress #176

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

Draft
OskarPedersen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Work in progress #176

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
2 changes: 2 additions & 0 deletions src/rwe/LoadingScene_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ namespace rwe
weaponDefinition.burstInterval = SimScalar(tdf.burstRate);
weaponDefinition.sprayAngle = SimAngle(tdf.sprayAngle);

weaponDefinition.energyPerShot = Energy(tdf.energyPerShot);

if (tdf.tracks)
{
weaponDefinition.physicsType = ProjectilePhysicsTypeTracking{SimScalar(tdf.turnRate)};
Expand Down
2 changes: 2 additions & 0 deletions src/rwe/sim/UnitBehaviorService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,8 @@ namespace rwe

sim->events.push_back(FireWeaponEvent{weapon->weaponType, fireInfo->burstsFired, firingPoint});

sim->addResourceDelta(id, -weaponDefinition.energyPerShot, Metal(0));

// If we just started the burst, set the reload timer
if (fireInfo->burstsFired == 0)
{
Expand Down
3 changes: 3 additions & 0 deletions src/rwe/sim/WeaponDefinition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <optional>
#include <rwe/sim/Energy.h>
#include <rwe/sim/GameTime.h>
#include <rwe/sim/ProjectilePhysicsType.h>
#include <rwe/sim/SimAngle.h>
Expand Down Expand Up @@ -48,5 +49,7 @@ namespace rwe

/** If true, projectile does not explode when hitting the ground but instead continues travelling. */
bool groundBounce;

Energy energyPerShot;
};
}