238 ability rules missing descriptions (#239)

* Fix typos in ability description fields for generate points abilities * Add a default description for abilities lacking descriptions
ekolis · Jul 7, 2022 · 49d879a · 49d879a
1 parent d2f8c14
commit 49d879a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/FrEee.Assets/Data/AbilityRules.txt b/FrEee.Assets/Data/AbilityRules.txt
@@ -1150,31 +1150,31 @@ Value 2 Rule := Add
 
 Name := Generate Points Minerals
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] minerals per turn.
+Description := Generates [%Amount1%] minerals per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Organics
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] organics per turn.
+Description := Generates [%Amount1%] organics per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Radioactives
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] radioactives per turn.
+Description := Generates [%Amount1%] radioactives per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Research
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] research points per turn.
+Description := Generates [%Amount1%] research points per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Intelligence
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] intelligence points per turn.
+Description := Generates [%Amount1%] intelligence points per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 

diff --git a/FrEee.Assets/Mods/Antares Mod/Data/AbilityRules.txt b/FrEee.Assets/Mods/Antares Mod/Data/AbilityRules.txt
@@ -1095,32 +1095,32 @@ Value 2 Rule := Add
 
 Name := Generate Points Minerals
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] minerals per turn.
+Description := Generates [%Amount1%] minerals per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Organics
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] organics per turn.
+Description := Generates [%Amount1%] organics per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Radioactives
 Name := Generate Currency
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] BC of income per turn.
+Description := Generates [%Amount1%] BC of income per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Research
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] research points per turn.
+Description := Generates [%Amount1%] research points per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Intelligence
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] intelligence points per turn.
+Description := Generates [%Amount1%] intelligence points per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 

diff --git a/FrEee.Assets/Mods/Balancey Mod/Data/AbilityRules.txt b/FrEee.Assets/Mods/Balancey Mod/Data/AbilityRules.txt
@@ -1149,31 +1149,31 @@ Value 2 Rule := Add
 
 Name := Generate Points Minerals
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] minerals per turn.
+Description := Generates [%Amount1%] minerals per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Organics
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] organics per turn.
+Description := Generates [%Amount1%] organics per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Radioactives
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] radioactives per turn.
+Description := Generates [%Amount1%] radioactives per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Research
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] research points per turn.
+Description := Generates [%Amount1%] research points per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 
 Name := Generate Points Intelligence
 Targets := Vehicle, Planet, Facility, Component
-Descriptiion := Generates [%Amount1%] intelligence points per turn.
+Description := Generates [%Amount1%] intelligence points per turn.
 Value 1 Rule := Add
 Value 2 Rule := Add
 

diff --git a/FrEee/Game/Objects/Technology/MountedComponentTemplate.cs b/FrEee/Game/Objects/Technology/MountedComponentTemplate.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Enumerations;
+using FrEee.Game.Enumerations;
 using FrEee.Game.Interfaces;
 using FrEee.Game.Objects.Abilities;
 using FrEee.Game.Objects.Civilization;
@@ -45,11 +45,18 @@ private Ability ComputeAbility(Ability a)
  var dict = new Dictionary<string, object>(Variables);
  foreach (var kvp in a.Variables)
  dict.Add(kvp.Key, kvp.Value);
+ string description;
+ if (a.Description is not null)
+ description = a.Description.Evaluate(dict);
+ else if (a.Rule.Description is not null)
+ description = a.Rule.Description.Evaluate(dict);
+ else
+ description = $"{a.Rule.Name}: {string.Join(",", a.Values.Select(q => q?.ToString()))}";
  var result = new Ability(this)
  {
  Rule = a.Rule,
  Values = new List<Formula<string>>(a.Values),
- Description = (a.Description ?? a.Rule.Description).Evaluate(dict),
+ Description = description,
  };
  if (Mount != null)
  {
@@ -405,4 +412,4 @@ public int GetHashCode(MountedComponentTemplate obj)
  }
  }
  }
-}
+}