From b8d3a357428d3af09031d2ae8925e1c2e93810ba Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 31 Dec 2022 16:26:25 +0100 Subject: Added rounds and reload time to turrets to enable burst weapons --- universe/include/kurator/universe/TurretType.h | 12 +++++++----- universe/src/SampleRepository.cpp | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'universe') diff --git a/universe/include/kurator/universe/TurretType.h b/universe/include/kurator/universe/TurretType.h index ff67cfe..553894b 100644 --- a/universe/include/kurator/universe/TurretType.h +++ b/universe/include/kurator/universe/TurretType.h @@ -12,11 +12,13 @@ namespace universe struct TurretType { std::string name; - double base_damage; - double rate_of_fire; - double optimal_range; - double falloff_modifier; - double falloff_intensity; + int rounds = 1; + double base_damage = 0.0; + double rate_of_fire = 1.0; + double reload = 0.0; + double optimal_range = 0.0; + double falloff_modifier = 0.05; + double falloff_intensity = 0.2; double effective_damage(double distance) const; }; diff --git a/universe/src/SampleRepository.cpp b/universe/src/SampleRepository.cpp index 31f7807..857d175 100644 --- a/universe/src/SampleRepository.cpp +++ b/universe/src/SampleRepository.cpp @@ -23,7 +23,8 @@ static const std::unordered_map ships { static const std::unordered_map turrets { - {"ChargeLaser", {"ChargeLaser", 85.0, 4.5, 7000.0, 0.05, 0.2}}, + {"ChargeLaser", {"ChargeLaser", 1, 85.0, 4.5, 0.0, 7000.0, 0.05}}, + {"BurstLaser", {"BurstLaser", 3, 21.0, 0.25, 2.75, 3500.0, 0.05}}, }; -- cgit v1.1