Fix serialization of resources (can't serialize a Func) (#197)

ekolis · Apr 5, 2022 · 4fec75c · 4fec75c
1 parent c1e9013
commit 4fec75c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/FrEee/Game/Objects/Civilization/Colony.cs b/FrEee/Game/Objects/Civilization/Colony.cs
@@ -172,7 +172,7 @@ public ResourceQuantity StandardIncomePercentages
  var aptfactor = 1d;
  if (r.Aptitude != null)
  aptfactor = Population.Sum(kvp => (kvp.Key.Aptitudes[r.Aptitude.Name] / 100d) * (double)kvp.Value / (double)totalpop);
- var cultfactor = (100 + r.CultureModifier(Owner.Culture)) / 100d;
+ var cultfactor = (100 + r.GetCultureModifier(Owner.Culture)) / 100d;
 
  result += (int)(100 * popfactor * aptfactor * cultfactor * moodfactor) * r;
  }
@@ -257,4 +257,4 @@ public void TriggerHappinessChange(Func<HappinessModel, int> trigger)
  }
  }
  }
-}
+}
diff --git a/FrEee/Game/Objects/Civilization/Culture.cs b/FrEee/Game/Objects/Civilization/Culture.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Interfaces;
+using FrEee.Game.Interfaces;
 using FrEee.Modding.Interfaces;
 using FrEee.Utility;
 using System;
@@ -26,7 +26,7 @@ public ResourceQuantity IncomePercentages
  {
  var result = new ResourceQuantity();
  foreach (var r in Resource.All)
- result += (100 + r.CultureModifier(this)) * r;
+ result += (100 + r.GetCultureModifier(this)) * r;
  return result;
  }
  }
@@ -70,4 +70,4 @@ public override string ToString()
  return Name;
  }
  }
-}
+}
diff --git a/FrEee/Modding/ResourceFormula.cs b/FrEee/Modding/ResourceFormula.cs
@@ -1,4 +1,4 @@
-using FrEee.Utility;
+using FrEee.Utility;
 using System.Linq;
 
 namespace FrEee.Modding
@@ -85,4 +85,4 @@ public ResourceQuantity Evaluate(object host)
  return q;
  }
  }
-}
+}
diff --git a/FrEee/Utility/Resource.cs b/FrEee/Utility/Resource.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Interfaces;
+using FrEee.Game.Interfaces;
 using FrEee.Game.Objects.Civilization;
 using FrEee.Utility.Extensions;
 using System;
@@ -46,9 +46,19 @@ static Resource()
  public Color Color { get; set; }
 
  /// <summary>
- /// Function to compute the cultural modifier. A modifier of zero means 100%.
+ /// The name of the <see cref="Culture"/> property that will be used to modify this resource's income,
+ /// or null to not have a modifier.
  /// </summary>
- public Func<Culture, int> CultureModifier { get; set; }
+ /// <remarks>
+ /// This property should be of type <see cref="int"/>.
+ /// </remarks>
+ public string? CultureModifierPropertyName { get; set; }
+
+ /// <summary>
+ /// Function to compute the cultural modifier. A modifier of zero means 100%; 100 means doubled, -50 means halved, etc.
+ /// </summary>
+ public int GetCultureModifier(Culture c)
+ => CultureModifierPropertyName is null ? 0 : (int)c.GetPropertyValue(CultureModifierPropertyName);
 
  /// <summary>
  /// Does this resource have a "value" assigned to planets and asteroids?
@@ -122,7 +132,7 @@ public IEnumerable<string> PortraitPaths
  HasValue = false,
  PictureName = "Resource5",
  Aptitude = Aptitude.Cunning,
- CultureModifier = c => c.Intelligence,
+ CultureModifierPropertyName = nameof(Culture.Intelligence),
  };
 
  public static readonly Resource Minerals = new Resource
@@ -134,7 +144,7 @@ public IEnumerable<string> PortraitPaths
  HasValue = true,
  PictureName = "Resource1",
  Aptitude = Aptitude.Mining,
- CultureModifier = c => c.Production,
+ CultureModifierPropertyName = nameof(Culture.Production),
  };
 
  public static readonly Resource Organics = new Resource
@@ -146,7 +156,7 @@ public IEnumerable<string> PortraitPaths
  HasValue = true,
  PictureName = "Resource2",
  Aptitude = Aptitude.Farming,
- CultureModifier = c => c.Production,
+ CultureModifierPropertyName = nameof(Culture.Production),
  };
 
  public static readonly Resource Radioactives = new Resource
@@ -158,7 +168,7 @@ public IEnumerable<string> PortraitPaths
  HasValue = true,
  PictureName = "Resource3",
  Aptitude = Aptitude.Refining,
- CultureModifier = c => c.Production,
+ CultureModifierPropertyName = nameof(Culture.Production),
  };
 
  public static readonly Resource Research = new Resource
@@ -170,7 +180,7 @@ public IEnumerable<string> PortraitPaths
  HasValue = false,
  PictureName = "Resource4",
  Aptitude = Aptitude.Intelligence, // no, seriously
- CultureModifier = c => c.Research,
+ CultureModifierPropertyName = nameof(Culture.Research),
  };
 
  public static readonly Resource Supply = new Resource
@@ -182,7 +192,7 @@ public IEnumerable<string> PortraitPaths
  HasValue = false,
  PictureName = "Resource6",
  Aptitude = null, // TODO - supply aptitude?
- CultureModifier = c => 0, // TODO - supply culture modifier?
+ CultureModifierPropertyName = null,
  };
 
  private static IEnumerable<Resource> all;
@@ -236,4 +246,4 @@ public override string ToString()
  return Name;
  }
  }
-}
+}