just renaming colliding dwarf trader items for now

HeroInTheDark/scripts/fa_recipes.lua

@@ -120,14 +120,19 @@ local r=Recipe("kabobs", {Ingredient("fa_coalpebble", 2,"images/inventoryimages/
 local r=Recipe("icecream", {Ingredient("fa_silverpebble", 1,"images/inventoryimages/fa_inventoryimages.xml"),Ingredient("fa_ironpebble", 1,"images/inventoryimages/fa_inventoryimages.xml")}, RECIPETABS.FA_DWARFTRADER, TECH.FA_FOODSTAND, nil, nil, true)
 local r=Recipe("meat_dried", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_FOODSTAND, nil, nil, true,5)
 
-local r=Recipe("multitool_axe_pickaxe", {Ingredient("bluegem", 2)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
-local r=Recipe("sewing_kit", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
-local r=Recipe("armorslurper", {Ingredient("fa_diamondpebble", 1,"images/inventoryimages/fa_inventoryimages.xml")}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
-local r=Recipe("sewing_kit", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+local r=Recipe("fa_dorf_pickaxe", {Ingredient("bluegem", 2)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+r.image="multitool_axe_pickaxe.tex"
+local r=Recipe("fa_dorf_sewing_kit", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+r.image="sewing_kit.tex"
+local r=Recipe("fa_dorf_hungerbelt", {Ingredient("fa_diamondpebble", 1,"images/inventoryimages/fa_inventoryimages.xml")}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+r.image="armorslurper.tex"
 local r=Recipe("fa_dorf_lantern", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
-local r=Recipe("trap_teeth", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+r.image="lantern.tex"
+local r=Recipe("fa_dorf_trap", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+r.image="trap_teeth.tex"
 --Dwarf bed	2 red gems
-local r=Recipe("yellowstaff", {Ingredient("fa_diamondpebble", 3,"images/inventoryimages/fa_inventoryimages.xml")}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+local r=Recipe("fa_dorf_yellowstaff", {Ingredient("fa_diamondpebble", 3,"images/inventoryimages/fa_inventoryimages.xml")}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
+r.image="yellowstaff.tex"
 local r=Recipe("fa_tinydorfbag", {Ingredient("fa_diamondpebble", 3,"images/inventoryimages/fa_inventoryimages.xml")}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFITEMSTAND, nil, nil, true)
 r.image="fa_bag.tex"
 r.atlas = "images/inventoryimages/fa_inventoryimages.xml"
@@ -150,7 +155,7 @@ local r=Recipe("fa_dorfbed_player", {Ingredient("bluegem", 2)}, RECIPETABS.FA_DW
 r.image="tent.tex"
 local r=Recipe("charcoal", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFRESOURCESTAND, nil, nil, true,20)
 local r=Recipe("fa_dorf_gunpowder", {Ingredient("goldnugget", 1)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFRESOURCESTAND, nil, nil, true)
-local r=Recipe("thulecite", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFRESOURCESTAND, nil, nil, true)
+r.image="gunpowder.tex"
 local r=Recipe("marble", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFRESOURCESTAND, nil, nil, true,5)
 local r=Recipe("bluegem", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFRESOURCESTAND, nil, nil, true)
 local r=Recipe("redgem", {Ingredient("goldnugget", 5)}, RECIPETABS.FA_DWARFTRADER, TECH.FA_DORFRESOURCESTAND, nil, nil, true)

HeroInTheDark/scripts/fa_strings.lua

@@ -641,10 +641,13 @@ STRINGS.DWARF_TALK_HELP_CHOP_WOOD = {"What do you think i am, a beaver?", "HA! T
 
 STRINGS.NAMES.FA_DORF_BAG="Dwarven Bag of Holding"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DORF_BAG="Dwarven Bag of Holding"
+STRINGS.RECIPE_DESC.FA_DORF_BAG = "Dwarven Bag of Holding"
 STRINGS.NAMES.FA_TINYDORFBAG="Tiny Dwarven Bag"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_TINYDORFBAG="Tiny Dwarven Bag"
+STRINGS.RECIPE_DESC.FA_TINYDORFBAG ="Tiny Dwarven Bag"
 STRINGS.NAMES.FA_SMALLDORFBAG="Small Dwarven Bag"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_SMALLDORFBAG="Small Dwarven Bag"
+STRINGS.RECIPE_DESC.FA_SMALLDORFBAG ="Small Dwarven Bag"
 STRINGS.NAMES.FA_SCROLLCASE="Scroll case"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_SCROLLCASE="Scroll case"
 STRINGS.NAMES.FA_WANDCASE="Wand Case"
@@ -1428,6 +1431,22 @@ STRINGS.RECIPE_DESC.FA_DORF_LANTERN =  "Dwarven Lantern"
 STRINGS.NAMES.FA_DORF_GUNPOWDER = "Dwarven Gunpowder"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DORF_GUNPOWDER =  "Dwarven Gunpowder"
 STRINGS.RECIPE_DESC.FA_DORF_GUNPOWDER =  "Dwarven Gunpowder"
+STRINGS.NAMES.FA_DORF_SEWING_KIT = "Dwarven Sewing Kit"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DORF_SEWING_KIT = "Dwarven Sewing Kit"
+STRINGS.RECIPE_DESC.FA_DORF_SEWING_KIT =  "Dwarven Sewing Kit"
+
+STRINGS.NAMES.FA_DORF_PICKAXE = "Dwarven Pickaxe"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DORF_PICKAXE =  "Dwarven Pickaxe"
+STRINGS.RECIPE_DESC.FA_DORF_PICKAXE =  "Dwarven Pickaxe"
+STRINGS.NAMES.FA_DORF_TRAP = "Dwarven Trap"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DORF_TRAP =  "Dwarven Trap"
+STRINGS.RECIPE_DESC.FA_DORF_TRAP =  "Dwarven Trap"
+STRINGS.NAMES.FA_DORF_HUNGERBELT = "Belt of Hunger"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DORF_HUNGERBELT =  "Belt of Hunger"
+STRINGS.RECIPE_DESC.FA_DORF_HUNGERBELT =  "Belt of Hunger"
+STRINGS.NAMES.FA_DORF_YELLOWSTAFF = "Star Caller's Staff"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DORF_YELLOWSTAFF =  "Star Caller's Staff"
+STRINGS.RECIPE_DESC.FA_DORF_YELLOWSTAFF =  "Star Caller's Staff"
 
 STRINGS.NAMES.FA_BLUERACK = "Armor Rack"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_BLUERACK =  "Armor Rack"

HeroInTheDark/scripts/prefabs/fa_dorfhut.lua

@@ -393,10 +393,39 @@ end
 
 local function fndorflantern()
     local inst = Prefabs["lantern"].fn()
+    inst.components.inventoryitem.imagename="lantern"
     return inst
 end
 local function fndorfgunpowder()
     local inst = Prefabs["gunpowder"].fn()
+    inst.components.inventoryitem.imagename="gunpowder"
+    return inst
+end
+
+local function fa_dorf_sewing_kit()
+    local inst = Prefabs["sewing_kit"].fn()
+    inst.components.inventoryitem.imagename="sewing_kit"
+    return inst
+end
+
+local function fa_dorf_pickaxe()
+    local inst = Prefabs["multitool_axe_pickaxe"].fn()
+    inst.components.inventoryitem.imagename="multitool_axe_pickaxe"
+    return inst
+end
+local function fa_dorf_trap()
+    local inst = Prefabs["trap_teeth"].fn()
+    inst.components.inventoryitem.imagename="trap_teeth"
+    return inst
+end
+local function fa_dorf_hungerbelt()
+    local inst = Prefabs["armorslurper"].fn()
+    inst.components.inventoryitem.imagename="armorslurper"
+    return inst
+end
+local function fa_dorf_yellowstaff()
+    local inst = Prefabs["yellowstaff"].fn()
+    inst.components.inventoryitem.imagename="yellowstaff"
     return inst
 end
 
@@ -416,4 +445,12 @@ Prefab( "common/objects/fa_dorfstand_recipe_armor_7", fndorfarmorrecipes, standa
 Prefab( "common/objects/fa_dorfstand_recipe_smelting_8", fndorfsmelterrecipes, standassets, prefabs ),
 Prefab( "common/objects/fa_dorfstand_recipe_other_9", fndorfotherrecipes, standassets, prefabs ),
 Prefab( "common/objects/fa_dorf_lantern", fndorflantern, {}, {} ),
-Prefab( "common/objects/fa_dorf_gunpowder", fndorfgunpowder, {}, {} )
+Prefab( "common/objects/fa_dorf_gunpowder", fndorfgunpowder, {}, {} ),
+Prefab( "common/objects/fa_dorf_sewing_kit", fa_dorf_sewing_kit, {}, {} ),
+Prefab( "common/objects/fa_dorf_pickaxe", fa_dorf_pickaxe, {}, {} ),
+Prefab( "common/objects/fa_dorf_trap", fa_dorf_trap, {}, {} ),
+Prefab( "common/objects/fa_dorf_hungerbelt", fa_dorf_hungerbelt, {}, {} ),
+Prefab( "common/objects/fa_dorf_yellowstaff", fa_dorf_yellowstaff, {}, {} )
+
+
+