changes

diff --git a/assets/NPC.png b/assets/NPC.png
deleted file mode 100644 (file)
index 7c46dce..0000000
Binary files a/assets/NPC.png and /dev/null differ

diff --git a/assets/NPC.png.bak b/assets/NPC.png.bak
deleted file mode 100644 (file)
index fdebfa9..0000000
Binary files a/assets/NPC.png.bak and /dev/null differ

diff --git a/assets/NPC_Walk.png b/assets/NPC_Walk.png
deleted file mode 100644 (file)
index c342ec3..0000000
Binary files a/assets/NPC_Walk.png and /dev/null differ

diff --git a/assets/NPC_Walk0.png b/assets/NPC_Walk0.png
deleted file mode 100644 (file)
index 087ff25..0000000
Binary files a/assets/NPC_Walk0.png and /dev/null differ

diff --git a/assets/NPC_Walk2.png b/assets/NPC_Walk2.png
deleted file mode 100644 (file)
index 37273cc..0000000
Binary files a/assets/NPC_Walk2.png and /dev/null differ

diff --git a/assets/NPC_Walk3.png b/assets/NPC_Walk3.png
deleted file mode 100644 (file)
index 79c8401..0000000
Binary files a/assets/NPC_Walk3.png and /dev/null differ

diff --git a/assets/NPC_Walk4.png b/assets/NPC_Walk4.png
deleted file mode 100644 (file)
index 8de788f..0000000
Binary files a/assets/NPC_Walk4.png and /dev/null differ

diff --git a/assets/NPC_Walk5.png b/assets/NPC_Walk5.png
deleted file mode 100644 (file)
index a2fc130..0000000
Binary files a/assets/NPC_Walk5.png and /dev/null differ

diff --git a/assets/NPC_Walk6.png b/assets/NPC_Walk6.png
deleted file mode 100644 (file)
index 05e65d9..0000000
Binary files a/assets/NPC_Walk6.png and /dev/null differ

diff --git a/assets/NPC_Walk7.png b/assets/NPC_Walk7.png
deleted file mode 100644 (file)
index 20baa62..0000000
Binary files a/assets/NPC_Walk7.png and /dev/null differ

diff --git a/assets/NPC_Walk8.png b/assets/NPC_Walk8.png
deleted file mode 100644 (file)
index 42e4750..0000000
Binary files a/assets/NPC_Walk8.png and /dev/null differ

diff --git a/assets/NPC_Walk9.png b/assets/NPC_Walk9.png
deleted file mode 100644 (file)
index 01a1bf7..0000000
Binary files a/assets/NPC_Walk9.png and /dev/null differ

diff --git a/assets/bgTrashWaves.png b/assets/bgTrashWaves.png
deleted file mode 100644 (file)
index 6a177cd..0000000
Binary files a/assets/bgTrashWaves.png and /dev/null differ

diff --git a/assets/bgWoodTile.png b/assets/bgWoodTile.png
deleted file mode 100644 (file)
index 5b631bf..0000000
Binary files a/assets/bgWoodTile.png and /dev/null differ

diff --git a/assets/blankNormal.png b/assets/blankNormal.png
deleted file mode 100644 (file)
index cff3ee7..0000000
Binary files a/assets/blankNormal.png and /dev/null differ

diff --git a/assets/cat_normal.png b/assets/cat_normal.png
deleted file mode 100644 (file)
index 59aaee8..0000000
Binary files a/assets/cat_normal.png and /dev/null differ

diff --git a/assets/cat_normal_old.png b/assets/cat_normal_old.png
deleted file mode 100644 (file)
index c3ed4aa..0000000
Binary files a/assets/cat_normal_old.png and /dev/null differ

diff --git a/assets/effects/bowhit.gif b/assets/effects/bowhit.gif
new file mode 100644 (file)
index 0000000..0afa420
Binary files /dev/null and b/assets/effects/bowhit.gif differ

diff --git a/assets/mountain.png b/assets/mountain.png
deleted file mode 100644 (file)
index 7039174..0000000
Binary files a/assets/mountain.png and /dev/null differ

diff --git a/assets/music/embark_bits.wav b/assets/music/embark_bits.wav
new file mode 100644 (file)
index 0000000..75ad5f2
Binary files /dev/null and b/assets/music/embark_bits.wav differ

diff --git a/assets/nug.png b/assets/nug.png
deleted file mode 100644 (file)
index 3bcf1ed..0000000
Binary files a/assets/nug.png and /dev/null differ

diff --git a/assets/skirl.png b/assets/skirl.png
index 263607b896415b58efbe349db7a21cef5ef03400..d31e15f96f3de2d719456ce2875b35a72441ec94 100644 (file)
Binary files a/assets/skirl.png and b/assets/skirl.png differ

diff --git a/config/items.xml b/config/items.xml
index c613c4e77f34e6119d56d489837efc25429cba97..3819b1e2c795a1661e65b169b9cabc07331786ed 100644 (file)
--- a/config/items.xml
+++ b/config/items.xml
@@ -37,7 +37,7 @@
        </attack>
 </item>
 <item name="Hunters Bow" type="Bow" drawOffset="5,16" maxStackSize="1" sound="assets/sounds/shortSwing.wav" sprite="assets/items/bow.png" cooldown="600">
-       <attack effect="assets/effects/starAttack.gif">
+       <attack effect="assets/effects/bowhit.gif">
                effect = function()
                        flash(255, 0, 255)
                        damage(4)

diff --git a/include/systems/lua.hpp b/include/systems/lua.hpp
index cb859ad73466e844935a9926b0678ad4adc2ee19..b9fa684ed9daf7b5e925e73a106252e5c5faee49 100644 (file)
--- a/include/systems/lua.hpp
+++ b/include/systems/lua.hpp
@@ -2,7 +2,7 @@
 #define SYSTEMS_LUA_HPP_
 
 #include <string>
-#include <lua.hpp>
+#include <lua5.3/lua.hpp>
 #include <tuple>
 #include <vector>
 

diff --git a/src/attack.cpp b/src/attack.cpp
index 41fb77c8057e37188d6695a58cfdf856de700f86..fe32dad1fbe5a7ede7ba30dfa645075afaefc0d8 100644 (file)
--- a/src/attack.cpp
+++ b/src/attack.cpp
@@ -54,7 +54,7 @@ namespace lua {
                auto h = entity->component<Health>();
                h->health -= d;
                if (h->ouch != nullptr)
-                       Mix_PlayChannel(0, h->ouch, 0);
+                       Mix_PlayChannel(1, h->ouch, 0);
                return 0;
        }
 }
@@ -140,7 +140,7 @@ void AttackSystem::render(void)
        Render::worldShader.enable();
        for (auto& ae : effects) {
                ae.effect(ae.counter / RATE); // bind current frame
-               auto dim = ae.effect.getTextureDim();
+               auto dim = ae.effect.getTextureDim() * game::HLINE;
                auto s = ae.pos - (dim / 2);
                GLfloat verts[] = {
                        s.x,         s.y,         z, 0, 0,

diff --git a/xcf/bowhit.xcf b/xcf/bowhit.xcf
new file mode 100644 (file)
index 0000000..0e6d926
Binary files /dev/null and b/xcf/bowhit.xcf differ

diff --git a/xcf/skirl.xcf b/xcf/skirl.xcf
new file mode 100644 (file)
index 0000000..eefbb80
Binary files /dev/null and b/xcf/skirl.xcf differ