From c75208ccd46971fcf0bc89cf80b52f28b140f582 Mon Sep 17 00:00:00 2001
From: realtradam <github@tradam.dev>
Date: Thu, 27 Jan 2022 19:56:54 -0500
Subject: changed level design dir

---
 LevelDesign/dungeon_ v1.0/dungeon_.tsx |  4 ----
 LevelDesign/tiled_files/dungeon_.tsx   |  4 ++++
 src/logic.rb                           | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 LevelDesign/dungeon_ v1.0/dungeon_.tsx
 create mode 100644 LevelDesign/tiled_files/dungeon_.tsx

diff --git a/LevelDesign/dungeon_ v1.0/dungeon_.tsx b/LevelDesign/dungeon_ v1.0/dungeon_.tsx
deleted file mode 100644
index b4feb87..0000000
--- a/LevelDesign/dungeon_ v1.0/dungeon_.tsx	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.2" name="dungeon_" tilewidth="16" tileheight="16" tilecount="280" columns="14">
- <image source="dungeon_.png" width="224" height="320"/>
-</tileset>
diff --git a/LevelDesign/tiled_files/dungeon_.tsx b/LevelDesign/tiled_files/dungeon_.tsx
new file mode 100644
index 0000000..b4feb87
--- /dev/null
+++ b/LevelDesign/tiled_files/dungeon_.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.5" tiledversion="1.7.2" name="dungeon_" tilewidth="16" tileheight="16" tilecount="280" columns="14">
+ <image source="dungeon_.png" width="224" height="320"/>
+</tileset>
diff --git a/src/logic.rb b/src/logic.rb
index 55d408f..2af10d8 100644
--- a/src/logic.rb
+++ b/src/logic.rb
@@ -174,7 +174,7 @@ FECS::Cmp::Hitbox.new(
 
 Player = FECS::Ent.new(
   FECS::Cmp::Player.new,
-  FECS::Cmp::Hp.new(value: 4, max_invincible_time: 2),
+  FECS::Cmp::Hp.new(value: 4, max_invincible_time: 1.6),
   FECS::Cmp::Position.new(x: 120, y: 300),
   FECS::Cmp::Velocity.new,
   FECS::Cmp::Tileset.new(
@@ -191,9 +191,9 @@ Player = FECS::Ent.new(
   ),
   FECS::Cmp::Hitbox.new(
     #rec: Rl::Rectangle.new(0,0,16*2,20*2),
-    rec: Rl::Rectangle.new(0,0,16*2,10*2),
-    offset_x: 4*2,
-    offset_y: 14*2
+    rec: Rl::Rectangle.new(0,0,10*2,8*2),
+    offset_x: 7*2,
+    offset_y: 16*2
   ),
 )
 
@@ -364,6 +364,8 @@ FECS::Scn::Play.add(
     player = FECS::Cmp::Player.first.entity
     player_hitbox = player.component[FECS::Cmp::Hitbox]
     hp_cmp = player.component[FECS::Cmp::Hp]
+
+    next unless player.component[FECS::Cmp::Player].moved
     next if hp_cmp.value <= 0
     if hp_cmp.invincible_timer >= 0
       hp_cmp.invincible_timer -= Rl.frame_time
@@ -436,7 +438,7 @@ FECS::Scn::Play.add(
         PlayerTileset.frame = 0
       end
     elsif player.state == 'dead'
-      anim_speed = 3
+      anim_speed = 6
       if tileset_cmp.tileset.frame + (anim_speed * Rl.frame_time) <= PlayerTileset.frames.length
         PlayerTileset.step(anim_speed * Rl.frame_time)
       else
-- 
cgit v1.2.3