missing strings/namespace crash

(cherry picked from commit 94ae52a)
jkolokotronis · Apr 10, 2015 · 4be0fbe · 4be0fbe
1 parent fc30173
commit 4be0fbe
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/HeroInTheDark/scripts/fa_strings.lua b/HeroInTheDark/scripts/fa_strings.lua
@@ -519,6 +519,19 @@ STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_ANIMATEDARMOR_ADAMANTINE = "Armor"
 
 STRINGS.NAMES.FA_SKULL = "Skull"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_SKULL = "Skull"
+STRINGS.NAMES.SKELETONSPAWN = "Skeleton"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.SKELETONSPAWN = "Skeleton"
+STRINGS.NAMES.FA_DRYBONES = "Dry Bones"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DRYBONES = "Dry Bones"
+STRINGS.NAMES.FA_DARTDRYBONES = "Dry Bones"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_DARTDRYBONES = "Dry Bones"
+STRINGS.NAMES.FA_ZOMBIE = "Zombie"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_ZOMBIE ="Zombie"
+STRINGS.NAMES.FA_GHOUL = "Ghoul"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_GHOUL = "Ghoul"
+STRINGS.NAMES.FA_MUMMY = "Mummy"
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_MUMMY = "Mummy"
+
 STRINGS.NAMES.FA_BONFIRE = "Bonfire"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_BONFIRE = "Bonfire"
 STRINGS.NAMES.FA_BBQ = "Barbeque"
@@ -985,8 +998,8 @@ STRINGS.NAMES.FA_SPELL_SLEEP = "Sleep"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_SPELL_SLEEP = "Puts certain enemies to sleep."
 STRINGS.RECIPE_DESC.FA_SPELL_SLEEP = "Puts certain enemies to sleep."
 STRINGS.NAMES.FA_SPELL_MAGICMISSILE = "Magic Missile"
-STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_SPELL_MAGICMISSILE = "Creates a wand the fires a magical missile at opponents."
-STRINGS.RECIPE_DESC.FA_SPELL_MAGICMISSILE = "Creates a wand the fires a magical missile at opponents."
+STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_SPELL_MAGICMISSILE = "Creates a wand that fires a magical missile at opponents."
+STRINGS.RECIPE_DESC.FA_SPELL_MAGICMISSILE = "Creates a wand that fires a magical missile at opponents."
 STRINGS.NAMES.FA_SPELL_RAYOFENFEEBLEMENT = "Ray of Enfeeblement"
 STRINGS.CHARACTERS.GENERIC.DESCRIBE.FA_SPELL_RAYOFENFEEBLEMENT = "Weakens opponents."
 STRINGS.RECIPE_DESC.FA_SPELL_RAYOFENFEEBLEMENT = "Weakens opponents."

diff --git a/HeroInTheDark/scripts/prefabs/fa_lavamound.lua b/HeroInTheDark/scripts/prefabs/fa_lavamound.lua
@@ -138,12 +138,12 @@ local function fn(Sim)
                 inst.fa_digtime=data.fa_digtime
                 inst.fa_digresettask=inst:DoTaskInTime(MOUND_RESET_PERIOD-GetTime()+inst.fa_digtime,mound_reset)
             else
-                inst.fa_digtime=GLOBAL.GetTime()
+                inst.fa_digtime=GetTime()
                 inst.fa_digresettask=inst:DoTaskInTime(MOUND_RESET_PERIOD, mound_reset)
             end
 
-            local nexttime=inst.components.spawner.nextspawntime or GLOBAL.SKELETONSPAWNDELAY*math.random()
-            inst.components.spawner:Configure( "skeletonspawn",GLOBAL.SKELETONSPAWNDELAY,nexttime)
+            local nexttime=inst.components.spawner.nextspawntime or SKELETONSPAWNDELAY*math.random()
+            inst.components.spawner:Configure( "skeletonspawn",SKELETONSPAWNDELAY,nexttime)
 	    end
     end           
 

diff --git a/HeroInTheDark/scripts/prefabs/fa_totems.lua b/HeroInTheDark/scripts/prefabs/fa_totems.lua
@@ -342,6 +342,7 @@ local function redfnbase(Sim)
 
     inst:ListenForEvent("attacked", OnAttacked)
     inst:ListenForEvent("onhitother",onhitother)
+    inst.components.health.fa_resistances[FA_DAMAGETYPE.FIRE]=1
 
     inst:AddComponent("inventory")
 

diff --git a/HeroInTheDark/scripts/prefabs/shields.lua b/HeroInTheDark/scripts/prefabs/shields.lua
@@ -133,14 +133,8 @@ local function fn(name)
     return not(owner:HasTag("player")) or (owner:HasTag("fa_shielduser"))
   end
 
-  if EQUIPSLOTS["BACK"] then
-      inst.components.equippable.equipslot = EQUIPSLOTS.BACK
-  elseif EQUIPSLOTS["PACK"] then
       inst.components.equippable.equipslot = EQUIPSLOTS.PACK
-  else
-      inst.components.equippable.equipslot = EQUIPSLOTS.BODY
-  end    
-
+
   inst:AddTag("shield")    
 --    inst.components.equippable:SetOnUnequip( onunequip )
     inst:AddComponent("armor")

diff --git a/HeroInTheDark/scripts/scenarios/fa_minechest_fireballtrap.lua b/HeroInTheDark/scripts/scenarios/fa_minechest_fireballtrap.lua
@@ -35,7 +35,7 @@ local function OnCreate(inst, scenariorunner)
 end
 
 local function triggertrap(inst,scenariorunner)
-	FA_ScenarioUtil.FA_SpawnPrefabInProx(inst,"fa_redtotem_kos",2)
+	FA_ScenarioUtil.FA_SpawnPrefabInProx(inst,"fa_redtotem_kos",2,8)
 	scenariorunner:ClearScenario()
 end