Progress

models/blaster-repeater.glb.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dd3oln1ucgqpd"
+path="res://.godot/imported/blaster-repeater.glb-5f1125651aecb8bf54890e793b8c6da4.scn"
+
+[deps]
+
+source_file="res://models/blaster-repeater.glb"
+dest_files=["res://.godot/imported/blaster-repeater.glb-5f1125651aecb8bf54890e793b8c6da4.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

models/platform-falling.glb.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://c0fgu1f2whait"
-path="res://.godot/imported/blaster-double.glb-432c9163e28f0aae29c58d0e5ca6594b.scn"
+uid="uid://3403atnv0s14"
+path="res://.godot/imported/platform-falling.glb-a1321a8710589d27b2a6e247cfe23359.scn"
 
 [deps]
 
-source_file="res://models/blaster-double.glb"
-dest_files=["res://.godot/imported/blaster-double.glb-432c9163e28f0aae29c58d0e5ca6594b.scn"]
+source_file="res://models/platform-falling.glb"
+dest_files=["res://.godot/imported/platform-falling.glb-a1321a8710589d27b2a6e247cfe23359.scn"]
 
 [params]
 

models/platform.glb.import

@@ -3,7 +3,7 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://dwvcy6wtanoyy"
+uid="uid://bwgwd5ue8i2bt"
 path="res://.godot/imported/platform.glb-3476c7cd272116fb58fd5d0a0eddb703.scn"
 
 [deps]

objects/enemy.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://d2g78tpqbyf5g"]
 
 [ext_resource type="PackedScene" uid="uid://lde2xq3vq635" path="res://models/enemy-flying.glb" id="1_3v8nl"]
-[ext_resource type="Script" path="res://scripts/enemy.gd" id="1_jg24b"]
+[ext_resource type="Script" path="res://objects/enemy.gd" id="1_jg24b"]
 [ext_resource type="SpriteFrames" uid="uid://dbv3sy5qjatnl" path="res://sprites/burst_animation.tres" id="3_iblw5"]
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_iix87"]

objects/player.gd

@@ -73,9 +73,6 @@ func _process(delta):
 	camera.rotation.x = lerp_angle(camera.rotation.x, rotation_target.x, delta * 25)
 	rotation.y = lerp_angle(rotation.y, rotation_target.y, delta * 25)
 	
-	container.rotation.y = lerp_angle(container.rotation.y, -input_mouse.x * 4, delta * 5)
-	#container.rotation.x = lerp_angle(v.rotation.x, -rotation_target.x / 3, delta * 10)
-	
 	container.position = lerp(container.position, container_offset - (applied_velocity / 30), delta * 10)
 	
 	# Movement sound
@@ -122,6 +119,8 @@ func handle_controls(delta):
 	if Input.is_action_just_pressed("mouse_capture_exit"):
 		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
 		mouse_captured = false
+		
+		input_mouse = Vector2.ZERO
 	
 	# Movement
 	
@@ -140,7 +139,7 @@ func handle_controls(delta):
 	rotation_target -= input.limit_length(1.0) * 5 * delta
 	rotation_target.x = clamp(rotation_target.x, deg_to_rad(-90), deg_to_rad(90))
 	
-	input_mouse = Vector2.ZERO
+	#input_mouse = Vector2.ZERO
 	
 	# Shooting
 	
@@ -228,9 +227,7 @@ func action_shoot():
 			get_tree().root.add_child(impact_instance)
 			
 			impact_instance.position = raycast.get_collision_point() + (raycast.get_collision_normal() / 10)
-			impact_instance.look_at(position, Vector3.UP, true)
-			#impact_instance.rotation_degrees.z = randf_range(-45, 45)
-	# Weapons
+			impact_instance.look_at(camera.global_transform.origin, Vector3.UP, true) 
 
 # Toggle between available weapons (listed in 'weapons')
 

objects/player.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=8 format=3 uid="uid://dl2ed4gkybggf"]
 
-[ext_resource type="Script" path="res://actors/player.gd" id="1_ffboj"]
+[ext_resource type="Script" path="res://objects/player.gd" id="1_ffboj"]
 [ext_resource type="Resource" uid="uid://cu2gtxlcmbb34" path="res://weapons/blaster-repeater.tres" id="2_6epbw"]
 [ext_resource type="Texture2D" uid="uid://8ggihh27mlrr" path="res://sprites/blob_shadow.png" id="2_b0fo8"]
 [ext_resource type="Resource" uid="uid://c56y8pqoyk15f" path="res://weapons/blaster.tres" id="3_kr4p8"]

scenes/main.tscn

@@ -1,12 +1,12 @@
 [gd_scene load_steps=8 format=3 uid="uid://dxvvlck8lej3f"]
 
 [ext_resource type="Environment" uid="uid://jvmpkdwaeaq" path="res://scenes/main-environment.tres" id="1_q8fpv"]
-[ext_resource type="PackedScene" uid="uid://dl2ed4gkybggf" path="res://actors/player.tscn" id="2_elriq"]
+[ext_resource type="PackedScene" uid="uid://dl2ed4gkybggf" path="res://objects/player.tscn" id="2_elriq"]
 [ext_resource type="PackedScene" uid="uid://dpm3l05d7fu35" path="res://objects/platform.tscn" id="5_3s40e"]
 [ext_resource type="PackedScene" uid="uid://r7rt7pth4u7o" path="res://objects/wall_low.tscn" id="5_6vel1"]
 [ext_resource type="PackedScene" uid="uid://c71evdjblk5wp" path="res://objects/wall_high.tscn" id="7_cabne"]
 [ext_resource type="PackedScene" uid="uid://bvx5cvigosg0s" path="res://objects/platform_large_grass.tscn" id="7_wggef"]
-[ext_resource type="PackedScene" uid="uid://d2g78tpqbyf5g" path="res://actors/enemy.tscn" id="8_7ty2f"]
+[ext_resource type="PackedScene" uid="uid://d2g78tpqbyf5g" path="res://objects/enemy.tscn" id="8_7ty2f"]
 
 [node name="Main" type="Node3D"]
 
@@ -52,6 +52,10 @@ player = NodePath("../../Player")
 transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 5.5, 3.5, 9)
 player = NodePath("../../Player")
 
+[node name="enemy-flying4" parent="Enemies" node_paths=PackedStringArray("player") instance=ExtResource("8_7ty2f")]
+transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 15.5, 4, -7.5)
+player = NodePath("../../Player")
+
 [node name="Level" type="Node" parent="."]
 
 [node name="wall-low" parent="Level" instance=ExtResource("5_6vel1")]
@@ -60,17 +64,23 @@ transform = Transform3D(0.965926, 0, 0.258819, 0, 1, 0, -0.258819, 0, 0.965926,
 [node name="wall-low3" parent="Level" instance=ExtResource("5_6vel1")]
 transform = Transform3D(-1, 0, -1.19209e-07, 0, 1, 0, 1.19209e-07, 0, -1, 6.07912, 1.05, 6.59834)
 
-[node name="platform-falling" parent="Level" instance=ExtResource("5_3s40e")]
+[node name="platform" parent="Level" instance=ExtResource("5_3s40e")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0, 6.5)
 
-[node name="platform-falling2" parent="Level" instance=ExtResource("5_3s40e")]
+[node name="platform2" parent="Level" instance=ExtResource("5_3s40e")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.5, 2.5, -2.5)
 
-[node name="platform-falling3" parent="Level" instance=ExtResource("5_3s40e")]
+[node name="platform3" parent="Level" instance=ExtResource("5_3s40e")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 3, -3.5)
 
+[node name="platform4" parent="Level" instance=ExtResource("5_3s40e")]
+transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 7, 1, -2)
+
 [node name="wall-high" parent="Level" instance=ExtResource("7_cabne")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 0, -1.5)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 1.5, 4)
+
+[node name="wall-high2" parent="Level" instance=ExtResource("7_cabne")]
+transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 11.5, 3, -5.5)
 
 [node name="platform-large-grass" parent="Level" instance=ExtResource("7_wggef")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0)
@@ -81,5 +91,8 @@ transform = Transform3D(0.965926, 0, 0.258819, 0, 1, 0, -0.258819, 0, 0.965926,
 [node name="platform-large-grass3" parent="Level" instance=ExtResource("7_wggef")]
 transform = Transform3D(0.965926, 0, -0.258819, 0, 1, 0, 0.258819, 0, 0.965926, -6, 1, 2.5)
 
+[node name="platform-large-grass5" parent="Level" instance=ExtResource("7_wggef")]
+transform = Transform3D(0.866026, 0, -0.5, 0, 1, 0, 0.5, 0, 0.866026, 12, 2.5, -5)
+
 [node name="platform-large-grass4" parent="Level" instance=ExtResource("7_wggef")]
 transform = Transform3D(0.965926, 0, 0.258819, 0, 1, 0, -0.258819, 0, 0.965926, 5, 0.5, 5.5)

sounds/blaster.ogg.import

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://dv8rfe827xc6j"
+uid="uid://w3hirmwndftn"
 path="res://.godot/imported/blaster.ogg-1527ec84d518b60bb9fbaad97656d870.oggvorbisstr"
 
 [deps]
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/blaster.ogg-1527ec84d518b60bb9fbaad97656d870.
 [params]
 
 loop=false
-loop_offset=0
-bpm=0
+loop_offset=0.0
+bpm=0.0
 beat_count=0
 bar_beats=4

sounds/blaster_repeater.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://csdsvg0nh35id"
+path="res://.godot/imported/blaster_repeater.ogg-a46ceca73f68a6e3e41e971b07cb8de8.oggvorbisstr"
+
+[deps]
+
+source_file="res://sounds/blaster_repeater.ogg"
+dest_files=["res://.godot/imported/blaster_repeater.ogg-a46ceca73f68a6e3e41e971b07cb8de8.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

sounds/jump-realistic.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://x0s0tunvo0br"
-path="res://.godot/imported/jump-realistic.ogg-0655f517427ef61af899d7c5ae700ab6.oggvorbisstr"
-
-[deps]
-
-source_file="res://sounds/jump-realistic.ogg"
-dest_files=["res://.godot/imported/jump-realistic.ogg-0655f517427ef61af899d7c5ae700ab6.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

sounds/jump.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dw2m5fxhfjykq"
-path="res://.godot/imported/jump.ogg-de8df8640ff526968292c23fe5ec784f.oggvorbisstr"
-
-[deps]
-
-source_file="res://sounds/jump.ogg"
-dest_files=["res://.godot/imported/jump.ogg-de8df8640ff526968292c23fe5ec784f.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

sounds/shoot_a.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://br6iq2h671ery"
-path="res://.godot/imported/shoot_a.ogg-527bbcaa6ffabc0e8a7820780cfc3b2c.oggvorbisstr"
-
-[deps]
-
-source_file="res://sounds/shoot_a.ogg"
-dest_files=["res://.godot/imported/shoot_a.ogg-527bbcaa6ffabc0e8a7820780cfc3b2c.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

sounds/shoot_b.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://cheg0i1wf285t"
-path="res://.godot/imported/shoot_b.ogg-3fea18996921e1ae1337cf584b325ddc.oggvorbisstr"
-
-[deps]
-
-source_file="res://sounds/shoot_b.ogg"
-dest_files=["res://.godot/imported/shoot_b.ogg-3fea18996921e1ae1337cf584b325ddc.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

sounds/shoot_c.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://k40c314uiym2"
-path="res://.godot/imported/shoot_c.ogg-a309ac00957e32b88ef2a57e4294a4f4.oggvorbisstr"
-
-[deps]
-
-source_file="res://sounds/shoot_c.ogg"
-dest_files=["res://.godot/imported/shoot_c.ogg-a309ac00957e32b88ef2a57e4294a4f4.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

sounds/shoot_d.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dcatai5q4k77k"
-path="res://.godot/imported/shoot_d.ogg-23fcf862043859225d1039fc76244edb.oggvorbisstr"
-
-[deps]
-
-source_file="res://sounds/shoot_d.ogg"
-dest_files=["res://.godot/imported/shoot_d.ogg-23fcf862043859225d1039fc76244edb.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

sounds/shoot_shotgun.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://b0su3bm77yrvr"
-path="res://.godot/imported/shoot_shotgun.ogg-b1cdcf7bc1f47b25f622a407aa93e4d7.oggvorbisstr"
-
-[deps]
-
-source_file="res://sounds/shoot_shotgun.ogg"
-dest_files=["res://.godot/imported/shoot_shotgun.ogg-b1cdcf7bc1f47b25f622a407aa93e4d7.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

weapons/blaster-repeater.tres

@@ -1,18 +1,19 @@
 [gd_resource type="Resource" script_class="Weapon" load_steps=4 format=3 uid="uid://cu2gtxlcmbb34"]
 
-[ext_resource type="PackedScene" uid="uid://c0fgu1f2whait" path="res://models/blaster-double.glb" id="1_1mdln"]
 [ext_resource type="Texture2D" uid="uid://ce3lgq7foiusl" path="res://sprites/crosshair-repeater.png" id="1_hoqei"]
 [ext_resource type="Script" path="res://scripts/weapon.gd" id="1_l1atd"]
+[ext_resource type="PackedScene" uid="uid://dd3oln1ucgqpd" path="res://models/blaster-repeater.glb" id="2_h64nv"]
 
 [resource]
 script = ExtResource("1_l1atd")
-model = ExtResource("1_1mdln")
+model = ExtResource("2_h64nv")
 position = Vector3(0, 0, 0)
 rotation = Vector3(0, 180, 0)
+burst_position = Vector3(0, 0, 0)
 cooldown = 0.1
 max_distance = 10
 damage = 10.0
 spread = 0.5
 shot_count = 1
-sound_shoot = "sounds/shoot_a.ogg"
+sound_shoot = "sounds/blaster_repeater.ogg"
 crosshair = ExtResource("1_hoqei")

weapons/blaster.tres

@@ -9,10 +9,11 @@ script = ExtResource("2_107w7")
 model = ExtResource("1_x0glg")
 position = Vector3(0, 0, 0)
 rotation = Vector3(0, 180, 0)
+burst_position = Vector3(0, 0, 0)
 cooldown = 0.5
 max_distance = 10
 damage = 25.0
 spread = 2.0
 shot_count = 3
-sound_shoot = "sounds/shoot_shotgun.ogg"
+sound_shoot = "sounds/blaster.ogg"
 crosshair = ExtResource("1_2onsr")