missing goblin minimap/firehut text/wines no longer stackable/dorf king asset ref

Author: jkolokotronis

HeroInTheDark/minimap/fa_minimap.tex

@@ -28,14 +28,15 @@
 		<Element name="fa_smeltingfurnace.tex" u1="0.718994" u2="0.749756" v1="0.503906" v2="0.996094" />
 		<Element name="fa_walkingshoes.tex" u1="0.750244" u2="0.781006" v1="0.503906" v2="0.996094" />
 		<Element name="fa_wheat.tex" u1="0.781494" u2="0.812256" v1="0.503906" v2="0.996094" />
-		<Element name="marbleshield.tex" u1="0.812744" u2="0.843506" v1="0.503906" v2="0.996094" />
-		<Element name="necromancer.tex" u1="0.843994" u2="0.874756" v1="0.503906" v2="0.996094" />
-		<Element name="paladin.tex" u1="0.875244" u2="0.906006" v1="0.503906" v2="0.996094" />
-		<Element name="ranger.tex" u1="0.906494" u2="0.937256" v1="0.503906" v2="0.996094" />
-		<Element name="reflectshield.tex" u1="0.937744" u2="0.968506" v1="0.503906" v2="0.996094" />
-		<Element name="rockshield.tex" u1="0.968994" u2="0.999756" v1="0.503906" v2="0.996094" />
-		<Element name="tinkerer.tex" u1="0.000244141" u2="0.0310059" v1="0.00390625" v2="0.496094" />
-		<Element name="wizard.tex" u1="0.0314941" u2="0.0622559" v1="0.00390625" v2="0.496094" />
-		<Element name="woodshield.tex" u1="0.0627441" u2="0.0935059" v1="0.00390625" v2="0.496094" />
+		<Element name="goblin.tex" u1="0.812744" u2="0.843506" v1="0.503906" v2="0.996094" />
+		<Element name="marbleshield.tex" u1="0.843994" u2="0.874756" v1="0.503906" v2="0.996094" />
+		<Element name="necromancer.tex" u1="0.875244" u2="0.906006" v1="0.503906" v2="0.996094" />
+		<Element name="paladin.tex" u1="0.906494" u2="0.937256" v1="0.503906" v2="0.996094" />
+		<Element name="ranger.tex" u1="0.937744" u2="0.968506" v1="0.503906" v2="0.996094" />
+		<Element name="reflectshield.tex" u1="0.968994" u2="0.999756" v1="0.503906" v2="0.996094" />
+		<Element name="rockshield.tex" u1="0.000244141" u2="0.0310059" v1="0.00390625" v2="0.496094" />
+		<Element name="tinkerer.tex" u1="0.0314941" u2="0.0622559" v1="0.00390625" v2="0.496094" />
+		<Element name="wizard.tex" u1="0.0627441" u2="0.0935059" v1="0.00390625" v2="0.496094" />
+		<Element name="woodshield.tex" u1="0.0939941" u2="0.124756" v1="0.00390625" v2="0.496094" />
 	</Elements>
 </Atlas>

HeroInTheDark/minimap/fa_minimap.xml

@@ -579,6 +579,8 @@ STRINGS.NAMES.FA_ORCTHRONE = "Orc Throne"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_ORCTHRONE = "Orc Throne"
 STRINGS.NAMES.GOBLINHUT = "Goblin Hut"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.GOBLINHUT = "Goblin Hut"
+STRINGS.NAMES.FA_FIREGOBLINHUT = "Fire Goblin Hut"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_FIREGOBLINHUT = "Fire Goblin Hut"
 STRINGS.NAMES.FA_DRUIDPET = "Wolf"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DRUIDPET = "Wolf"
 STRINGS.NAMES.FA_DRUIDPET_L20 = "Wolf"

HeroInTheDark/minimap/goblin.png

@@ -388,6 +388,6 @@ end
 
 return Prefab( "common/characters/fa_dorf", normal, assets, prefabs),
  Prefab( "common/characters/fa_dorf_merchant", trader, assets, prefabs),
-Prefab( "common/characters/fa_dorf_king", kingfn, assets, prefabs),
+Prefab( "common/characters/fa_dorf_king", kingfn, assets_king, prefabs),
 Prefab( "common/characters/fa_dorf_king_guard", kingguard, assets, prefabs),
 Prefab( "common/characters/fa_dorf_guard", guard, assets, prefabs)

HeroInTheDark/scripts/fa_strings.lua

@@ -619,6 +619,7 @@ end
 
 local function winecommon(inst,eatfn)
     inst:AddComponent("finiteuses")
+    isnt:RemoveComponent("stackable")
     inst.components.finiteuses:SetOnFinished( onfinished)
     inst.components.finiteuses:SetMaxUses(3)
     inst.components.finiteuses:SetUses(3)