diff --git a/Deprecated/stock_weapon.gd b/Deprecated/stock_weapon.gd index 71537c4..6f3c4dd 100644 --- a/Deprecated/stock_weapon.gd +++ b/Deprecated/stock_weapon.gd @@ -1,8 +1,8 @@ extends Area2D -@onready var bullet: PackedScene = load("res://scenes/weapon_stock.tscn") +@onready var bullet: PackedScene = load("res://scenes/player_weapons/weapon_stock.tscn") -@onready var shot_data: = load("res://resources/player_weapons/weapon_shot_stock.tres") +@onready var shot_data: = load("res://resources/player_weapon_resources/weapon_shot_stock.tres") func _process(delta): diff --git a/resources/player_weapons/weapon_shot.gd b/resources/player_weapon_resources/weapon_shot.gd similarity index 94% rename from resources/player_weapons/weapon_shot.gd rename to resources/player_weapon_resources/weapon_shot.gd index 63adff0..e8e4317 100644 --- a/resources/player_weapons/weapon_shot.gd +++ b/resources/player_weapon_resources/weapon_shot.gd @@ -12,6 +12,6 @@ extends Resource @export var spacing: float = 35 @export var origin: int = -23 -@export_category("Stagger") +@export_category("Spread") @export var horizontal_offset: float = 6.5 # Horizontal distance between projectiles @export var stagger_offset: float = 5 # Time delay per projectile index diff --git a/resources/player_weapons/weapon_shot.gd.uid b/resources/player_weapon_resources/weapon_shot.gd.uid similarity index 100% rename from resources/player_weapons/weapon_shot.gd.uid rename to resources/player_weapon_resources/weapon_shot.gd.uid diff --git a/resources/player_weapons/weapon_shot_stock.tres b/resources/player_weapon_resources/weapon_shot_stock.tres similarity index 79% rename from resources/player_weapons/weapon_shot_stock.tres rename to resources/player_weapon_resources/weapon_shot_stock.tres index e4cf1ca..6139dca 100644 --- a/resources/player_weapons/weapon_shot_stock.tres +++ b/resources/player_weapon_resources/weapon_shot_stock.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WeaponShot" format=3 uid="uid://b75ae840k03dy"] -[ext_resource type="PackedScene" uid="uid://ddpclu2vdy2ve" path="res://scenes/weapon_stock.tscn" id="1_by0nb"] -[ext_resource type="Script" uid="uid://7n1itonn35fm" path="res://resources/player_weapons/weapon_shot.gd" id="2_by0nb"] +[ext_resource type="PackedScene" uid="uid://ddpclu2vdy2ve" path="res://scenes/player_weapons/weapon_stock.tscn" id="1_by0nb"] +[ext_resource type="Script" uid="uid://7n1itonn35fm" path="res://resources/player_weapon_resources/weapon_shot.gd" id="2_by0nb"] [resource] script = ExtResource("2_by0nb") diff --git a/scenes/weapon_stock.gd b/scenes/player_weapons/weapon_stock.gd similarity index 83% rename from scenes/weapon_stock.gd rename to scenes/player_weapons/weapon_stock.gd index 7ebe31a..3de04e9 100644 --- a/scenes/weapon_stock.gd +++ b/scenes/player_weapons/weapon_stock.gd @@ -1,8 +1,8 @@ extends Area2D -@onready var bullet: PackedScene = load("res://scenes/weapon_stock.tscn") -@onready var shot_data: = load("res://resources/player_weapons/weapon_shot_stock.tres") +@onready var bullet: PackedScene = load("res://scenes/player_weapons/weapon_stock.tscn") +@onready var shot_data: = load("res://resources/player_weapon_resources/weapon_shot_stock.tres") diff --git a/scenes/weapon_stock.gd.uid b/scenes/player_weapons/weapon_stock.gd.uid similarity index 100% rename from scenes/weapon_stock.gd.uid rename to scenes/player_weapons/weapon_stock.gd.uid diff --git a/scenes/weapon_stock.tscn b/scenes/player_weapons/weapon_stock.tscn similarity index 96% rename from scenes/weapon_stock.tscn rename to scenes/player_weapons/weapon_stock.tscn index de22a81..364ec6a 100644 --- a/scenes/weapon_stock.tscn +++ b/scenes/player_weapons/weapon_stock.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://ddpclu2vdy2ve"] -[ext_resource type="Script" uid="uid://c5blhfopjpfny" path="res://scenes/weapon_stock.gd" id="1_u1d5o"] +[ext_resource type="Script" uid="uid://c5blhfopjpfny" path="res://scenes/player_weapons/weapon_stock.gd" id="1_u1d5o"] [ext_resource type="Texture2D" uid="uid://bnpm8b62n1pr5" path="res://graphics/shot_stock_og.png" id="2_u1d5o"] [sub_resource type="AtlasTexture" id="AtlasTexture_5bykt"] diff --git a/scenes/world.tscn b/scenes/world.tscn index 50bf2a4..9148110 100644 --- a/scenes/world.tscn +++ b/scenes/world.tscn @@ -14,7 +14,7 @@ z_index = -1 [node name="BaseBackground" type="ColorRect" parent="Level/Background" unique_id=1360709800] -offset_right = 217.0 +offset_right = 208.0 offset_bottom = 410.0 color = Color(0.2899925, 0.5692833, 0.9110645, 1) @@ -32,7 +32,7 @@ hframes = 4 frame = 1 [node name="CloudRight" type="Sprite2D" parent="Level/Background/Back" unique_id=1729409543] -position = Vector2(177, 32) +position = Vector2(168, 32) texture = ExtResource("3_4wyf3") flip_h = true hframes = 4 @@ -52,7 +52,7 @@ hframes = 4 frame = 2 [node name="CloudRight" type="Sprite2D" parent="Level/Background/Mid" unique_id=702118355] -position = Vector2(177, 32) +position = Vector2(168, 32) texture = ExtResource("3_4wyf3") flip_h = true hframes = 4 @@ -71,7 +71,7 @@ hframes = 4 frame = 3 [node name="CloudRight" type="Sprite2D" parent="Level/Background/Fore" unique_id=1798342457] -position = Vector2(185, 32) +position = Vector2(176, 32) texture = ExtResource("3_4wyf3") flip_h = true hframes = 4 diff --git a/scripts/weapon_component.gd b/scripts/weapon_component.gd index a4bb65b..0a9a9cd 100644 --- a/scripts/weapon_component.gd +++ b/scripts/weapon_component.gd @@ -1,7 +1,7 @@ class_name WeaponComponent extends Node -@export var loaded_weapon: PackedScene = load("res://scenes/weapon_stock.tscn") -var data : WeaponShot = load("res://resources/player_weapons/weapon_shot_stock.tres") +@export var loaded_weapon: PackedScene = load("res://scenes/player_weapons/weapon_stock.tscn") +var data : WeaponShot = load("res://resources/player_weapon_resources/weapon_shot_stock.tres")