diff options
Diffstat (limited to 'universe')
| -rw-r--r-- | universe/include/kurator/universe/ShipType.h | 2 | ||||
| -rw-r--r-- | universe/resources/universe/ship_types.json | 6 | ||||
| -rw-r--r-- | universe/src/JsonRepository.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/universe/include/kurator/universe/ShipType.h b/universe/include/kurator/universe/ShipType.h index fccf970..fdbb8af 100644 --- a/universe/include/kurator/universe/ShipType.h +++ b/universe/include/kurator/universe/ShipType.h @@ -12,7 +12,7 @@ namespace universe struct ShipType { std::string name; - double base_health_points; + double base_structure_points; double max_speed; }; diff --git a/universe/resources/universe/ship_types.json b/universe/resources/universe/ship_types.json index d5bc1e8..cc2d892 100644 --- a/universe/resources/universe/ship_types.json +++ b/universe/resources/universe/ship_types.json @@ -1,17 +1,17 @@ [ { "name": "Anvil", - "base_health_points": 600.0, + "base_structure_points": 600.0, "max_speed": 218.0 }, { "name": "Eclipse", - "base_health_points": 600.0, + "base_structure_points": 600.0, "max_speed": 263.0 }, { "name": "Warbringer", - "base_health_points": 600.0, + "base_structure_points": 600.0, "max_speed": 336.0 } ] diff --git a/universe/src/JsonRepository.cpp b/universe/src/JsonRepository.cpp index a4abfe5..40b0b70 100644 --- a/universe/src/JsonRepository.cpp +++ b/universe/src/JsonRepository.cpp @@ -26,7 +26,7 @@ void from_json(const json& item, ShipType& ship) { item.at("name").get_to(ship.name); - item.at("base_health_points").get_to(ship.base_health_points); + item.at("base_structure_points").get_to(ship.base_structure_points); item.at("max_speed").get_to(ship.max_speed); } |