From 22bf0a105e18a0e4541de6f5742f2c8547791bbe Mon Sep 17 00:00:00 2001 From: tcsullivan Date: Mon, 31 Dec 2018 18:00:17 -0500 Subject: changes --- assets/NPC.png | Bin 555 -> 0 bytes assets/NPC.png.bak | Bin 473 -> 0 bytes assets/NPC_Walk.png | Bin 487 -> 0 bytes assets/NPC_Walk0.png | Bin 447 -> 0 bytes assets/NPC_Walk2.png | Bin 493 -> 0 bytes assets/NPC_Walk3.png | Bin 487 -> 0 bytes assets/NPC_Walk4.png | Bin 462 -> 0 bytes assets/NPC_Walk5.png | Bin 490 -> 0 bytes assets/NPC_Walk6.png | Bin 476 -> 0 bytes assets/NPC_Walk7.png | Bin 466 -> 0 bytes assets/NPC_Walk8.png | Bin 468 -> 0 bytes assets/NPC_Walk9.png | Bin 468 -> 0 bytes assets/bgTrashWaves.png | Bin 1454217 -> 0 bytes assets/bgWoodTile.png | Bin 75181 -> 0 bytes assets/blankNormal.png | Bin 172 -> 0 bytes assets/cat_normal.png | Bin 820 -> 0 bytes assets/cat_normal_old.png | Bin 684 -> 0 bytes assets/effects/bowhit.gif | Bin 0 -> 494 bytes assets/mountain.png | Bin 2197 -> 0 bytes assets/music/embark_bits.wav | Bin 0 -> 7112794 bytes assets/nug.png | Bin 20875 -> 0 bytes assets/skirl.png | Bin 436 -> 478 bytes config/items.xml | 2 +- include/systems/lua.hpp | 2 +- src/attack.cpp | 4 ++-- xcf/bowhit.xcf | Bin 0 -> 3028 bytes xcf/skirl.xcf | Bin 0 -> 1759 bytes 27 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 assets/NPC.png delete mode 100644 assets/NPC.png.bak delete mode 100644 assets/NPC_Walk.png delete mode 100644 assets/NPC_Walk0.png delete mode 100644 assets/NPC_Walk2.png delete mode 100644 assets/NPC_Walk3.png delete mode 100644 assets/NPC_Walk4.png delete mode 100644 assets/NPC_Walk5.png delete mode 100644 assets/NPC_Walk6.png delete mode 100644 assets/NPC_Walk7.png delete mode 100644 assets/NPC_Walk8.png delete mode 100644 assets/NPC_Walk9.png delete mode 100644 assets/bgTrashWaves.png delete mode 100644 assets/bgWoodTile.png delete mode 100644 assets/blankNormal.png delete mode 100644 assets/cat_normal.png delete mode 100644 assets/cat_normal_old.png create mode 100644 assets/effects/bowhit.gif delete mode 100644 assets/mountain.png create mode 100644 assets/music/embark_bits.wav delete mode 100644 assets/nug.png create mode 100644 xcf/bowhit.xcf create mode 100644 xcf/skirl.xcf diff --git a/assets/NPC.png b/assets/NPC.png deleted file mode 100644 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 index 3bcf1ed..0000000 Binary files a/assets/nug.png and /dev/null differ diff --git a/assets/skirl.png b/assets/skirl.png index 263607b..d31e15f 100644 Binary files a/assets/skirl.png and b/assets/skirl.png differ diff --git a/config/items.xml b/config/items.xml index c613c4e..3819b1e 100644 --- a/config/items.xml +++ b/config/items.xml @@ -37,7 +37,7 @@ - + effect = function() flash(255, 0, 255) damage(4) diff --git a/include/systems/lua.hpp b/include/systems/lua.hpp index cb859ad..b9fa684 100644 --- a/include/systems/lua.hpp +++ b/include/systems/lua.hpp @@ -2,7 +2,7 @@ #define SYSTEMS_LUA_HPP_ #include -#include +#include #include #include diff --git a/src/attack.cpp b/src/attack.cpp index 41fb77c..fe32dad 100644 --- a/src/attack.cpp +++ b/src/attack.cpp @@ -54,7 +54,7 @@ namespace lua { auto h = entity->component(); 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 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 index 0000000..eefbb80 Binary files /dev/null and b/xcf/skirl.xcf differ -- cgit v1.2.3