morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auto-validate Option.schema, Factorio: allow setting pollution values

Browse Source
This commit is contained in:
black-sliver
2021-07-19 01:02:23 +02:00
committed by Fabian Dill
parent b809d76b79
commit 10c6a70696
7 changed files with 88 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
worlds/factorio/Options.py
View File

@@ -1,6 +1,12 @@
from __future__ import annotations
import typing
from Options import Choice, OptionDict, Option, DefaultOnToggle
from schema import Schema, Optional, And, Or
# schema helpers
FloatRange = lambda low,high: And(Or(int,float), lambda f: low<=f<=high)
LuaBool = Or(bool, And(int, lambda n: n in (0,1)))
class MaxSciencePack(Choice):
@@ -92,7 +98,10 @@ class FactorioStartItems(OptionDict):
class FactorioWorldGen(OptionDict):
default = {"terrain_segmentation": 0.5, "water": 1.5,
# FIXME: do we want default be a rando-optimized default or in-game DS?
value: typing.Dict[str, typing.Dict[str, typing.Any]]
default = {"terrain_segmentation": 0.5,
"water": 1.5,
"autoplace_controls": {"coal": {"frequency": 1, "size": 3, "richness": 6},
"copper-ore": {"frequency": 1, "size": 3, "richness": 6},
"crude-oil": {"frequency": 1, "size": 3, "richness": 6},
@@ -101,9 +110,57 @@ class FactorioWorldGen(OptionDict):
"stone": {"frequency": 1, "size": 3, "richness": 6},
"trees": {"frequency": 1, "size": 1, "richness": 1},
"uranium-ore": {"frequency": 1, "size": 3, "richness": 6}},
"starting_area": 1, "peaceful_mode": False,
"seed": None,
"starting_area": 1,
"peaceful_mode": False,
"cliff_settings": {"name": "cliff", "cliff_elevation_0": 10, "cliff_elevation_interval": 40,
"richness": 1}}
"richness": 1},
"pollution": {"enabled": True, "diffusion_ratio": 0.02, "ageing": 1,
"enemy_attack_pollution_consumption_modifier": 1,
"min_pollution_to_damage_trees": 60,
"pollution_restored_per_tree_damage": 10}}
schema = Schema({
"basic": {
Optional("terrain_segmentation"): FloatRange(0.166,6),
Optional("water"): FloatRange(0.166,6),
Optional("autoplace_controls"): {
str: {
"frequency": FloatRange(0,6),
"size": FloatRange(0,6),
"richness": FloatRange(0.166,6)}},
Optional("seed"): Or(None,And(int, lambda n: n>=0)),
Optional("starting_area"): FloatRange(0.166,6),
Optional("peaceful_mode"): LuaBool,
Optional("cliff_settings"): {
"name": str, "cliff_elevation_0": FloatRange(0,99),
"cliff_elevation_interval": FloatRange(0.066,241), # 40/frequency
"richness": FloatRange(0,6)},
},
"advanced": {
Optional("pollution"): {
Optional("enabled"): LuaBool,
Optional("diffusion_ratio"): FloatRange(0,0.25),
Optional("ageing"): FloatRange(0.1,4),
Optional("enemy_attack_pollution_consumption_modifier"): FloatRange(0.1,4),
Optional("min_pollution_to_damage_trees"): FloatRange(0,9999),
Optional("pollution_restored_per_tree_damage"): FloatRange(0,9999)}
}
})
def __init__(self, value: typing.Dict[str, typing.Any]):
advanced = {"pollution"}
self.value = {
"basic": { key: value[key] for key in value.keys() - advanced },
"advanced": { key: value[key] for key in value.keys() & advanced }
}
@classmethod
def from_any(cls, data: typing.Dict[str, typing.Any]) -> FactorioWorldGen:
if type(data) == dict:
return cls(data)
else:
raise NotImplementedError(f"Cannot Convert from non-dictionary, got {type(data)}")
factorio_options: typing.Dict[str, type(Option)] = {
"max_science_pack": MaxSciencePack,