From 3c8ebd8dcdc822c86c1f0c16a9b286b0784fe488 Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Sat, 1 Jun 2024 15:30:04 -0700 Subject: [PATCH] Update item metadata Added placeholder icons for items without an icon. --- Items/Weapons/Bow.tres | 4 +++- Items/Weapons/Pugio.tres | 4 +++- Items/Weapons/Shotgun.tres | 18 ++++++++++++++++++ Items/Weapons/Shotgun.tscn | 12 +++++------- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 Items/Weapons/Shotgun.tres diff --git a/Items/Weapons/Bow.tres b/Items/Weapons/Bow.tres index 7e4edc9..5f2a8b1 100644 --- a/Items/Weapons/Bow.tres +++ b/Items/Weapons/Bow.tres @@ -1,5 +1,6 @@ -[gd_resource type="Resource" script_class="ItemMetadata" load_steps=4 format=3 uid="uid://cjsh0dcgbfn77"] +[gd_resource type="Resource" script_class="ItemMetadata" load_steps=5 format=3 uid="uid://cjsh0dcgbfn77"] +[ext_resource type="Texture2D" uid="uid://vjdyrv8wp7gl" path="res://Assets/Sprites/forsenLevel.png" id="1_5blro"] [ext_resource type="Script" path="res://Utils/ScenePath.cs" id="1_haiji"] [ext_resource type="Script" path="res://Items/ItemMetadata.cs" id="2_hjbs0"] @@ -10,6 +11,7 @@ Path = "res://Items/Weapons/Bow.tscn" [resource] script = ExtResource("2_hjbs0") Instance = SubResource("Resource_mjj1w") +Icon = ExtResource("1_5blro") Name = "Bow" Description = "A bow and arrow." BuyPrice = 0 diff --git a/Items/Weapons/Pugio.tres b/Items/Weapons/Pugio.tres index eee0522..a141748 100644 --- a/Items/Weapons/Pugio.tres +++ b/Items/Weapons/Pugio.tres @@ -1,5 +1,6 @@ -[gd_resource type="Resource" script_class="ItemMetadata" load_steps=4 format=3 uid="uid://iqe6rgnb3jur"] +[gd_resource type="Resource" script_class="ItemMetadata" load_steps=5 format=3 uid="uid://iqe6rgnb3jur"] +[ext_resource type="Texture2D" uid="uid://vjdyrv8wp7gl" path="res://Assets/Sprites/forsenLevel.png" id="1_3ptey"] [ext_resource type="Script" path="res://Utils/ScenePath.cs" id="1_o026a"] [ext_resource type="Script" path="res://Items/ItemMetadata.cs" id="2_j4tmu"] @@ -10,6 +11,7 @@ Path = "res://Items/Weapons/Pugio.tscn" [resource] script = ExtResource("2_j4tmu") Instance = SubResource("Resource_abrg1") +Icon = ExtResource("1_3ptey") Name = "Pugio" Description = "A sidearm dagger." BuyPrice = 0 diff --git a/Items/Weapons/Shotgun.tres b/Items/Weapons/Shotgun.tres new file mode 100644 index 0000000..651fe91 --- /dev/null +++ b/Items/Weapons/Shotgun.tres @@ -0,0 +1,18 @@ +[gd_resource type="Resource" script_class="ItemMetadata" load_steps=5 format=3 uid="uid://dkm216ug0vj2h"] + +[ext_resource type="Script" path="res://Utils/ScenePath.cs" id="1_owc5r"] +[ext_resource type="Texture2D" uid="uid://vjdyrv8wp7gl" path="res://Assets/Sprites/forsenLevel.png" id="1_v76vk"] +[ext_resource type="Script" path="res://Items/ItemMetadata.cs" id="1_vtlr1"] + +[sub_resource type="Resource" id="Resource_6sxq7"] +script = ExtResource("1_owc5r") +Path = "res://Items/Weapons/Shotgun.tscn" + +[resource] +script = ExtResource("1_vtlr1") +Instance = SubResource("Resource_6sxq7") +Icon = ExtResource("1_v76vk") +Name = "Shotgun" +Description = "" +BuyPrice = 1887 +SellPrice = 0 diff --git a/Items/Weapons/Shotgun.tscn b/Items/Weapons/Shotgun.tscn index 1f84f6d..a7beaf0 100644 --- a/Items/Weapons/Shotgun.tscn +++ b/Items/Weapons/Shotgun.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=26 format=3 uid="uid://d1d4vg7we5rjr"] +[gd_scene load_steps=27 format=3 uid="uid://d1d4vg7we5rjr"] [ext_resource type="Script" path="res://Items/Weapons/ProjectileSpawner.cs" id="1_4xyyt"] [ext_resource type="Script" path="res://State/Weapon/WeaponStateMachine.cs" id="2_ag6rd"] [ext_resource type="PackedScene" uid="uid://da1do2r2pbayb" path="res://Entities/ShotgunPellet.tscn" id="2_p3wx2"] [ext_resource type="Script" path="res://State/Weapon/RangedIdleState.cs" id="3_dd6bh"] +[ext_resource type="Resource" uid="uid://dkm216ug0vj2h" path="res://Items/Weapons/Shotgun.tres" id="3_ju036"] [ext_resource type="Script" path="res://State/Weapon/RangedFireState.cs" id="4_bwqd6"] [ext_resource type="Texture2D" uid="uid://b1omx2kdb2x1n" path="res://Assets/Sprites/Items/shotgun.png" id="5_g8d45"] [ext_resource type="Texture2D" uid="uid://c1a7lvb4uuwfy" path="res://Assets/Sprites/Particles/circle-16.png" id="6_va8ee"] @@ -216,11 +217,9 @@ curve = SubResource("Curve_mqgo6") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_uexo4"] particle_flag_disable_z = true flatness = 1.0 -gravity = Vector3(0, -4, 0) initial_velocity_min = -8.0 initial_velocity_max = 24.0 -orbit_velocity_min = 0.0 -orbit_velocity_max = 0.0 +gravity = Vector3(0, -4, 0) scale_min = 0.75 scale_curve = SubResource("CurveTexture_3omj5") color_ramp = SubResource("GradientTexture1D_83h4s") @@ -236,13 +235,11 @@ gradient = SubResource("Gradient_jks7f") particle_flag_disable_z = true direction = Vector3(-1, -2, 0) spread = 10.0 -gravity = Vector3(0, 64, 0) initial_velocity_min = 16.0 initial_velocity_max = 32.0 angular_velocity_min = 30.0 angular_velocity_max = 60.0 -orbit_velocity_min = 0.0 -orbit_velocity_max = 0.0 +gravity = Vector3(0, 64, 0) scale_min = 2.0 scale_max = 2.0 color_ramp = SubResource("GradientTexture1D_eeskk") @@ -259,6 +256,7 @@ Damage = 12.0 UseTime = 1.5 InitialVelocity = 220.0 PlayerLevelGain = 0.5 +Metadata = ExtResource("3_ju036") [node name="State" type="Node" parent="." node_paths=PackedStringArray("InitialState")] script = ExtResource("2_ag6rd")