Merge pull request #13 from AronMurai/master

Syntactic Sugar & Style Guide Changes

Author: dr-jam

Projects/skittles/camera_command.gd

@@ -1,5 +1,3 @@
-class_name CameraCommand
+@abstract class_name CameraCommand
 
-
-func execute(_camera:Camera3D, _target:Node3D) -> bool:
-	return false
+@abstract func execute(_camera : Camera3D, _target : Node3D) -> bool

Projects/skittles/camera_controller.gd

@@ -1,15 +1,15 @@
 class_name CameraController
 extends Camera3D
 
-@onready var player:Player = %Player
+@export var player : Player
 
-var _camera_command:CameraCommand
+var _camera_command : CameraCommand
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	_camera_command = RotateAndLookAtCommand.new()
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(_delta):
+func _process(_delta : float):
 	_camera_command.execute(self, player)

Projects/skittles/collection_nova_command.gd

@@ -1,13 +1,13 @@
 class_name CollectionNovaCommand
 extends PlayerCommand
 
-
-func execute(player:Player) -> bool:
-	for projectile:Projectile in Projectile.projectiles:
-		projectile.global_position = player.global_position + Vector3(0, 2.5, 0) + _randVec()
-		projectile.linear_velocity = randf() * 50 * _randVec()
+func execute(player : Player) -> bool:
+	for projectile : Projectile in Projectile.projectiles:
+		projectile.global_position = player.global_position + Vector3(0.0, 2.5, 0.0) + _random_vector()
+		projectile.linear_velocity = randf_range(0.0, 50.0) * _random_vector()
 	return true
 
-#Returns a normalized instance of Vector3 where x, y, and z are each set to be between -1 and 1.
-func _randVec()->Vector3:
+
+# Returns a normalized instance of Vector3 where x, y, and z are each set to be between -1 and 1.
+func _random_vector() -> Vector3:
 	return Vector3(randf_range(-1,1), randf_range(-1,1), randf_range(-1,1)).normalized()

Projects/skittles/icon.svg.import

@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.cte
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
 mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false

Projects/skittles/player.gd

@@ -1,10 +1,10 @@
 class_name Player
 extends Node3D
 
-@onready var projectile_spawn:Node3D = $Wand/ProjectileSpawn
+@export var projectile_spawn : Node3D 
 
-var _fire1_command:PlayerCommand
-var _fire2_command:PlayerCommand
+var _fire1_command : PlayerCommand
+var _fire2_command : PlayerCommand
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
@@ -14,7 +14,7 @@ func _ready() -> void:
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(_delta: float) -> void:
-	if(Input.is_action_pressed("Fire1")):
+	if (Input.is_action_pressed("Fire1")):
 		var _return_signal = _fire1_command.execute(self)
-	if(Input.is_action_pressed("Fire2")):
+	if (Input.is_action_pressed("Fire2")):
 		var _return_signal = _fire2_command.execute(self)

Projects/skittles/player.tscn

@@ -6,8 +6,11 @@
 
 [sub_resource type="BoxMesh" id="BoxMesh_d722u"]
 
-[node name="Player" type="Node3D"]
+
+[node name="Player" type="Node3D" node_paths=PackedStringArray("projectile_spawn")]
 script = ExtResource("1_4flbx")
+projectile_spawn = NodePath("Wand/ProjectileSpawn")
+
 
 [node name="Body" type="MeshInstance3D" parent="."]
 mesh = SubResource("CapsuleMesh_e0aj2")

Projects/skittles/player_command.gd

@@ -1,4 +1,3 @@
 @abstract class_name PlayerCommand
 
-
-@abstract func execute(_player:Player)->bool
+@abstract func execute(player : Player) -> bool

Projects/skittles/projectile.gd

@@ -1,13 +1,13 @@
 class_name Projectile
 extends RigidBody3D
 
-@onready var _mesh:MeshInstance3D = $MeshInstance3D
+@onready var _mesh : MeshInstance3D = $MeshInstance3D
 
-static var projectiles:Array[Projectile]
+static var projectiles : Array[Projectile]
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	var material = StandardMaterial3D.new()
+	var material : StandardMaterial3D = StandardMaterial3D.new()
 	material.albedo_color = Color(randf(), randf(), randf())
 	_mesh.set_surface_override_material(0, material)
 	projectiles.append(self)

Projects/skittles/rotate_and_look_command.gd

@@ -1,14 +1,14 @@
 class_name RotateAndLookAtCommand
 extends CameraCommand
 
-var _current_rotation:float = 0
-var _rads_per_second:float = 0.5
-var _height := Vector3(0.0, 7.0, 0.0)
-var _rot_plane_distance := 3.0
+var _current_rotation : float = 0.0
+var _rads_per_second : float = 0.5
+var _height : Vector3 = Vector3(0.0, 7.0, 0.0)
+var _rot_plane_distance : float = 3.0
 
-func execute(camera:Camera3D, target:Node3D) -> bool:
+func execute(camera : Camera3D, target : Node3D) -> bool:
 	_current_rotation += _rads_per_second * Engine.get_main_loop().root.get_process_delta_time()
-	var plane_offset := _rot_plane_distance * Vector3(sin(_current_rotation), 0.0, cos(_current_rotation))
+	var plane_offset : Vector3 = _rot_plane_distance * Vector3(sin(_current_rotation), 0.0, cos(_current_rotation))
 	camera.global_position = target.global_position + _height + plane_offset
 	camera.look_at(target.global_position)
 	return true

Projects/skittles/shoot_command.gd

@@ -3,10 +3,9 @@ extends PlayerCommand
 
 var _projectile_scene = preload("res://projectile.tscn")
 
-
-func execute(player:Player) -> bool:
-	var projectile:Projectile = _projectile_scene.instantiate()
+func execute(player : Player) -> bool:
+	var projectile : Projectile = _projectile_scene.instantiate()
 	player.add_child(projectile)
 	projectile.global_position = player.projectile_spawn.global_position
-	projectile.linear_velocity = Vector3(randf_range(5, 50), randf_range(-10, 10), randf_range(-10, 10))
+	projectile.linear_velocity = Vector3(randf_range(5.0, 50.0), randf_range(-10.0, 10.0), randf_range(-10.0, 10.0))
 	return true