From 172830729fdbbbb94e0650d46b83163eba240a06 Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 4 Apr 2026 15:14:13 +0100 Subject: [PATCH] Modified the resource and defaults for the projectile property ;made a backup of the original stock weapon scene just in case things went bad. --- resources/shot_stock.tres | 2 ++ scenes/stock_weapon.tscn | 5 ++++- scenes/stock_weapon_single_old.tscn | 22 ++++++++++++++++++++++ scripts/player_shot.gd | 1 + scripts/stock_weapon.gd | 1 - 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 scenes/stock_weapon_single_old.tscn diff --git a/resources/shot_stock.tres b/resources/shot_stock.tres index a485b71..6134269 100644 --- a/resources/shot_stock.tres +++ b/resources/shot_stock.tres @@ -6,6 +6,8 @@ [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/stock_weapon.tscn b/scenes/stock_weapon.tscn index 3f1ed64..077183a 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(12, 8) +size = Vector2(6, 14) [node name="StockWeapon" type="Area2D" unique_id=1832200900] script = ExtResource("1_hsma2") @@ -13,10 +13,13 @@ 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 new file mode 100644 index 0000000..a1dcfbc --- /dev/null +++ b/scenes/stock_weapon_single_old.tscn @@ -0,0 +1,22 @@ +[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/scripts/player_shot.gd b/scripts/player_shot.gd index 54418e6..9455240 100644 --- a/scripts/player_shot.gd +++ b/scripts/player_shot.gd @@ -4,6 +4,7 @@ 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 b3e7f8c..f8d815c 100644 --- a/scripts/stock_weapon.gd +++ b/scripts/stock_weapon.gd @@ -3,7 +3,6 @@ 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):