From b7dea8016b5b1328808e28b76cc12343907de63e Mon Sep 17 00:00:00 2001 From: Arnold <27396817+arngo@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:39:15 -0500 Subject: implement ai randomizer, gameover screen, and other bug fixes * Cleaned up factory. Fixed most bugs with death(last bug should be with move camera). * check if player entity is nil before shooting or moving camera * implement ai randomizer * separate button click detection to new system * implement gameover screen with button to return to menu * use reverse_each instead of cloning Co-authored-by: realtradam --- app/systems/player_weapon.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'app/systems/player_weapon.rb') diff --git a/app/systems/player_weapon.rb b/app/systems/player_weapon.rb index 02a50ec..2ecd250 100644 --- a/app/systems/player_weapon.rb +++ b/app/systems/player_weapon.rb @@ -2,14 +2,16 @@ FF::Scn::BoidRules.add( FF::Sys.new('PlayerWeapon') do if $gtk.args.inputs.mouse.down player = FF::Cmp::SingletonPlayer[0].entities[0] - boid = player.components[FF::Cmp::Boid][0] - weapon = player.components[FF::Cmp::Weapon][0] - if player.components[FF::Cmp::Weapon][0].cooldown <= 0 - # spawn bullet facing correct angle - mag = Math.sqrt((boid.vx ** 2) + (boid.vy ** 2)) - bullet = Factory::Bullet.new(damage: weapon.damage, vx: (boid.vx/mag) * weapon.speed, vy: (boid.vy/mag) * weapon.speed, x: boid.x, y: boid.y) - bullet.remove(bullet.components[FF::Cmp::Team][0]) - bullet.add(FF::Cmp::Team.new(team: 'player')) + unless player.nil? + boid = player.components[FF::Cmp::Boid][0] + weapon = player.components[FF::Cmp::Weapon][0] + if player.components[FF::Cmp::Weapon][0].cooldown <= 0 + # spawn bullet facing correct angle + mag = Math.sqrt((boid.vx ** 2) + (boid.vy ** 2)) + bullet = Factory::Bullet.new(damage: weapon.damage, vx: (boid.vx/mag) * weapon.speed, vy: (boid.vy/mag) * weapon.speed, x: boid.x, y: boid.y) + bullet.remove(bullet.components[FF::Cmp::Team][0]) + bullet.add(FF::Cmp::Team.new(team: 'player')) + end end end end -- cgit v1.2.3