fix display names for new wild tree types

Pathoschild · Apr 4, 2024 · ac12229 · ac12229
1 parent 155f891
commit ac12229
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 52 deletions.
diff --git a/Automate/Framework/Machines/TerrainFeatures/TreeMachine.cs b/Automate/Framework/Machines/TerrainFeatures/TreeMachine.cs
@@ -2,13 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework;
-using Pathoschild.Stardew.Common.Enums;
 using Pathoschild.Stardew.Common.Utilities;
 using StardewValley;
 using StardewValley.GameData.WildTrees;
 using StardewValley.Locations;
 using StardewValley.TerrainFeatures;
-using SObject = StardewValley.Object;
 
 namespace Pathoschild.Stardew.Automate.Framework.Machines.TerrainFeatures
 {
@@ -124,7 +122,7 @@ private IEnumerable<string> GetRandomExtraDrops()
             string type = tree.treeType.Value;
 
             // golden coconut
-            if ((type == TreeType.Palm || type == TreeType.Palm2) && this.Location is IslandLocation && new Random((int)Game1.uniqueIDForThisGame + (int)Game1.stats.DaysPlayed + this.TileArea.X * 13 + this.TileArea.Y * 54).NextDouble() < 0.1)
+            if (type is (Tree.palmTree or Tree.palmTree2) && this.Location is IslandLocation && new Random((int)Game1.uniqueIDForThisGame + (int)Game1.stats.DaysPlayed + this.TileArea.X * 13 + this.TileArea.Y * 54).NextDouble() < 0.1)
                 yield return "791";
 
             // Qi bean

diff --git a/Common/Common.projitems b/Common/Common.projitems
@@ -23,7 +23,6 @@
     <Compile Include="..\Common\Commands\GenericHelpCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Commands\ICommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CommonHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Enums\TreeType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DataParsers\CropDataParser.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DrawHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)GameI18n.cs" />

diff --git a/Common/Enums/TreeType.cs b/Common/Enums/TreeType.cs
diff --git a/LookupAnything/Framework/Lookups/TerrainFeatures/TreeSubject.cs b/LookupAnything/Framework/Lookups/TerrainFeatures/TreeSubject.cs
@@ -4,7 +4,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Pathoschild.Stardew.Common;
-using Pathoschild.Stardew.Common.Enums;
 using Pathoschild.Stardew.LookupAnything.Framework.DebugFields;
 using Pathoschild.Stardew.LookupAnything.Framework.Fields;
 using StardewValley;
@@ -144,22 +143,21 @@ private static string GetName(Tree tree)
         {
             string type = tree.treeType.Value;
 
-            if (type == TreeType.BigMushroom)
-                I18n.Tree_Name_BigMushroom();
-            if (type == TreeType.Mahogany)
-                return I18n.Tree_Name_Mahogany();
-            if (type == TreeType.Maple)
-                return I18n.Tree_Name_Maple();
-            if (type == TreeType.Oak)
-                return I18n.Tree_Name_Oak();
-            if (type == TreeType.Palm)
-                return I18n.Tree_Name_Palm();
-            if (type == TreeType.Palm2)
-                return I18n.Tree_Name_Palm();
-            if (type == TreeType.Pine)
-                return I18n.Tree_Name_Pine();
-
-            return I18n.Tree_Name_Unknown();
+            return type switch
+            {
+                Tree.mushroomTree => I18n.Tree_Name_BigMushroom(),
+                Tree.mahoganyTree => I18n.Tree_Name_Mahogany(),
+                Tree.leafyTree => I18n.Tree_Name_Maple(),
+                Tree.bushyTree => I18n.Tree_Name_Oak(),
+                Tree.palmTree => I18n.Tree_Name_Palm(),
+                Tree.palmTree2 => I18n.Tree_Name_Palm(),
+                Tree.pineTree => I18n.Tree_Name_Pine(),
+                Tree.greenRainTreeBushy => I18n.Tree_Name_Mossy(),
+                Tree.greenRainTreeLeafy => I18n.Tree_Name_Mossy(),
+                Tree.greenRainTreeFern => I18n.Tree_Name_Mossy(),
+                Tree.mysticTree => I18n.Tree_Name_Mystic(),
+                _ => I18n.Tree_Name_Unknown()
+            };
         }
 
         /// <summary>Whether there are adjacent trees that prevent growth.</summary>

diff --git a/LookupAnything/docs/release-notes.md b/LookupAnything/docs/release-notes.md
@@ -2,6 +2,7 @@
 
 # Release notes
 ## Upcoming release
+* Fixed display names for new wild tree types.
 * Fixed upgrade level check for barns and coops.
 * Fixed error if a target has an invalid texture.
 * Fixed error showing lookup when a mod adds broken textures.

diff --git a/LookupAnything/i18n/de.json b/LookupAnything/i18n/de.json
@@ -615,6 +615,8 @@
     "tree.name.oak": "Eichenbaum",
     "tree.name.palm": "Palme",
     "tree.name.pine": "Tannenbaum",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "unbekannter Baum",
     "tree.stage.done": "Voll ausgewachsen",
     "tree.stage.partial": "{{stageName}} ({{step}} von {{max}})",

diff --git a/LookupAnything/i18n/default.json b/LookupAnything/i18n/default.json
@@ -616,6 +616,8 @@
     "tree.name.oak": "Oak Tree",
     "tree.name.palm": "Palm Tree",
     "tree.name.pine": "Pine Tree",
+    "tree.name.mossy": "Mossy Tree",
+    "tree.name.mystic": "Mystic Tree",
     "tree.name.unknown": "Unknown Tree",
     "tree.stage.done": "Fully grown",
     "tree.stage.partial": "{{stageName}} ({{step}} of {{max}})",

diff --git a/LookupAnything/i18n/es.json b/LookupAnything/i18n/es.json
@@ -618,6 +618,8 @@
     "tree.name.oak": "Roble",
     "tree.name.palm": "Palmera",
     "tree.name.pine": "Pino",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Árbol desconocido",
     "tree.stage.done": "Completamente maduro",
     "tree.stage.partial": "{{stageName}} ({{step}} de {{max}})",

diff --git a/LookupAnything/i18n/fr.json b/LookupAnything/i18n/fr.json
@@ -617,6 +617,8 @@
     "tree.name.oak": "Chêne",
     "tree.name.palm": "Palmier",
     "tree.name.pine": "Pin",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Arbre inconnu",
     "tree.stage.done": "Taille adulte",
     "tree.stage.partial": "{{stageName}} ({{step}} sur {{max}})",

diff --git a/LookupAnything/i18n/hu.json b/LookupAnything/i18n/hu.json
@@ -625,6 +625,8 @@
     "tree.name.oak": "Tölgyfa",
     "tree.name.palm": "Pálmafa",
     "tree.name.pine": "Fenyőfa",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Ismeretlen Fa",
     "tree.stage.done": "Teljesen megnőtt",
     "tree.stage.partial": "{{stageName}} ({{step}} / {{max}})",

diff --git a/LookupAnything/i18n/it.json b/LookupAnything/i18n/it.json
@@ -615,6 +615,8 @@
     "tree.name.oak": "Quercia",
     "tree.name.palm": "Palma",
     "tree.name.pine": "Pino",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Albero Sconosciuto",
     "tree.stage.done": "Completamente cresciuto",
     "tree.stage.partial": "{{stageName}} ({{step}} di {{max}})",

diff --git a/LookupAnything/i18n/ja.json b/LookupAnything/i18n/ja.json
@@ -618,6 +618,8 @@
     "tree.name.oak": "カシの木",
     "tree.name.palm": "ヤシの木",
     "tree.name.pine": "マツの木",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "未知の木",
     "tree.stage.done": "成長完了",
     "tree.stage.partial": "{{stageName}} ({{step}} / {{max}})",

diff --git a/LookupAnything/i18n/ko.json b/LookupAnything/i18n/ko.json
@@ -618,6 +618,8 @@
     "tree.name.oak": "참나무",
     "tree.name.palm": "야자나무",
     "tree.name.pine": "소나무",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "알 수 없는 나무",
     "tree.stage.done": "다 자람",
     "tree.stage.partial": "{{stageName}}, {{max}}단계 중 ({{step}}단계)",

diff --git a/LookupAnything/i18n/pl.json b/LookupAnything/i18n/pl.json
@@ -618,6 +618,8 @@
     "tree.name.oak": "Dąb",
     "tree.name.palm": "Palma",
     "tree.name.pine": "Sosna",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Nieznane Drzewo",
     "tree.stage.done": "w pełni wyrośnięte",
     "tree.stage.partial": "{{stageName}} ({{step}} z {{max}})",

diff --git a/LookupAnything/i18n/pt.json b/LookupAnything/i18n/pt.json
@@ -618,6 +618,8 @@
     "tree.name.oak": "Carvalho",
     "tree.name.palm": "Palmeira",
     "tree.name.pine": "Pinheiro",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Árvore desconhecida",
     "tree.stage.done": "Totalmente crescido",
     "tree.stage.partial": "{{stageName}} ({{step}} de {{max}})",

diff --git a/LookupAnything/i18n/ru.json b/LookupAnything/i18n/ru.json
@@ -618,6 +618,8 @@
     "tree.name.oak": "Дуб",
     "tree.name.palm": "Пальма",
     "tree.name.pine": "Сосна",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Неизвестное дерево",
     "tree.stage.done": "полностью выросло",
     "tree.stage.partial": "{{stageName}} ({{step}} из {{max}})",

diff --git a/LookupAnything/i18n/th.json b/LookupAnything/i18n/th.json
@@ -618,6 +618,8 @@
     "tree.name.oak": "ต้นโอ๊ก (Oak Tree)",
     "tree.name.palm": "ต้นปาล์ม (Palm Tree)",
     "tree.name.pine": "ต้นสน (Pine Tree)",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "ต้นไม้ไม่ทราบชนิด (Unknown Tree)",
     "tree.stage.done": "โตเต็มที่",
     "tree.stage.partial": "{{stageName}} ({{step}}/{{max}})",

diff --git a/LookupAnything/i18n/tr.json b/LookupAnything/i18n/tr.json
@@ -616,6 +616,8 @@
     "tree.name.oak": "Meşe Ağaçı",
     "tree.name.palm": "Palmiye Ağaçı",
     "tree.name.pine": "Çam Ağaçı",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Bilinmeyen Ağaç",
     "tree.stage.done": "Tamamen olgunlaşmış",
     "tree.stage.partial": "{{stageName}} ({{step}} of {{max}})",

diff --git a/LookupAnything/i18n/uk.json b/LookupAnything/i18n/uk.json
@@ -616,6 +616,8 @@
     "tree.name.oak": "Дуб",
     "tree.name.palm": "Пальма",
     "tree.name.pine": "Сосна",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "Невідоме дерево",
     "tree.stage.done": "Повністю виросло",
     "tree.stage.partial": "{{stageName}} ({{step}} з {{max}})",

diff --git a/LookupAnything/i18n/zh.json b/LookupAnything/i18n/zh.json
@@ -617,6 +617,8 @@
     "tree.name.oak": "橡树",
     "tree.name.palm": "棕榈树",
     "tree.name.pine": "松树",
+    "tree.name.mossy": "Mossy Tree", // TODO
+    "tree.name.mystic": "Mystic Tree", // TODO
     "tree.name.unknown": "未知",
     "tree.stage.done": "完全长成",
     "tree.stage.partial": "{{stageName}}（总共{{max}}个阶段中的第{{step}}阶段）",

diff --git a/TractorMod/Framework/Attachments/ScytheAttachment.cs b/TractorMod/Framework/Attachments/ScytheAttachment.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using Microsoft.Xna.Framework;
 using Pathoschild.Stardew.Common;
-using Pathoschild.Stardew.Common.Enums;
 using Pathoschild.Stardew.TractorMod.Framework.Config;
 using StardewModdingAPI;
 using StardewValley;
@@ -278,7 +277,7 @@ private bool TryHarvestTree([NotNullWhen(true)] TerrainFeature? terrainFeature,
                 case Tree tree:
                     if (tree.hasSeed.Value && !tree.tapped.Value)
                     {
-                        bool shouldHarvest = tree.treeType.Value == TreeType.Palm || tree.treeType.Value == TreeType.Palm2
+                        bool shouldHarvest = tree.treeType.Value is (Tree.palmTree or Tree.palmTree2)
                             ? this.Config.HarvestFruitTrees
                             : this.Config.HarvestTreeSeeds;