tidying and fixes

Author: dargem

README.md

@@ -1,4 +1,4 @@
 # VRSIM
 Made by dark. If there's any bugs or feature requests message me on discord (genericname4) and I can fix them up. Very much a wip.
-
-Event driven skill system
+<br>
+Being rewritten in c++ for better architecture with a more event driven esque combat system with skills listening to events their combatant undergoes

cpp-backend-new/CMakeLists.txt

@@ -21,11 +21,14 @@ if(APPLE)
         COMMAND brew --prefix
         OUTPUT_VARIABLE BREW_PREFIX
         OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 
+    execute_process(
         COMMAND xcrun --show-sdk-path
         OUTPUT_VARIABLE MACOS_SDK_PATH
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+    
     include_directories(${BREW_PREFIX}/include)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isysroot ${MACOS_SDK_PATH}")
 endif()

cpp-backend-new/include/combatants/UnitType.hpp

@@ -1,7 +1,9 @@
 #ifndef UNIT_TYPE_HPP
 #define UNIT_TYPE_HPP
 
-enum class UnitType
+#include <cstdint>
+
+enum class UnitType : u_int8_t
 {
     PIKE,
     ARCHER,

cpp-backend-new/include/orchestration/SetupPublisherLoader.hpp

@@ -5,6 +5,7 @@
 #include "orchestration/CombatPublisher.hpp"
 #include "utils/SkillParser.hpp"
 #include <string_view>
+#include <nlohmann/json.hpp>
 
 #ifndef RESOURCE_DIR
 #define RESOURCE_DIR "resources"
@@ -30,11 +31,13 @@ class SetupPublisherLoader
      */
     void loadPublisher(CombatPublisher& combat_publisher, const CombatantSetup& combatant_setup) const;
 private:
+    
     static constexpr std::string_view skills_path = RESOURCE_DIR "/skills.json";
     json commander_data;
     json skill_data;
     json mount_slot_1_data;
     json mount_slot_2_data;
+    /*
 
     std::vector<Skill> loadSkills(const json& skill_data, CommanderName commander_name, CombatPublisher& combat_publisher) const;
     std::vector<Skill> loadSkills(const json& skill_data, SkillName skill_name, CombatPublisher& combat_publisher) const;
@@ -52,6 +55,7 @@ class SetupPublisherLoader
     
     // Determine skill target from JSON (FRIENDLY, ENEMY, etc.)
     SkillTarget determineSkillTarget(const json& skill_json) const;
+    */
 };
 
 #endif

cpp-backend-new/include/utils/NumberGenerator.hpp

@@ -1,12 +1,13 @@
 #ifndef NUMBER_GENERATOR_HPP
 #define NUMBER_GENERATOR_HPP
 
+#include <array>
 #include <cstdint>
 
 class NumberGenerator
 {
 public:
-    NumberGenerator(uint64_t seed);
+    explicit NumberGenerator(uint64_t seed);
     /**
      * @brief creates a random uniform double between [0,1)
      * 
@@ -15,11 +16,13 @@ class NumberGenerator
     [[nodiscard]] double getRandomDouble();
 private:
     // used internally for bitshifting an int
-    static uint64_t rotl(const uint64_t x, int k);
+    static uint64_t rotl(const uint64_t value, int shift);
+    
+    static uint64_t splitmix64(uint64_t& seed);
 
     void jump();
-    // used to store internal state
-    uint64_t s[2];
+    // used to store internal state of RNG
+    std::array<uint64_t, 2> state;
 };
 
 #endif

cpp-backend-new/include/utils/ScalarUtils.hpp

@@ -36,16 +36,15 @@ namespace ScalarUtils
         // troop scalar 
         if (troops >= 100000)
         {
-            return (troops - 100000) * GRADIENT_100K_RISE + GRADIENT_100K_CONSTANT;
+            return ((troops - 100000) * GRADIENT_100K_RISE) + GRADIENT_100K_CONSTANT;
         }
-        else if (troops > 10000)
+        
+        if (troops > 10000)
         {
-            return (troops - 10000) * GRADIENT_10K_100K_RISE + GRADIENT_10K_100K_CONSTANT;
-        }
-        else
-        {
-            return LINEAR_FACTOR_0K_10K * std::pow(troops, POWER_FACTOR_0K_10K);
+            return ((troops - 10000) * GRADIENT_10K_100K_RISE) + GRADIENT_10K_100K_CONSTANT;
         }
+        
+        return LINEAR_FACTOR_0K_10K * std::pow(troops, POWER_FACTOR_0K_10K);
     }
 }
 

cpp-backend-new/include/utils/SkillParser.hpp

@@ -27,7 +27,7 @@ class SkillParser
 public:
 
     // turns a skill name into a vector of actual skill objects
-    [[nodiscard]] std::vector<std::unique_ptr<Skill>> loadSkills(const json& skill_data, CommanderName commander_name, bool isPrimary) const;
+    [[nodiscard]] std::vector<std::unique_ptr<Skill>> loadSkills(const json& skill_data, CommanderName commander_name, bool is_primary) const;
     [[nodiscard]] std::vector<std::unique_ptr<Skill>> loadSkills(const json& skill_data, SkillName skill_name) const;
     [[nodiscard]] std::vector<std::unique_ptr<Skill>> loadSkills(const json& skill_data, MountSlot1Names mount_slot_1_names) const;
     [[nodiscard]] std::vector<std::unique_ptr<Skill>> loadSkills(const json& skill_data, MountSlot2Names mount_slot_2_names) const;

cpp-backend-new/src/orchestration/SetupPublisherLoader.cpp

@@ -40,9 +40,9 @@ void SetupPublisherLoader::loadPublisher(CombatPublisher& combat_publisher, cons
     // Load skills for each commander
     for (int i = 0; i < CombatantSetup::NUM_COMMANDERS; ++i) {
 
-        const bool isPrimary { i == 0 };
+        const bool is_primary { i == 0 };
 
-        auto skills = parser.loadSkills(skill_data, combatant_setup.commanders[i], isPrimary);
+        auto skills = parser.loadSkills(skill_data, combatant_setup.commanders[i], is_primary);
         for (auto& skill : skills) 
         {
             combat_publisher.addSkill(std::move(skill));

cpp-backend-new/src/skills/NumberGenerator.cpp

@@ -4,8 +4,8 @@
 
 NumberGenerator::NumberGenerator(uint64_t seed)
 {
-    s[0] = splitmix64(seed);
-    s[1] = splitmix64(seed);
+    state[0] = splitmix64(seed);
+    state[1] = splitmix64(seed);
     // suppress the warning with jump calling it
     std::ignore = getRandomDouble();
 }
@@ -17,31 +17,31 @@ NumberGenerator::NumberGenerator(uint64_t seed)
  */
 double NumberGenerator::getRandomDouble() 
 {
-	const uint64_t s0 = s[0];
-	uint64_t s1 = s[1];
+	const uint64_t state0 = state[0];
+	uint64_t state1 = state[1];
 
     // create random number using the internal state
-	const uint64_t result = s0 + s1;
+	const uint64_t result = state0 + state1;
 
     // mix up the internal state again
-	s1 ^= s0;
-	s[0] = rotl(s0, 24) ^ s1 ^ (s1 << 16); // a, b
-	s[1] = rotl(s1, 37); // c
+	state1 ^= state0;
+	state[0] = rotl(state0, 24) ^ state1 ^ (state1 << 16); // a, b
+	state[1] = rotl(state1, 37); // c
 
     // return, shifting result into [0,1)
-	return (result >> 11) * (1.0 / (1ULL << 53));;
+	return (result >> 11) * (1.0 / (1ULL << 53));
 }
 
 /**
  * @brief bit shifts x
  * 
- * @param x int to shift
- * @param k bits to shift by
+ * @param value int to shift
+ * @param shift bits to shift by
  * @return uint64_t 
  */
-inline uint64_t NumberGenerator::rotl(const uint64_t x, int k) 
+uint64_t NumberGenerator::rotl(uint64_t value, int shift) 
 {
-	return (x << k) | (x >> (64 - k));
+	return (value << shift) | (value >> (64 - shift));
 }
 
 
@@ -51,29 +51,29 @@ inline uint64_t NumberGenerator::rotl(const uint64_t x, int k)
 
 void NumberGenerator::jump() 
 {
-	static const uint64_t JUMP[] = { 0xdf900294d8f554a5, 0x170865df4b3201fc };
+	static const std::array<uint64_t, 2> JUMP = { 0xdf900294d8f554a5, 0x170865df4b3201fc };
 
-	uint64_t s0 = 0;
-	uint64_t s1 = 0;
-	for(int i = 0; i < sizeof JUMP / sizeof *JUMP; i++)
+	uint64_t state0 = 0;
+	uint64_t state1 = 0;
+	for(const auto& jump_val : JUMP)
     {
-		for(int b = 0; b < 64; b++) {
-			if (JUMP[i] & UINT64_C(1) << b) {
-				s0 ^= s[0];
-				s1 ^= s[1];
+		for(int bit_idx = 0; bit_idx < 64; bit_idx++) {
+			if ((jump_val & (UINT64_C(1) << bit_idx)) != 0) {
+				state0 ^= state[0];
+				state1 ^= state[1];
 			}
-			getRandomDouble();
+			std::ignore = getRandomDouble();
 		}
     }
 
-	s[0] = s0;
-	s[1] = s1;
+	state[0] = state0;
+	state[1] = state1;
 }
 
-uint64_t splitmix64(uint64_t& seed)
+uint64_t NumberGenerator::splitmix64(uint64_t& seed)
 {
-    uint64_t z = (seed += 0x9E3779B97F4A7C15ULL);
-    z = (z ^ (z >> 30)) * 0xBF58476D1CE4E5B9ULL;
-    z = (z ^ (z >> 27)) * 0x94D049BB133111EBULL;
-    return z ^ (z >> 31);
+    uint64_t result = (seed += 0x9E3779B97F4A7C15ULL);
+    result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9ULL;
+    result = (result ^ (result >> 27)) * 0x94D049BB133111EBULL;
+    return result ^ (result >> 31);
 }

cpp-backend-new/tests/TestSkillParser.cpp

@@ -45,8 +45,8 @@ TEST(SkillParserTest, LoadSkillsForFakeSigrid) {
     }
     )"_json;
 
-    bool isPrimary { true };
-    auto skills = parser.loadSkills(skillJson, CommanderName::Sigrid, isPrimary);
+    bool is_primary { true };
+    auto skills = parser.loadSkills(skillJson, CommanderName::Sigrid, is_primary);
 
     ASSERT_EQ(skills.size(), 2);
 
@@ -71,14 +71,14 @@ TEST(SkillParserTest, LoadSkillsThrowsOnInvalidSkill) {
     }
     )"_json;
 
-    bool isPrimary { true };
-    EXPECT_THROW(static_cast<void>(parser.loadSkills(skillJson, CommanderName::Sigrid, isPrimary)), std::runtime_error);
+    bool is_primary { true };
+    EXPECT_THROW(static_cast<void>(parser.loadSkills(skillJson, CommanderName::Sigrid, is_primary)), std::runtime_error);
 }
 
 TEST(SkillParserTest, LoadSkillsThrowsOnUnknownCommander) {
     SkillParser parser;
     json skillJson = R"({"Commanders": {}})"_json;
 
-    bool isPrimary { true };
-    EXPECT_THROW(static_cast<void>(parser.loadSkills(skillJson, CommanderName::Sigrid, isPrimary)), std::runtime_error);
+    bool is_primary { true };
+    EXPECT_THROW(static_cast<void>(parser.loadSkills(skillJson, CommanderName::Sigrid, is_primary)), std::runtime_error);
 }