From 44239e9e7aafd4454e2710dea3824adef5d8eb4b Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Wed, 29 Apr 2020 18:01:36 +0200
Subject: [PATCH] TranslationFileWriter: patch to duplicate less stuff into
 mods (#2541)

---
 .../translations/TranslationFileWriter.kt     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt
index 830c4d8a2f..5e9ae8de3c 100644
--- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt
+++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt
@@ -1,4 +1,4 @@
-package com.unciv.models.translations
+package com.unciv.models.translations
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.files.FileHandle
@@ -47,7 +47,8 @@ object TranslationFileWriter {
         // read the JSON files
         val generatedStrings = generateStringsFromJSONs(modFolder)
         // Tutorials are a bit special
-        generatedStrings["Tutorials"] = generateTutorialsStrings()
+        if (modFolder == null)          // this is for base only, not mods
+            generatedStrings["Tutorials"] = generateTutorialsStrings()
 
         for (key in generatedStrings.keys) {
             linesFromTemplates.add("\n#################### Lines from $key.json ####################\n")
@@ -212,9 +213,15 @@ object TranslationFileWriter {
     private fun isFieldTranslatable(field: Field, fieldValue: Any?): Boolean {
         return  fieldValue != null &&
                 fieldValue != "" &&
-                field.name !in setOf("startBias", "requiredTech", "uniqueTo",
-                "aiFreeTechs", "aiFreeUnits", "techRequired", "improvingTech", "promotions",
-                "building", "revealedBy", "attackSound", "requiredResource", "obsoleteTech")
+                field.name !in setOf (
+                        "aiFreeTechs", "aiFreeUnits", "attackSound", "building",
+                        "cannotBeBuiltWith", "cultureBuildings", "improvement", "improvingTech",
+                        "obsoleteTech", "occursOn", "prerequisites", "promotions",
+                        "providesFreeBuilding", "replaces", "requiredBuilding", "requiredBuildingInAllCities",
+                        "requiredNearbyImprovedResources", "requiredResource", "requiredTech", "requires",
+                        "resourceTerrainAllow", "revealedBy", "startBias", "techRequired",
+                        "terrainsCanBeBuiltOn", "terrainsCanBeFoundOn", "turnsInto", "uniqueTo", "upgradesTo"
+                    )
     }
 
     private fun getJavaClassByName(name: String): Class<Any> {
@@ -235,4 +242,4 @@ object TranslationFileWriter {
         }
     }
 
-}
\ No newline at end of file
+}