Draft - Lib Component

engine/CMakeLists.txt

@@ -663,12 +663,17 @@ SET(LIBCOMPONENT
     src/components/component.cpp
     src/components/energy_types.cpp
 
+    src/components/armor.cpp
+    src/components/hull.cpp
+    src/components/shield.cpp
+
     src/components/afterburner.cpp
     src/components/cloak.cpp
     src/components/drive.cpp
     src/components/energy_consumer.cpp
     src/components/energy_container.cpp
     src/components/energy_manager.cpp
+    src/components/fuel.cpp
     src/components/jump_drive.cpp
     src/components/radar.cpp
     src/components/reactor.cpp
@@ -1639,6 +1644,7 @@ IF (USE_GTEST)
         src/exit_unit_tests.cpp
         src/components/tests/energy_container_tests.cpp
         src/components/tests/balancing_tests.cpp
+        src/components/tests/armor_tests.cpp
     )
 
     ADD_LIBRARY(vegastrike-testing

engine/src/cmd/ai/docking.cpp

@@ -206,7 +206,7 @@ bool DockingOps::DockToTarget(Unit *utdw) {
         if (physicallyDock) {
             return parent->Dock(utdw);
         } else {
-            utdw->energy_manager.Refill(EnergyType::SPEC);
+            utdw->ftl_energy.Refill();
             return true;
         }
     } else if (diss <= 1.2 * rad * rad) {
@@ -216,7 +216,7 @@ bool DockingOps::DockToTarget(Unit *utdw) {
             if (physicallyDock) {
                 return parent->Dock(utdw);
             } else {
-                parent->energy_manager.Refill(EnergyType::SPEC);
+                parent->ftl_energy.Refill();
                 return true;
             }
         }

engine/src/cmd/ai/firekeyboard.cpp

@@ -1731,7 +1731,7 @@ void FireKeyboard::Execute() {
 
     float f_result = f().shieldpowerstate;
     if (f_result != 1) {
-        parent->shield->AdjustPower(f_result);
+        parent->shield->SetPower(f_result);
     }
     if (f().firekey == PRESS || f().jfirekey == PRESS || j().firekey == DOWN || j().jfirekey == DOWN) {
         if (!_Universe->AccessCockpit()->CanDrawNavSystem()) {

engine/src/cmd/ai/warpto.cpp

@@ -98,7 +98,7 @@ static void ActuallyWarpTo(Unit *parent, const QVector &tarpos, Vector tarvel, U
                 XMLSupport::parse_float(vs_config->getVariable("AI", "min_energy_to_enter_warp", ".33"));
         static float min_warpfield_to_enter_warp =
                 XMLSupport::parse_float(vs_config->getVariable("AI", "min_warp_to_try", "1.5"));
-        if ((parent->energy_manager.Percent(EnergyType::SPEC) > min_energy_to_enter_warp)
+        if ((parent->ftl_energy.Percent() > min_energy_to_enter_warp)
                 && (parent->GetMaxWarpFieldStrength(1) > min_warpfield_to_enter_warp)) {
             if (parent->graphicOptions.InWarp == 0) {
                 parent->graphicOptions.InWarp = 1;                 //don't want the AI thrashing

engine/src/cmd/armed.cpp

@@ -251,14 +251,14 @@ void Armed::Fire(unsigned int weapon_type_bitmask, bool listen_to_owner) {
                 //&& ( (ROLES::EVERYTHING_ELSE&weapon_type_bitmask&i->type->role_bits) || i->type->role_bits == 0 )
                 ((locked_on && missile_and_want_to_fire_missiles) || gun_and_want_to_fire_guns);
         if ((*i).type->type == WEAPON_TYPE::BEAM) {
-            if ((*i).type->GetConsumption() * simulation_atom_var > unit->energy_manager.GetLevel(EnergyType::Energy)) {
+            if ((*i).type->GetConsumption() * simulation_atom_var > unit->energy.Level()) {
                 //NOT ONLY IN non-networking mode : anyway, the server will tell everyone including us to stop if not already done
                 (*i).UnFire();
                 continue;
             }
         } else
             //Only in non-networking mode
-        if (i->type->GetConsumption() > unit->energy_manager.GetLevel(EnergyType::Energy)) {
+        if (i->type->GetConsumption() > unit->energy.Level()) {
             if (!want_to_fire) {
                 i->UnFire();
             }
@@ -279,11 +279,11 @@ void Armed::Fire(unsigned int weapon_type_bitmask, bool listen_to_owner) {
                     if (i->ref.gun) {
                         if ((!i->ref.gun->Dissolved()) || i->ref.gun->Ready()) {
                             // TODO: switch to standard energy usage
-                            unit->energy_manager.Deplete(EnergyType::Energy, i->type->GetConsumption() * simulation_atom_var);
+                            unit->energy.Deplete(i->type->GetConsumption() * simulation_atom_var);
                         }
                     }
                 } else if (i->type->isMissile()) {    // FIXME  other than beams, only missiles are processed here?
-                    unit->energy_manager.Deplete(EnergyType::Energy, i->type->GetConsumption());
+                    unit->energy.Deplete(i->type->GetConsumption());
                 }
                 //IF WE REFRESH ENERGY FROM SERVER : Think to send the energy update to the firing client with ACK TO fireRequest
                 //fire only 1 missile at a time