optimized collision checks

3 files changed, 43 insertions, 10 deletions

diff --git a/app/factories/ships/sample_enemy.rb b/app/factories/ships/sample_enemy.rb
index a2a3a21..af8c4ca 100644
--- a/app/factories/ships/sample_enemy.rb
+++ b/app/factories/ships/sample_enemy.rb
@@ -41,6 +41,7 @@ class Factory
         FF::Cmp::Team.new,
         FF::Cmp::SingletonDebugVectorArrow[0],
         FF::Cmp::SingletonCamera[0],
+        FF::Cmp::SingletonEnemyTeam[0],
       )
     end
   end
diff --git a/app/scenes/scenes.rb b/app/scenes/scenes.rb
index f0cdf17..cd41c37 100644
--- a/app/scenes/scenes.rb
+++ b/app/scenes/scenes.rb
@@ -4,5 +4,5 @@ FF::Scn.new('Cleanup')
 FF::Stg.add(
   FF::Scn.new('UI'),
   FF::Scn.new('Render'),
-  FF::Scn.new('Debug')
 )
+FF::Scn.new('Debug')
diff --git a/app/systems/collision_damage.rb b/app/systems/collision_damage.rb
index cc052bd..df2e050 100644
--- a/app/systems/collision_damage.rb
+++ b/app/systems/collision_damage.rb
@@ -1,20 +1,52 @@
 FF::Scn::BoidRules.add(
   FF::Sys.new("CollisionDamage", priority: 65) do
-    FF::Cmp::Hitcircle.each do |hitcircle_self|
+
+    FF::Cmp::SingletonEnemyTeam[0].entities.each do |enemy_entity|
+      hitcircle_self = enemy_entity.components[FF::Cmp::Hitcircle][0]
       boid_self = hitcircle_self.entities[0].components[FF::Cmp::Boid][0]
-      FF::Cmp::Hitcircle.each do |hitcircle_target|
-        next if hitcircle_self == hitcircle_target
-        next if hitcircle_self.entities[0].components[FF::Cmp::Team][0].team == hitcircle_target.entities[0].components[FF::Cmp::Team][0].team
-        #puts 'passed first check'
+      FF::Cmp::SingletonBullet[0].entities.each do |bullet_entity|
+        hitcircle_target = bullet_entity.components[FF::Cmp::Hitcircle][0]
         boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0]
         if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r)
-          puts 'checks here'.upcase
-          puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil?
-          puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil?
-          puts 'checks end'.upcase
+          #puts 'checks here'.upcase
+          #puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil?
+          #puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil?
+          #puts 'checks end'.upcase
           hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage
+          hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage
         end
+
       end
+
+      player = FF::Cmp::SingletonPlayer[0].entities[0]
+      unless player.nil?
+        hitcircle_target = player.components[FF::Cmp::Hitcircle][0]
+        boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0]
+        if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r)
+          hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage
+          hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage
+        end
+      end
+    end
+  end
+)
+=begin
+FF::Cmp::Hitcircle.each do |hitcircle_self|
+  boid_self = hitcircle_self.entities[0].components[FF::Cmp::Boid][0]
+  FF::Cmp::Hitcircle.each do |hitcircle_target|
+    next if hitcircle_self == hitcircle_target
+    next if hitcircle_self.entities[0].components[FF::Cmp::Team][0].team == hitcircle_target.entities[0].components[FF::Cmp::Team][0].team
+    #puts 'passed first check'
+    boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0]
+    if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r)
+      puts 'checks here'.upcase
+      puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil?
+      puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil?
+      puts 'checks end'.upcase
+      hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage
     end
   end
+end
+end
 )
+=end