diff options
| author | _Tradam <[email protected]> | 2021-12-19 21:45:57 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-19 21:45:57 -0500 |
| commit | 154030e74b007b6fc65e45e50107b69b717c7b1f (patch) | |
| tree | 6637be53e3a095bbac8d62d4c1c433c443be7bd9 /app/systems/collision_damage.rb | |
| parent | 1016853319aa9e5ebbe23a940fe53054e05aa6e2 (diff) | |
| parent | 9d840260e873ee914a97eb37ab7aeaab54c098bf (diff) | |
| download | SteelWings-154030e74b007b6fc65e45e50107b69b717c7b1f.tar.gz SteelWings-154030e74b007b6fc65e45e50107b69b717c7b1f.zip | |
Merge pull request #4 from realtradam/pshoot-dev
Finished player shooting bullet system
Diffstat (limited to 'app/systems/collision_damage.rb')
| -rw-r--r-- | app/systems/collision_damage.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/systems/collision_damage.rb b/app/systems/collision_damage.rb index 9e47c0c..7ed0216 100644 --- a/app/systems/collision_damage.rb +++ b/app/systems/collision_damage.rb @@ -4,6 +4,8 @@ FF::Scn::BoidRules.add( 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) hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage |