From c4bb8dc381dbbaa188a37af07e2d37fcee058b22 Mon Sep 17 00:00:00 2001 From: ultrablob Date: Tue, 7 May 2024 16:52:50 -0400 Subject: [PATCH] match versions to fix odd bugs --- .github/workflows/build.yml | 4 ++-- Laser.gd | 7 ------- laser_enemy.gd | 1 - player-apezoid.gd | 2 -- player-apezoid.tscn | 4 ++-- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27be61b..aa215ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,8 @@ jobs: uses: firebelley/godot-export@v5.2.0 with: # Defining all the required inputs - godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.1/Godot_v4.1-stable_linux.x86_64.zip - godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.1/Godot_v4.1-stable_export_templates.tpz + godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.2.2/Godot_v4.2.2-stable_linux.x86_64.zip + godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.2.2/Godot_v4.2.2-stable_export_templates.tpz relative_project_path: ./ - name: Move vercel.json diff --git a/Laser.gd b/Laser.gd index e73da7f..4753889 100644 --- a/Laser.gd +++ b/Laser.gd @@ -5,14 +5,7 @@ func _ready(): modulate = Color(Color.WHITE, 0.2) pass # Replace with function body. -func fire(): - $VisibleTimer.start() - # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): #print(points) points[1] = to_local($RayCast2D.get_collision_point()) - - -func set_transparent(): - modulate = Color.TRANSPARENT diff --git a/laser_enemy.gd b/laser_enemy.gd index 68f71a2..a08d281 100644 --- a/laser_enemy.gd +++ b/laser_enemy.gd @@ -37,7 +37,6 @@ func fire_laser(): tween.tween_callback(can_shoot.bind(true)) #tween.tween_callback(set_laser_texture.bind(active_texture)) tween.tween_callback($Sprite2D.pause) - tween.tween_callback($Line2D.fire) tween.tween_interval(0.2) tween.tween_callback(can_shoot.bind(false)) tween.tween_callback(set_laser_texture.bind(aiming_texture)) diff --git a/player-apezoid.gd b/player-apezoid.gd index 6ff8148..e175ec2 100644 --- a/player-apezoid.gd +++ b/player-apezoid.gd @@ -21,7 +21,6 @@ func update_animation(): func _input(event): if event.is_action_pressed("shoot") and speed != 0: - $Laser.fire() fire_laser() func _process(delta): @@ -44,7 +43,6 @@ func fire_laser(): tween.tween_callback(play_with_delay) tween.set_parallel(false) tween.tween_callback(set_laser_texture.bind(active_texture)) - tween.tween_callback($Laser.fire) tween.tween_property(self, "can_damage", true, 0) tween.tween_interval(0.2) tween.tween_property(self, "can_damage", false, 0) diff --git a/player-apezoid.tscn b/player-apezoid.tscn index 3e0febd..3ea9be7 100644 --- a/player-apezoid.tscn +++ b/player-apezoid.tscn @@ -6,7 +6,7 @@ [ext_resource type="Texture2D" uid="uid://br5lt5658ioy3" path="res://apezoid_engine.png" id="3_paps8"] [ext_resource type="Texture2D" uid="uid://1jurox63577w" path="res://apezoid-engine-idle.png" id="4_0rv3w"] [ext_resource type="Texture2D" uid="uid://djfjdlri5xdkn" path="res://dotted line.png" id="6_05kle"] -[ext_resource type="Script" path="res://laser-apezoid.gd" id="7_f1dfs"] +[ext_resource type="Script" path="res://Laser.gd" id="7_otdmu"] [ext_resource type="AudioStream" uid="uid://4ou7posn1vbd" path="res://laserSmall_004.ogg" id="8_6whae"] [sub_resource type="AtlasTexture" id="AtlasTexture_8qb1c"] @@ -191,7 +191,7 @@ points = PackedVector2Array(0, 0, 1075, 0) width = 30.0 texture = ExtResource("6_05kle") texture_mode = 1 -script = ExtResource("7_f1dfs") +script = ExtResource("7_otdmu") [node name="RayCast2D" type="RayCast2D" parent="Laser" index="0"] target_position = Vector2(50000, 2.08165e-12)