From 12da9e3334fff09c7974916db23fc050865b61f6 Mon Sep 17 00:00:00 2001 From: Dustin Date: Wed, 9 Apr 2025 22:26:51 -0700 Subject: [PATCH] Pew now has more pew. --- src/PewMachine.gd | 5 ++++- src/actors/players/playerE/PlayerE.tscn | 4 ++-- src/classes/projectile.gd | 6 +++--- src/projectiles/MushroomPew.tscn | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/PewMachine.gd b/src/PewMachine.gd index bbb6aa4..5b9a979 100644 --- a/src/PewMachine.gd +++ b/src/PewMachine.gd @@ -42,7 +42,9 @@ func shoot(direction = 1): # t.origin = Vector2(position.x, position.y) # transform = t - print("Fire Debug: ", direction, " Gun position: ", position, transform.origin) + var normal_vector = (position * get_parent().transform.x).normalized() + print("Fire Debug: ", direction, " Gun position: ", get_parent().transform.x, position, normal_vector) + # position.x = position.x * direction #shifting position before fire was unreliable if not timer.is_stopped(): return false @@ -53,6 +55,7 @@ func shoot(direction = 1): # bullet.global_position = global_position - Vector2(position.x * 2, 0) if bullet is Projectile: bullet.global_position = global_position + bullet.direction_normal = normal_vector #bullet.linear_velocity = Vector2(direction * BULLET_VELOCITY, 0) diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn index 1c9e90b..1158a9d 100644 --- a/src/actors/players/playerE/PlayerE.tscn +++ b/src/actors/players/playerE/PlayerE.tscn @@ -85,7 +85,7 @@ states = [ ExtResource( 4 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 8 [node name="AnimatedSprite_StateReceiver" parent="." index="1"] frames = ExtResource( 2 ) -animation = "ledge-grab" +animation = "attack-shoot" script = ExtResource( 5 ) __meta__ = { "_aseprite_wizard_config_": { @@ -150,6 +150,6 @@ interactable_parent_callback = "touch_the_thing" [node name="PewMachine" type="Position2D" parent="." index="11"] unique_name_in_owner = true -position = Vector2( 10, 1.36422e-12 ) +position = Vector2( 21, -7 ) script = ExtResource( 28 ) scene_path = ExtResource( 29 ) diff --git a/src/classes/projectile.gd b/src/classes/projectile.gd index f26dba6..ca4d710 100644 --- a/src/classes/projectile.gd +++ b/src/classes/projectile.gd @@ -6,8 +6,8 @@ extends Area2D # var a = 2 # var b = "text" -var velocity_pps :float = 60 - +export var velocity_pps :float = 1 +var direction_normal := Vector2(0,0) # Called when the node enters the scene tree for the first time. func _ready(): @@ -17,7 +17,7 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): rotate(delta * 10) - position += Vector2(velocity_pps * delta, velocity_pps * delta) + position += direction_normal * velocity_pps * delta func _on_body_entered(body): diff --git a/src/projectiles/MushroomPew.tscn b/src/projectiles/MushroomPew.tscn index 341a271..c4e665d 100644 --- a/src/projectiles/MushroomPew.tscn +++ b/src/projectiles/MushroomPew.tscn @@ -8,6 +8,7 @@ radius = 6.0 height = 2.0 [node name="MushroomPew" instance=ExtResource( 1 )] +velocity_pps = 300.0 [node name="CollisionShape2D" type="CollisionShape2D" parent="." index="0"] shape = SubResource( 1 )