diff --git a/graphics/ship.png b/graphics/ship.png index c1e9c86..a260f6c 100644 Binary files a/graphics/ship.png and b/graphics/ship.png differ diff --git a/resources/shot_stock.tres b/resources/shot_stock.tres index 6134269..a485b71 100644 --- a/resources/shot_stock.tres +++ b/resources/shot_stock.tres @@ -6,8 +6,6 @@ [resource] script = ExtResource("1_dpne1") shot_name = "Stock" -damage = 3 speed = -350 -projectiles = 1 cooldown = 0.0 metadata/_custom_type_script = "uid://ccdohs4gduee5" diff --git a/scenes/player.tscn b/scenes/player.tscn index d3bdfa5..7233823 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -87,7 +87,7 @@ size = Vector2(6, 5.75) [node name="Player" type="Area2D" unique_id=652131079] script = ExtResource("1_g2els") -speed = 275 +speed = 165 weapon_current = ExtResource("2_dqkch") [node name="Ship" type="Sprite2D" parent="." unique_id=1155866924] diff --git a/scenes/stock_weapon.tscn b/scenes/stock_weapon.tscn index 077183a..3f1ed64 100644 --- a/scenes/stock_weapon.tscn +++ b/scenes/stock_weapon.tscn @@ -5,7 +5,7 @@ [ext_resource type="Texture2D" uid="uid://ti1uy42vnnhw" path="res://graphics/shot.png" id="3_mvdrj"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_mvdrj"] -size = Vector2(6, 14) +size = Vector2(12, 8) [node name="StockWeapon" type="Area2D" unique_id=1832200900] script = ExtResource("1_hsma2") @@ -13,13 +13,10 @@ shot_data = ExtResource("2_ckjv1") [node name="Sprite2D" type="Sprite2D" parent="." unique_id=2134507225] texture = ExtResource("3_mvdrj") -region_enabled = true -region_rect = Rect2(7, 6, 4, 12) [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1890946059] shape = SubResource("RectangleShape2D_mvdrj") [node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="." unique_id=985862716] -rect = Rect2(-3, -7, 6, 14) [connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"] diff --git a/scenes/stock_weapon_single_old.tscn b/scenes/stock_weapon_single_old.tscn deleted file mode 100644 index a1dcfbc..0000000 --- a/scenes/stock_weapon_single_old.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene format=3 uid="uid://b2ltmeb14nc17"] - -[ext_resource type="Script" uid="uid://d1rwqotmrag1r" path="res://scripts/stock_weapon.gd" id="1_kx6bj"] -[ext_resource type="Resource" uid="uid://cels8t3hqjtsu" path="res://resources/shot_stock.tres" id="2_hefae"] -[ext_resource type="Texture2D" uid="uid://ti1uy42vnnhw" path="res://graphics/shot.png" id="3_58qml"] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_mvdrj"] -size = Vector2(12, 8) - -[node name="StockWeapon" type="Area2D" unique_id=1832200900] -script = ExtResource("1_kx6bj") -shot_data = ExtResource("2_hefae") - -[node name="Sprite2D" type="Sprite2D" parent="." unique_id=2134507225] -texture = ExtResource("3_58qml") - -[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1890946059] -shape = SubResource("RectangleShape2D_mvdrj") - -[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="." unique_id=985862716] - -[connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"] diff --git a/scenes/world.tscn b/scenes/world.tscn index 859bfd0..b0110e3 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -13,7 +13,6 @@ [node name="Player" parent="Level" unique_id=652131079 instance=ExtResource("2_rwgxs")] z_index = 1 position = Vector2(97, 173) -speed = 200 [node name="Background" type="Node2D" parent="Level" unique_id=485120278] z_index = -1 diff --git a/scripts/player.gd b/scripts/player.gd index c3a4b34..9d12920 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -87,20 +87,17 @@ func _on_weapon_cooldown_timeout() -> void: func shoot(): - var projectiles: int = 2 - for b in projectiles: + # Instantiate the bullet + var bullet = weapon_current.instantiate() + get_tree().root.add_child(bullet) + bullet.position = position + Vector2(0,-23) - # Instantiate the bullets - var bullet = weapon_current.instantiate() - get_tree().root.add_child(bullet) - bullet.position = position + Vector2((b * 10) - (projectiles * projectiles),-23) - - # Get weapon speed and spacing for equidistant calculations - weapon_rate = bullet.shot_data.rate - weapon_spacing = bullet.shot_data.spacing - bullet_speed = abs(bullet.shot_data.speed) - - # Print which weapon is firing - prints(bullet.shot_data.shot_name, "weapon fired") + # Get weapon speed and spacing for equidistant calculations + weapon_rate = bullet.shot_data.rate + weapon_spacing = bullet.shot_data.spacing + bullet_speed = abs(bullet.shot_data.speed) + + # Print which weapon is firing + prints(bullet.shot_data.shot_name, "weapon fired") diff --git a/scripts/player_shot.gd b/scripts/player_shot.gd index 9455240..54418e6 100644 --- a/scripts/player_shot.gd +++ b/scripts/player_shot.gd @@ -4,7 +4,6 @@ extends Resource @export var shot_name: String @export var damage: int = 1 @export var speed: int = 135 -@export var projectiles: int = 2 @export var rate: float = 0.1 @export var cooldown: float = 0.25 @export var sprite: Texture2D = preload("res://graphics/shot.png") diff --git a/scripts/stock_weapon.gd b/scripts/stock_weapon.gd index f8d815c..b3e7f8c 100644 --- a/scripts/stock_weapon.gd +++ b/scripts/stock_weapon.gd @@ -3,6 +3,7 @@ extends Area2D @onready var bullet = load("res://scenes/stock_weapon.tscn") @export var shot_data: PlayerShot +@onready var player = get_node("../Player") func _process(delta):