clean up

foopod · Jul 7, 2021 · 446ab2d · 446ab2d
1 parent 6cfbcdd
commit 446ab2d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/feline/include/fe_enemy.h b/feline/include/fe_enemy.h
@@ -57,6 +57,7 @@ namespace fe
             void update(bn::fixed_point player_pos);
             bn::fixed_point pos();
             bool is_hit(Hitbox attack);
+            bool is_vulnerable();
             void set_visible(bool visibility);
             void teleport();
             bool damage_from_left(int damage);

diff --git a/feline/src/fe_enemy.cpp b/feline/src/fe_enemy.cpp
@@ -129,6 +129,10 @@ namespace fe
         _sprite.value().set_visible(visiblity);
     }
 
+    bool Enemy::is_vulnerable(){
+        return !_invulnerable;
+    }
+
     bool Enemy::damage_from_left(int damage){
         if(_type == ENEMY_TYPE::BOSS && !_invulnerable){
             teleport();
@@ -146,9 +150,9 @@ namespace fe
     bool Enemy::damage_from_right(int damage){
         if(_type == ENEMY_TYPE::BOSS && !_invulnerable){
             teleport();
-        } else if(_type != ENEMY_TYPE::WALL){
+        } else if(_type == ENEMY_TYPE::SLIMEO){
             _dy-=0.4;
-            _dx+=1;
+            // _dx+=1;
         }
         _dir = -1;
         _direction_timer = 0;
@@ -461,10 +465,14 @@ namespace fe
             }
 
             if(_hp >= 0){
-                _pos.set_x(_pos.x() + _dx);
-                _pos.set_y(_pos.y() + _dy);
-                _sprite.value().set_position(_pos);
-                _sprite.value().set_y(_sprite.value().y() - 1);
+                if(_type == ENEMY_TYPE::BOSS && _invulnerable){
+
+                }else {
+                    _pos.set_x(_pos.x() + _dx);
+                    _pos.set_y(_pos.y() + _dy);
+                    _sprite.value().set_position(_pos);
+                    _sprite.value().set_y(_sprite.value().y() - 1); 
+                }
             }
 
             if(!_action.value().done()){

diff --git a/feline/src/fe_player.cpp b/feline/src/fe_player.cpp
@@ -217,17 +217,17 @@ namespace fe
 
             for(int i = 0; i < _enemies.value()->size(); i++)
             {
-                if(_enemies.value()->at(i).is_hit(attack_hitbox))
+                if(_enemies.value()->at(i).is_hit(attack_hitbox) && _enemies.value()->at(i).is_vulnerable())
                 {
                     if(_sprite.horizontal_flip()){
                         _enemies.value()->at(i).damage_from_left(1);
                         if(_enemies.value()->at(i).type() == ENEMY_TYPE::SLIMEO){
-                            _dx +=1;
+                            _dx =4;
                         }
                     } else {
                         _enemies.value()->at(i).damage_from_right(1);
                         if(_enemies.value()->at(i).type() == ENEMY_TYPE::SLIMEO){
-                            _dx -=1;
+                            _dx =-4;
                         }
                     }
 
@@ -243,7 +243,7 @@ namespace fe
         {
             if(_enemies.value()->at(i).is_hit(collide_hitbox))
             {
-                if(!_invulnerable){
+                if(!_invulnerable && _enemies.value()->at(i).hp() > 0){
                     _invulnerable = true;
                     _healthbar.set_hp(_healthbar.hp() - 1);
                     _dy -= 0.3;

diff --git a/feline/src/fe_scene_dungeon_return.cpp b/feline/src/fe_scene_dungeon_return.cpp
@@ -196,7 +196,7 @@ namespace fe
             _player->update_position(map,level);
             _player->apply_animation_state();
 
-             BN_LOG(bn::to_string<32>(_player->pos().x())+" " + bn::to_string<32>(_player->pos().y()));
+            //  BN_LOG(bn::to_string<32>(_player->pos().x())+" " + bn::to_string<32>(_player->pos().y()));
             vines.value().set_position(bn::fixed_point((_player->pos().x()-100)/10,(_player->pos().y())/10));
 
             //door