-
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
304 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * jump_drive_tests.cpp | ||
| * | ||
| * Copyright (C) 2001-2023 Daniel Horn, Benjamen Meyer, Roy Falk, Stephen G. Tuggy, | ||
| * and other Vega Strike contributors. | ||
| * | ||
| * https://github.com/vegastrike/Vega-Strike-Engine-Source | ||
| * | ||
| * This file is part of Vega Strike. | ||
| * | ||
| * Vega Strike is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Vega Strike is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #include <gtest/gtest.h> | ||
| #include <map> | ||
|
|
||
| #include "jump_drive.h" | ||
| #include "resource/random_utils.h" | ||
| #include "unit_csv_factory.h" | ||
|
|
||
| static const std::string upgrades_suffix_string = "__upgrades"; | ||
| static const std::string jump_drive_string = "jump_drive"; | ||
|
|
||
| static const std::map<std::string,std::string> jump_drive_map = { | ||
| {"Key", "jump_drive__upgrades"}, | ||
| {"Name", "Interstellar Jump Drive"}, | ||
| {"Upgrade_Type", "Jump_Drive"}, | ||
| {"Object_Type", "Upgrade_Replacement"}, | ||
| {"Textual_Description", "\"@upgrades/jump_drive.png@Jump drive for traveling between stars\"\n"}, | ||
| {"Mass", "10"}, | ||
| {"Moment_Of_Inertia", "10"}, | ||
| {"Jump_Drive_Present", "TRUE"}, | ||
| {"Jump_Drive_Delay", "1"} | ||
| }; | ||
|
|
||
|
|
||
|
|
||
| // Used to quickly figure out why the code wasn't working properly | ||
| TEST(JumpDrive, Damage) { | ||
| UnitCSVFactory::LoadUnit(jump_drive_string + upgrades_suffix_string, jump_drive_map); | ||
|
|
||
| JumpDrive jump_drive; | ||
|
|
||
| jump_drive.Load("", jump_drive_string + upgrades_suffix_string); | ||
|
|
||
| jump_drive.DamageByPercent(0.1); | ||
|
|
||
| // Check operational drive shouldn't get damage | ||
| double chance_to_damage = randomDouble() - 0.01; | ||
|
|
||
| std::cout << chance_to_damage << std::endl; | ||
| std::cout << jump_drive.Percent() << std::endl; | ||
|
|
||
| //EXPECT_FALSE(true); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * ship_view.cpp | ||
| * | ||
| * Copyright (c) 2001-2002 Daniel Horn | ||
| * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors | ||
| * Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, Roy Falk and other Vega Strike Contributors | ||
| * | ||
| * https://github.com/vegastrike/Vega-Strike-Engine-Source | ||
| * | ||
| * This file is part of Vega Strike. | ||
| * | ||
| * Vega Strike is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Vega Strike is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| // -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- | ||
|
|
||
| #include "ship_view.h" | ||
| #include "vsfilesystem.h" | ||
|
|
||
| #include <Python.h> | ||
| #include <boost/python.hpp> | ||
| #include <boost/filesystem.hpp> | ||
|
|
||
| static const std::string module_name = "ship_view"; | ||
|
|
||
| const std::string GetShipView(const std::map<std::string, std::string>&ship_stats) { | ||
| if(!boost::filesystem::exists("python/base_computer/ship_view.py")) { | ||
| return "Error: ship description not found"; | ||
| } | ||
|
|
||
| PyObject* module = PyImport_ImportModule(module_name.c_str()); | ||
|
|
||
| if(!module) { | ||
| PyErr_Print(); | ||
| return "Error: PyImport_ImportModule is null"; | ||
| } | ||
|
|
||
| boost::python::dict dict; | ||
| for (auto const& pair : ship_stats) { | ||
| dict[pair.first] = pair.second; | ||
| } | ||
|
|
||
|
|
||
| PyObject* args = PyTuple_Pack(1, dict.ptr()); | ||
| if(args == nullptr) { | ||
| PyErr_Print(); | ||
| return "Error: PyTuple_Pack is null"; | ||
| } | ||
|
|
||
| PyObject* function = PyObject_GetAttrString(module,"get_ship_description"); | ||
| if(!function) { | ||
| PyErr_Print(); | ||
| return "Error: PyObject_GetAttrString is null"; | ||
| } | ||
|
|
||
|
|
||
| PyObject* pyResult = PyObject_CallObject(function, args); | ||
|
|
||
| if(!pyResult) { | ||
| PyErr_Print(); | ||
| return "Error: PyObject_CallObject is null"; | ||
| } | ||
|
|
||
| std::string result = PyUnicode_AsUTF8(pyResult); | ||
|
|
||
| return result; | ||
| } |
Oops, something went wrong.