diff options
| -rw-r--r-- | include/attack.hpp | 5 | ||||
| -rw-r--r-- | include/components.hpp | 5 | ||||
| -rw-r--r-- | main.cpp | 2 | ||||
| -rw-r--r-- | src/attack.cpp | 11 | ||||
| -rw-r--r-- | src/components.cpp | 10 | ||||
| -rw-r--r-- | src/player.cpp | 7 | ||||
| -rw-r--r-- | src/world.cpp | 3 | ||||
| -rw-r--r-- | xml/!town.xml | 1 | ||||
| -rw-r--r-- | xml/entities.xml | 2 |
9 files changed, 26 insertions, 20 deletions
diff --git a/include/attack.hpp b/include/attack.hpp index ef67a79..0ab5138 100644 --- a/include/attack.hpp +++ b/include/attack.hpp @@ -13,11 +13,12 @@ enum class AttackType : char { }; struct AttackEvent { - AttackEvent(vec2 p, AttackType at, int pow = 10) - : pos(p), type(at), power(pow) {} + AttackEvent(vec2 p, AttackType at, bool fp, int pow = 10) + : pos(p), type(at), fromplayer(fp), power(pow) {} vec2 pos; AttackType type; + bool fromplayer; int power; }; diff --git a/include/components.hpp b/include/components.hpp index 20a1419..dafb859 100644 --- a/include/components.hpp +++ b/include/components.hpp @@ -611,10 +611,11 @@ struct Aggro : public Component { }; struct Hit : public Component { - Hit(int d) - : damage(d) {} + Hit(int d, bool p = false) + : damage(d), pierce(p) {} int damage; + bool pierce; void fromXML(XMLElement* imp, XMLElement* def) final { (void)imp; @@ -117,8 +117,8 @@ int main(int argc, char *argv[]) ///////////////////////////// - game::engine.getSystem<InventorySystem>()->add("Wood Sword", 1); game::engine.getSystem<InventorySystem>()->add("Hunters Bow", 1); + game::engine.getSystem<InventorySystem>()->add("Wood Sword", 1); game::engine.getSystem<InventorySystem>()->add("Arrow", 198); std::list<SDL_Event> eventQueue; diff --git a/src/attack.cpp b/src/attack.cpp index 6fb6cec..e1ce45c 100644 --- a/src/attack.cpp +++ b/src/attack.cpp @@ -39,18 +39,16 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev, (void)ev; (void)dt; - auto pid = game::engine.getSystem<PlayerSystem>()->getId(); - // handle attacking entities en.each<Hit, Position>([&](entityx::Entity p, Hit& hit, Position& ppos) { bool die = false; en.each<Health, Position, Solid>([&](entityx::Entity e, Health& health, Position& pos, Solid& dim) { - if (e.id() != pid && inrange(ppos.x, pos.x, pos.x + dim.width) && inrange(ppos.y, pos.y - 2, pos.y + dim.height)) { + if (!e.has_component<Player>() && inrange(ppos.x, pos.x, pos.x + dim.width) && inrange(ppos.y, pos.y - 2, pos.y + dim.height)) { health.health -= hit.damage; game::engine.getSystem<ParticleSystem>()->addMultiple(15, ParticleType::SmallBlast, [&](){ return vec2(pos.x + dim.width / 2, pos.y + dim.height / 2); }, 300, 7); - die = true; - } else if (game::engine.getSystem<WorldSystem>()->isAboveGround(vec2(ppos.x, ppos.y))) + die = !hit.pierce; + } else if (game::engine.getSystem<WorldSystem>()->isAboveGround(vec2(ppos.x, ppos.y - 5))) die = true; }); @@ -65,8 +63,7 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev, case AttackType::LongSlash: en.each<Position, Solid, Health>( [&a](entityx::Entity e, Position& pos, Solid& dim, Health& h) { - (void)e; - if (e.has_component<Player>()) + if (!(e.has_component<Player>() ^ a.fromplayer)) return; if (inrange(a.pos.x, pos.x, pos.x + dim.width, HLINES(shortSlashLength)) && diff --git a/src/components.cpp b/src/components.cpp index dee56a6..14599c2 100644 --- a/src/components.cpp +++ b/src/components.cpp @@ -3,6 +3,7 @@ #include <entityx/entityx.h> #include <events.hpp> +#include <attack.hpp> #include <render.hpp> #include <ui.hpp> #include <engine.hpp> @@ -50,15 +51,18 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e // make the entity wander // TODO initialX and range? - if (0 && entity.has_component<Aggro>()) { + if (entity.has_component<Aggro>()) { auto ppos = game::engine.getSystem<PlayerSystem>()->getPosition(); if (ppos.x > position.x && ppos.x < position.x + entity.component<Solid>()->width) { - auto& h = entity.component<Health>()->health; + auto dim = entity.component<Solid>(); + ev.emit<AttackEvent>(vec2(position.x + dim->width, position.y + dim->height), + AttackType::ShortSlash, false); + /*auto& h = entity.component<Health>()->health; if (h > 0) { fight = true; toFight = entity; h = 0; - } + }*/ } else direction.x = (ppos.x > position.x) ? .01 : -.01; } else if (entity.has_component<Wander>()) { diff --git a/src/player.cpp b/src/player.cpp index 711ddae..204b7f0 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -105,6 +105,9 @@ void PlayerSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, (void)ev; (void)dt; + if (player.component<Health>()->health <= 0) + abort(); + auto& vel = *player.component<Direction>().get(); if (moveLeft & !moveRight) @@ -221,7 +224,7 @@ void PlayerSystem::receive(const UseItemEvent& uie) auto loc = getPosition(); auto &solid = *player.component<Solid>().get(); loc.x += solid.width / 2, loc.y += solid.height / 2; - game::events.emit<AttackEvent>(loc, AttackType::ShortSlash); + game::events.emit<AttackEvent>(loc, AttackType::ShortSlash, true); } else if (uie.item->type == "Bow") { if (game::engine.getSystem<InventorySystem>()->take("Arrow", 1)) { auto e = game::entities.create(); @@ -238,7 +241,7 @@ void PlayerSystem::receive(const UseItemEvent& uie) sprite->addSpriteSegment(SpriteData(tex.sprite), 0); auto dim = HLINES(sprite->getSpriteSize()); e.assign<Solid>(dim.x, dim.y); - e.assign<Hit>(10); + e.assign<Hit>(10, false); } } diff --git a/src/world.cpp b/src/world.cpp index 9a47576..3688e98 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -1089,9 +1089,10 @@ void WorldSystem::detect(entityx::TimeDelta dt) { game::entities.each<Health>( [](entityx::Entity e, Health& h) { - if (h.health <= 0) + if (h.health <= 0) { e.kill(); //e.destroy(); + } }); game::entities.each<Grounded, Position, Solid>( diff --git a/xml/!town.xml b/xml/!town.xml index 7506f70..9351652 100644 --- a/xml/!town.xml +++ b/xml/!town.xml @@ -13,7 +13,6 @@ <structure type="1" position="300.0,100.0"/> <structure inside="bobshouse.xml" type="1" position="10.0,100.0"/> <skirl /> - <skirl /> </World> <Dialog name="Bob"> diff --git a/xml/entities.xml b/xml/entities.xml index 60fe149..df2751a 100644 --- a/xml/entities.xml +++ b/xml/entities.xml @@ -62,7 +62,7 @@ </frame> </Sprite> <Direction /> - <Health value="500" /> + <Health value="5" /> <Solid /> <Physics /> <Name value="SKIRL" /> |