From 5f8a4b6b17d6ada0097412b13605717dd5a310df Mon Sep 17 00:00:00 2001 From: realtradam Date: Sun, 26 Dec 2021 21:42:56 -0500 Subject: added rate of fire, tweaked ai --- app/systems/player_weapon.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'app/systems/player_weapon.rb') diff --git a/app/systems/player_weapon.rb b/app/systems/player_weapon.rb index 2ecd250..9cb4df0 100644 --- a/app/systems/player_weapon.rb +++ b/app/systems/player_weapon.rb @@ -1,11 +1,13 @@ FF::Scn::BoidRules.add( FF::Sys.new('PlayerWeapon') do - if $gtk.args.inputs.mouse.down - player = FF::Cmp::SingletonPlayer[0].entities[0] - unless player.nil? + player = FF::Cmp::SingletonPlayer[0].entities[0] + unless player.nil? + weapon = player.components[FF::Cmp::Weapon][0] + weapon.cooldown -= 1 unless weapon.cooldown <= 0 + if $gtk.args.inputs.mouse.button_left boid = player.components[FF::Cmp::Boid][0] - weapon = player.components[FF::Cmp::Weapon][0] if player.components[FF::Cmp::Weapon][0].cooldown <= 0 + weapon.cooldown += weapon.cooldown_max # 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) -- cgit v1.2.3 From e61ba8cc576465f2c01283bfad1c0eb452e34769 Mon Sep 17 00:00:00 2001 From: arngo <27396817+arngo@users.noreply.github.com> Date: Sun, 26 Dec 2021 23:04:51 -0500 Subject: add shooting sounds --- app/systems/player_weapon.rb | 1 + sounds/shoot.mp3 | Bin 0 -> 40750 bytes 2 files changed, 1 insertion(+) create mode 100644 sounds/shoot.mp3 (limited to 'app/systems/player_weapon.rb') diff --git a/app/systems/player_weapon.rb b/app/systems/player_weapon.rb index 9cb4df0..e16570c 100644 --- a/app/systems/player_weapon.rb +++ b/app/systems/player_weapon.rb @@ -13,6 +13,7 @@ FF::Scn::BoidRules.add( 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')) + $gtk.args.gtk.queue_sound "sounds/shoot.mp3" end end end diff --git a/sounds/shoot.mp3 b/sounds/shoot.mp3 new file mode 100644 index 0000000..33be5cd Binary files /dev/null and b/sounds/shoot.mp3 differ -- cgit v1.2.3