Add galaxy init file, exposing galaxy parameters

Expose parameters for explored space: 'min', 'max' range and 'mix' (drop off) parameters. Note: any change to this file will break saves. But we want it for modders.
pioneerspacesim · Dec 4, 2024 · 84f6229 · 84f6229
1 parent 0ff6b06
commit 84f6229
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 3 deletions.
diff --git a/src/galaxy/GalaxyConfig.cpp b/src/galaxy/GalaxyConfig.cpp
@@ -0,0 +1,18 @@
+// Copyright © 2008-2024 Pioneer Developers. See AUTHORS.txt for details
+// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
+#include "GalaxyConfig.h"
+#include "FileSystem.h"
+
+GalaxyConfig::GalaxyConfig()
+{
+	// set defaults
+	std::map<std::string, std::string> &map = m_map[""];
+	map["GalaxyExploredMax"] = "90";
+	map["GalaxyExploredMin"] = "65";
+	map["GalaxyExploredMix"] = "40";
+
+	Read(FileSystem::userFiles, "galaxy.ini");
+
+	Save();
+}
diff --git a/src/galaxy/GalaxyConfig.h b/src/galaxy/GalaxyConfig.h
@@ -0,0 +1,16 @@
+// Copyright © 2008-2024 Pioneer Developers. See AUTHORS.txt for details
+// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
+
+#ifndef _GALAXYCONFIG_H
+#define _GALAXYCONFIG_H
+
+#include "core/IniConfig.h"
+
+class GalaxyConfig : public IniConfig {
+public:
+	typedef std::map<std::string, std::string> map_string;
+	// GalaxyConfig(const map_string &override_ = map_string());
+	GalaxyConfig();
+};
+
+#endif
diff --git a/src/galaxy/SectorGenerator.cpp b/src/galaxy/SectorGenerator.cpp
@@ -44,12 +44,13 @@ bool SectorCustomSystemsGenerator::Apply(Random &rng, RefCountedPtr<Galaxy> gala
 		s.m_seed = cs->seed;
 
 		if (cs->want_rand_explored) {
+
 			/*
 			 * 0 - ~500ly from sol: explored
 			 * ~500ly - ~700ly (65-90 sectors): gradual
 			 * ~700ly+: unexplored
 			 */
-			if (((dist <= Square(90)) && (dist <= Square(65) || rng.Int32(dist) <= Square(40))) || galaxy->GetFactions()->IsHomeSystem(SystemPath(sx, sy, sz, sysIdx)))
+			if (((dist <= Square(m_GalaxyExploredMax)) && (dist <= Square(m_GalaxyExploredMin) || rng.Int32(dist) <= Square(m_GalaxyExploredMix))) || galaxy->GetFactions()->IsHomeSystem(SystemPath(sx, sy, sz, sysIdx)))
 				s.m_explored = StarSystem::eEXPLORED_AT_START;
 			else
 				s.m_explored = StarSystem::eUNEXPLORED;
@@ -171,7 +172,7 @@ bool SectorRandomSystemsGenerator::Apply(Random &rng, RefCountedPtr<Galaxy> gala
 		 * ~500ly - ~700ly (65-90 sectors): gradual
 		 * ~700ly+: unexplored
 		 */
-		if (((dist <= Square(90)) && (dist <= Square(65) || rng.Int32(dist) <= Square(40))) || galaxy->GetFactions()->IsHomeSystem(SystemPath(sx, sy, sz, customCount + i)))
+		if (((dist <= Square(m_GalaxyExploredMax)) && (dist <= Square(m_GalaxyExploredMin) || rng.Int32(dist) <= Square(m_GalaxyExploredMix))) || galaxy->GetFactions()->IsHomeSystem(SystemPath(sx, sy, sz, customCount + i)))
 			s.m_explored = StarSystem::eEXPLORED_AT_START;
 		else
 			s.m_explored = StarSystem::eUNEXPLORED;

diff --git a/src/galaxy/SectorGenerator.h b/src/galaxy/SectorGenerator.h
@@ -4,6 +4,7 @@
 #ifndef SECTORGENERATOR_H
 #define SECTORGENERATOR_H
 
+#include "GalaxyConfig.h"
 #include "GalaxyGenerator.h"
 #include "Random.h"
 #include "RefCounted.h"
@@ -13,19 +14,42 @@
 class SectorCustomSystemsGenerator : public SectorGeneratorStage {
 public:
 	SectorCustomSystemsGenerator(int customOnlyRadius) :
-		m_customOnlyRadius(customOnlyRadius) {}
+		m_customOnlyRadius(customOnlyRadius) {
+		m_galaxyConfig = GalaxyConfig();
+
+		m_GalaxyExploredMax = m_galaxyConfig.Int("GalaxyExploredMax");
+		m_GalaxyExploredMin = m_galaxyConfig.Int("GalaxyExploredMin");
+		m_GalaxyExploredMix = m_galaxyConfig.Int("GalaxyExploredMix");
+	}
 	virtual bool Apply(Random &rng, RefCountedPtr<Galaxy> galaxy, RefCountedPtr<Sector> sector, GalaxyGenerator::SectorConfig *config);
 
 private:
+	int m_GalaxyExploredMax;
+	int m_GalaxyExploredMin;
+	int m_GalaxyExploredMix;
+
 	int m_customOnlyRadius;
+	GalaxyConfig m_galaxyConfig;
 };
 
 class SectorRandomSystemsGenerator : public SectorGeneratorStage {
 public:
+	SectorRandomSystemsGenerator(){
+		m_galaxyConfig = GalaxyConfig();
+
+		m_GalaxyExploredMax = m_galaxyConfig.Int("GalaxyExploredMax");
+		m_GalaxyExploredMin = m_galaxyConfig.Int("GalaxyExploredMin");
+		m_GalaxyExploredMix = m_galaxyConfig.Int("GalaxyExploredMix");
+	}
 	virtual bool Apply(Random &rng, RefCountedPtr<Galaxy> galaxy, RefCountedPtr<Sector> sector, GalaxyGenerator::SectorConfig *config);
 
 private:
+	int m_GalaxyExploredMax;
+	int m_GalaxyExploredMin;
+	int m_GalaxyExploredMix;
+
 	const std::string GenName(RefCountedPtr<Galaxy> galaxy, const Sector &sec, Sector::System &sys, int si, Random &rand);
+	GalaxyConfig m_galaxyConfig;
 };
 
 class SectorPersistenceGenerator : public SectorGeneratorStage {