Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm…

…-DDA into factions
CleverRaven · May 31, 2024 · 2f42115 · 2f42115
2 parents 5a8740d + b3e7525
commit 2f42115
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/data/json/npcs/factions.json b/data/json/npcs/factions.json
@@ -23,16 +23,9 @@
       }
     },
     "mon_faction": "player",
-    "epilogues": [ 
-      { 
-        "power_min": 0,
-        "power_max": 149,
-        "id": "epilogue_faction_your_followers_0"
-      },
-      {
-        "power_min": 150,
-        "id": "epilogue_faction_your_followers_150"
-      },
+    "epilogues": [
+      { "power_min": 0, "power_max": 149, "id": "epilogue_faction_your_followers_0" },
+      { "power_min": 150, "id": "epilogue_faction_your_followers_150" },
       {
         "power_min": 150,
         "dynamic": [

diff --git a/src/faction.h b/src/faction.h
@@ -93,8 +93,7 @@ class faction_price_rules_reader : public generic_typed_reader<faction_price_rul
 };
 
 
-struct faction_power_spec
-{
+struct faction_power_spec {
     faction_id faction;
     std::optional<int> power_min;
     std::optional<int> power_max;