Worldgen 9, 10 and 11 - Rivers and Soils

sote/game/climate/sun.lua

@@ -22,4 +22,8 @@ function sun.yearly_irradiance(latitude_in_degrees)
 	end
 end
 
+function sun.yearly_irradiance_from_colat(colat)
+	return math.max(0.0, (-1.0) * colat * (colat - 3.1415) + 1.7)
+end
+
 return sun

sote/game/scenes/world-gen.lua

@@ -23,31 +23,25 @@ local function map_tiles_to_hex()
 		local lat, lon = tile:latlon()
 		local q, r, face = hex.latlon_to_hex_coords(lat, lon, wg.world.size)
 
-		wg.world:cache_tile_coord(tile.tile_id, q, r, face)
+		wg.world:cache_square_ti_by_hex_coords(q, r, face)
 	end
 end
 
 local function load_mapping_from_file(file)
 	for row in require("game.file-utils").csv_rows(file) do
-		local tile_id = tonumber(row[1])
-		local q = tonumber(row[2])
-		local r = tonumber(row[3])
-		local face = tonumber(row[4])
-
-		wg.world:cache_tile_coord(tile_id, q, r, face)
+		wg.world:cache_square_ti_by_hex_ti(tonumber(row[2]))
 	end
 end
 
-local function cache_tile_coord()
+local function cache_cube_world_tiles()
 	print("Caching tile coordinates...")
 
 	if debug.map_tiles_from_file then
 		-- it's faster to load the pre-calculated coordinates from a file than to calculate them on the fly
-		load_mapping_from_file("d:\\temp\\hex_mapping.csv")
+		load_mapping_from_file("d:\\temp\\hex_mapping2.csv")
 	else
 		map_tiles_to_hex()
 	end
-	-- wg.world:map_hex_coords()
 
 	print("Done caching tile coordinates")
 end
@@ -119,7 +113,7 @@ function wg.generate_coro()
 			coroutine.yield()
 
 			wg.message = "Caching tile coordinates"
-			prof.run_with_profiling(function() cache_tile_coord() end, "[scenes.world-gen]", "cache_tile_coord")
+			prof.run_with_profiling(function() cache_cube_world_tiles() end, "[scenes.world-gen]", "cache_cube_world_tiles")
 			coroutine.yield()
 		end
 

sote/libsote/debug-control-panel.lua

@@ -1,8 +1,26 @@
 local dcp = {}
 
-dcp.align_to_sote_coords = false -- this will align hex world storage to match the order from original sote, very useful when debugging/validating port
-dcp.map_tiles_from_file = false -- this will load cube world tile IDs mapping to hex coordinates from a file, as it's faster than computing them from lat lon
-dcp.use_sote_climate_data = false -- climate model was ported from sote, but with some changes; this will enable import of original sote climate data from a csv file, to aid in debugging/validating port
+-- these will load cube world tile IDs mapping to hex from a file, as it's faster than computing them from lat lon
+dcp.map_tiles_from_file = false
+dcp.use_sote_climate_data = false
+dcp.use_sote_ice_data = false
+dcp.use_sote_soils_data = false
+dcp.use_sote_water_movement = false
+
+-- this will align hex world storage to match the order from original SotE, very useful when debugging/validating port
+dcp.align_to_sote_coords =
+	dcp.use_sote_climate_data
+	or dcp.use_sote_ice_data
+	or dcp.use_sote_soils_data
+	or dcp.use_sote_water_movement
+
+ -- these will align RNG seed to match original SotE seed
+dcp.glaciation = {
+	align_rng = false
+}
+dcp.soils = {
+	align_rng = false
+}
 
 dcp.save_maps = false -- this will export maps to PNG
 dcp.maps_selection = {
@@ -11,7 +29,9 @@ dcp.maps_selection = {
 	climate = false,
 	waterflow = false,
 	waterbodies = false,
-	debug = false
+	watersheds = false,
+	debug1 = false,
+	debug2 = false
 }
 
 -- seed = 58738 -- climate integration was done on this one
@@ -20,7 +40,7 @@ dcp.maps_selection = {
 -- seed = 6618 -- tiny islands?
 -- seed = 49597 -- interesting looking one, huge northern ice cap (with lua climate model)
 -- seed = 91170 -- huge lake
-dcp.fixed_seed = nil
 -- dcp.fixed_seed = 12177
+-- dcp.fixed_seed = 53104 -- got sand dunes
 
 return dcp

sote/libsote/debug-loggers.lua

@@ -44,16 +44,6 @@ function logger:log(message, do_flush)
 	end
 end
 
-local loggers = {}
-
-local latlon_logger = nil
-local neighbors_logger = nil
-local waterflow_logger = nil
-local parent_material_logger = nil
-local glacial_logger = nil
-local climate_logger = nil
-local lakes_logger = nil
-
 local function get_logger(logger_instance, logname, path, unique)
 	if logger_instance == nil then
 		logger_instance = logger:new(logname, path, unique)
@@ -62,32 +52,51 @@ local function get_logger(logger_instance, logname, path, unique)
 	return logger_instance
 end
 
+local loggers = {}
+
+local latlon_logger = nil
 function loggers.get_latlon_logger(path)
 	return get_logger(latlon_logger, "latlon", path)
 end
 
+local neighbors_logger = nil
 function loggers.get_neighbors_logger(path)
 	return get_logger(neighbors_logger, "neighbours", path)
 end
 
+local waterflow_logger = nil
 function loggers.get_waterflow_logger(path)
 	return get_logger(waterflow_logger, "waterflow", path)
 end
 
+local parent_material_logger = nil
 function loggers.get_parent_material_logger(path)
 	return get_logger(parent_material_logger, "parent_material", path)
 end
 
+local glacial_logger = nil
 function loggers.get_glacial_logger(path)
 	return get_logger(glacial_logger, "glacial", path)
 end
 
+local climate_logger = nil
 function loggers.get_climate_logger(path)
 	return get_logger(climate_logger, "climate", path)
 end
 
+local lakes_logger = nil
 function loggers.get_lakes_logger(path)
 	return get_logger(lakes_logger, "lakes", path)
 end
 
+local rivers_logger = nil
+function loggers.get_rivers_logger(path)
+	return get_logger(rivers_logger, "rivers", path)
+end
+
+local soils_logger = nil
+function loggers.get_soils_logger(path)
+	return get_logger(soils_logger, "soils", path)
+end
+
 return loggers