From 114157c7bf0769f12b7c560a412f91e63342a514 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Wed, 3 Apr 2024 23:15:04 -0400 Subject: [PATCH] fix display names for new wild tree types --- .../Machines/TerrainFeatures/TreeMachine.cs | 4 +-- Common/Common.projitems | 1 - Common/Enums/TreeType.cs | 29 ----------------- .../Lookups/TerrainFeatures/TreeSubject.cs | 32 +++++++++---------- LookupAnything/docs/release-notes.md | 1 + LookupAnything/i18n/de.json | 2 ++ LookupAnything/i18n/default.json | 2 ++ LookupAnything/i18n/es.json | 2 ++ LookupAnything/i18n/fr.json | 2 ++ LookupAnything/i18n/hu.json | 2 ++ LookupAnything/i18n/it.json | 2 ++ LookupAnything/i18n/ja.json | 2 ++ LookupAnything/i18n/ko.json | 2 ++ LookupAnything/i18n/pl.json | 2 ++ LookupAnything/i18n/pt.json | 2 ++ LookupAnything/i18n/ru.json | 2 ++ LookupAnything/i18n/th.json | 2 ++ LookupAnything/i18n/tr.json | 2 ++ LookupAnything/i18n/uk.json | 2 ++ LookupAnything/i18n/zh.json | 2 ++ .../Framework/Attachments/ScytheAttachment.cs | 3 +- 21 files changed, 48 insertions(+), 52 deletions(-) delete mode 100644 Common/Enums/TreeType.cs diff --git a/Automate/Framework/Machines/TerrainFeatures/TreeMachine.cs b/Automate/Framework/Machines/TerrainFeatures/TreeMachine.cs index 6246ff112..4aa20797b 100644 --- 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 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 index 5825998ab..0b3825239 100644 --- a/Common/Common.projitems +++ b/Common/Common.projitems @@ -23,7 +23,6 @@ - diff --git a/Common/Enums/TreeType.cs b/Common/Enums/TreeType.cs deleted file mode 100644 index 271cad609..000000000 --- a/Common/Enums/TreeType.cs +++ /dev/null @@ -1,29 +0,0 @@ -using StardewValley.TerrainFeatures; - -namespace Pathoschild.Stardew.Common.Enums -{ - /// Indicates a tree type. - internal static class TreeType - { - /// The tree type ID for a big mushroom tree. - public static string BigMushroom { get; } = Tree.mushroomTree.ToString(); - - /// The tree type ID for a mahogany tree. - public static string Mahogany { get; } = Tree.mahoganyTree.ToString(); - - /// The tree type ID for a maple tree. - public static string Maple { get; } = Tree.leafyTree.ToString(); - - /// The tree type ID for an oak tree. - public static string Oak { get; } = Tree.bushyTree.ToString(); - - /// The tree type ID for a palm tree. - public static string Palm { get; } = Tree.palmTree.ToString(); - - /// The tree type ID for a palm2 tree. - public static string Palm2 { get; } = Tree.palmTree2.ToString(); - - /// The tree type ID for a pine tree. - public static string Pine { get; } = Tree.pineTree.ToString(); - } -} diff --git a/LookupAnything/Framework/Lookups/TerrainFeatures/TreeSubject.cs b/LookupAnything/Framework/Lookups/TerrainFeatures/TreeSubject.cs index 6d150d25d..35ffc54f2 100644 --- 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() + }; } /// Whether there are adjacent trees that prevent growth. diff --git a/LookupAnything/docs/release-notes.md b/LookupAnything/docs/release-notes.md index 2e69768e4..537b25ec4 100644 --- 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 index 7727a888f..d3b6049b8 100644 --- 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 index b02eda04b..eeccade1a 100644 --- 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 index af3e65be1..b705e3f2f 100644 --- 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 index 49587b798..113dbb763 100644 --- 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 index 67fb7a358..5673162ae 100644 --- 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 index 72d2610be..fe496f1a5 100644 --- 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 index e7879e881..57fb1d10d 100644 --- 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 index b915e1679..01acbf3e5 100644 --- 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 index 771e69b08..faa3b7299 100644 --- 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 index 948c77577..0448caa3c 100644 --- 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 index 5bd496e26..412716960 100644 --- 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 index f12dd839b..6575a3262 100644 --- 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 index 12399c5f3..0e60c4d34 100644 --- 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 index a32fc0a88..f01abc67f 100644 --- 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 index b64416360..64fdede3b 100644 --- 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 index 38c948f8a..fe14c3731 100644 --- 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;