bugfix

jkolokotronis · Mar 25, 2015 · 7fe8a8b · 7fe8a8b
1 parent dddf6b8
commit 7fe8a8b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/HeroInTheDark/anim/fa_holysword.zip b/HeroInTheDark/anim/fa_holysword.zip
diff --git a/HeroInTheDark/anim/fa_holysword2.zip b/HeroInTheDark/anim/fa_holysword2.zip
diff --git a/HeroInTheDark/anim/fa_holysword3.zip b/HeroInTheDark/anim/fa_holysword3.zip
diff --git a/HeroInTheDark/exported/weapons/swords/holy sword/stage1/fa_holysword.scml b/HeroInTheDark/exported/weapons/swords/holy sword/stage1/fa_holysword.scml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<spriter_data scml_version="1.0" generator="BrashMonkey Spriter" generator_version="b8_2">
+<spriter_data scml_version="1.0" generator="BrashMonkey Spriter" generator_version="b5">
     <folder id="0">
         <file id="0" name="ground.png" width="110" height="334" pivot_x="0" pivot_y="1"/>
     </folder>
     <folder id="1" name="swap_weapon">
         <file id="0" name="swap_weapon/swap.png" width="110" height="334" pivot_x="0.553571" pivot_y="0.157738"/>
     </folder>
-    <entity id="0" name="fa_evilsword">
+    <entity id="0" name="fa_holysword">
         <animation id="0" name="idle" length="1000">
             <mainline>
                 <key id="0">
-                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                    <object_ref id="0" name="_0007_Steel-Sw_g" folder="0" file="0" abs_x="-53" abs_y="284" abs_pivot_x="0" abs_pivot_y="1" abs_angle="0" abs_scale_x="1" abs_scale_y="1" abs_a="1" timeline="0" key="0" z_index="0"/>
                 </key>
             </mainline>
             <timeline id="0" name="_0007_Steel-Sw_g">
@@ -22,7 +22,7 @@
         <animation id="1" name="BUILD" length="1000">
             <mainline>
                 <key id="0">
-                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                    <object_ref id="0" name="_0007_Steel-Sw_g_000" folder="0" file="0" abs_x="-69" abs_y="296" abs_pivot_x="0" abs_pivot_y="1" abs_angle="0" abs_scale_x="1" abs_scale_y="1" abs_a="1" timeline="0" key="0" z_index="0"/>
                 </key>
             </mainline>
             <timeline id="0" name="_0007_Steel-Sw_g_000">

diff --git a/HeroInTheDark/exported/weapons/swords/holy sword/stage2/fa_holysword2.scml b/HeroInTheDark/exported/weapons/swords/holy sword/stage2/fa_holysword2.scml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<spriter_data scml_version="1.0" generator="BrashMonkey Spriter" generator_version="b8_2">
+<spriter_data scml_version="1.0" generator="BrashMonkey Spriter" generator_version="b5">
     <folder id="0">
         <file id="0" name="ground.png" width="121" height="330" pivot_x="0" pivot_y="1"/>
     </folder>
     <folder id="1" name="swap_weapon">
         <file id="0" name="swap_weapon/swap.png" width="121" height="330" pivot_x="0.512195" pivot_y="0.153614"/>
     </folder>
-    <entity id="0" name="fa_evilsword2">
+    <entity id="0" name="fa_holysword2">
         <animation id="0" name="idle" length="1000">
             <mainline>
                 <key id="0">
-                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                    <object_ref id="0" name="_0007_Steel-Sw_g" folder="0" file="0" abs_x="-58" abs_y="282" abs_pivot_x="0" abs_pivot_y="1" abs_angle="0" abs_scale_x="1" abs_scale_y="1" abs_a="1" timeline="0" key="0" z_index="0"/>
                 </key>
             </mainline>
             <timeline id="0" name="_0007_Steel-Sw_g">
@@ -22,7 +22,7 @@
         <animation id="1" name="BUILD" length="1000">
             <mainline>
                 <key id="0">
-                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                    <object_ref id="0" name="_0007_Steel-Sw_g_000" folder="0" file="0" abs_x="-69" abs_y="296" abs_pivot_x="0" abs_pivot_y="1" abs_angle="0" abs_scale_x="1" abs_scale_y="1" abs_a="1" timeline="0" key="0" z_index="0"/>
                 </key>
             </mainline>
             <timeline id="0" name="_0007_Steel-Sw_g_000">

diff --git a/HeroInTheDark/exported/weapons/swords/holy sword/stage3/fa_holysword3.scml b/HeroInTheDark/exported/weapons/swords/holy sword/stage3/fa_holysword3.scml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<spriter_data scml_version="1.0" generator="BrashMonkey Spriter" generator_version="b8_2">
+<spriter_data scml_version="1.0" generator="BrashMonkey Spriter" generator_version="b5">
     <folder id="0">
         <file id="0" name="ground.png" width="134" height="331" pivot_x="0" pivot_y="1"/>
     </folder>
     <folder id="1" name="swap_weapon">
         <file id="0" name="swap_weapon/swap.png" width="134" height="331" pivot_x="0.514706" pivot_y="0.165165"/>
     </folder>
-    <entity id="0" name="fa_evilsword3">
+    <entity id="0" name="fa_holysword3">
         <animation id="0" name="idle" length="1000">
             <mainline>
                 <key id="0">
-                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                    <object_ref id="0" name="_0007_Steel-Sw_g" folder="0" file="0" abs_x="-67" abs_y="284" abs_pivot_x="0" abs_pivot_y="1" abs_angle="0" abs_scale_x="1" abs_scale_y="1" abs_a="1" timeline="0" key="0" z_index="0"/>
                 </key>
             </mainline>
             <timeline id="0" name="_0007_Steel-Sw_g">
@@ -22,7 +22,7 @@
         <animation id="1" name="BUILD" length="1000">
             <mainline>
                 <key id="0">
-                    <object_ref id="0" timeline="0" key="0" z_index="0"/>
+                    <object_ref id="0" name="_0007_Steel-Sw_g_000" folder="0" file="0" abs_x="-69" abs_y="296" abs_pivot_x="0" abs_pivot_y="1" abs_angle="0" abs_scale_x="1" abs_scale_y="1" abs_a="1" timeline="0" key="0" z_index="0"/>
                 </key>
             </mainline>
             <timeline id="0" name="_0007_Steel-Sw_g_000">

diff --git a/HeroInTheDark/scripts/fa_recipes.lua b/HeroInTheDark/scripts/fa_recipes.lua
@@ -87,7 +87,7 @@ r.image="fa_scroll_case.tex"
 r.atlas = "images/inventoryimages/fa_inventoryimages.xml"
 local r=Recipe("fa_smallwandcase", {Ingredient("fa_orcskin", 4,"images/inventoryimages/fa_inventoryimages.xml"),Ingredient("pigskin", 4),Ingredient("twigs", 10)}, RECIPETABS.SURVIVAL,  TECH.MAGIC_TWO)    
 r.image="fa_wand_case.tex"
-r.atlas = "images/inventoryimages/fa_wand_case.xml"
+r.atlas = "images/inventoryimages/fa_inventoryimages.xml"
 local r=Recipe("fa_bottle_curepoison", {Ingredient("poisonspidergland", 4,"images/inventoryimages/fa_inventoryimages.xml"), Ingredient("spidergland", 4), Ingredient("fa_bottle_r",1,"images/inventoryimages/fa_inventoryimages.xml")}, RECIPETABS.SURVIVAL,  TECH.NONE)
 r.image="fa_bottle_light_green.tex"
 r.atlas = "images/inventoryimages/fa_inventoryimages.xml"

diff --git a/HeroInTheDark/scripts/prefabs/holysword.lua b/HeroInTheDark/scripts/prefabs/holysword.lua
@@ -65,6 +65,7 @@ local function fn(name)
         owner.AnimState:Show("ARM_carry") 
         owner.AnimState:Hide("ARM_normal") 
     end
+    inst.components.equippable:SetOnEquip( onequip )
     inst.components.equippable:SetOnUnequip( onunequip )
 
     return inst

diff --git a/HeroInTheDark/scripts/prefabs/wizard.lua b/HeroInTheDark/scripts/prefabs/wizard.lua
@@ -256,7 +256,7 @@ local function enableL1spells()
     r.image="book_gardening.tex"
     local r=Recipe("fa_spell_endureelementsheat", {Ingredient("fa_lavapebble", 4,"images/inventoryimages/fa_inventoryimages.xml"), Ingredient("nightmarefuel", 4), Ingredient("redgem", 1)}, RECIPETABS.SPELLS,TECH.FA_SPELL)
     r.image="book_gardening.tex"
-    local r=Recipe("fa_spell_endureelementscold", {Ingredient("ice", 4,"images/inventoryimages/fa_inventoryimages.xml"), Ingredient("nightmarefuel", 2), Ingredient("bluegem", 1)}, RECIPETABS.SPELLS,TECH.FA_SPELL)
+    local r=Recipe("fa_spell_endureelementscold", {Ingredient("ice", 4), Ingredient("nightmarefuel", 2), Ingredient("bluegem", 1)}, RECIPETABS.SPELLS,TECH.FA_SPELL)
     r.image="book_gardening.tex"
     local r=Recipe("fa_magesword", {Ingredient("fa_coppersword", 1,"images/inventoryimages/fa_inventoryimages.xml"), Ingredient("nightmarefuel", 2)}, RECIPETABS.SPELLS,TECH.FA_SPELL)
     r.image="fa_coppersword.tex"