Redesign and reimplement inventory menu

Add jewels but no implementation yet (needed redesign of inventory menu to function correctly)
2026-02-11 04:08:42 -08:00
parent 5451f0b31f
commit 8ce38c3c13
51 changed files with 1695 additions and 256 deletions
--- a/Zennysoft.Game.Ma/src/items/weapons/AirReactorProjectile.tscn
+++ b/Zennysoft.Game.Ma/src/items/weapons/AirReactorProjectile.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=63 format=3 uid="uid://nnns2ade62al"]
+[gd_scene load_steps=64 format=3 uid="uid://nnns2ade62al"]

 [ext_resource type="Script" uid="uid://cqm6u7qa8japr" path="res://src/system/Projectile.cs" id="1_xt24t"]
 [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_yf47k"]
@@ -516,6 +516,8 @@ _data = {
 &"RESET": SubResource("Animation_8qeb2")
 }

+[sub_resource type="SphereShape3D" id="SphereShape3D_xt24t"]
+
 [node name="AirReactor" type="Node3D"]
 script = ExtResource("1_xt24t")
 AttackData = SubResource("Resource_kcnxw")
@@ -550,3 +552,9 @@ root_node = NodePath("../AnimatedSprite3D")
 libraries = {
 &"": SubResource("AnimationLibrary_q8n6h")
 }
+
+[node name="WallCollision" type="RigidBody3D" parent="Bullet"]
+unique_name_in_owner = true
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Bullet/WallCollision"]
+shape = SubResource("SphereShape3D_xt24t")
--- a/Zennysoft.Game.Ma/src/items/weapons/FireReactorProjectile.tscn
+++ b/Zennysoft.Game.Ma/src/items/weapons/FireReactorProjectile.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=67 format=3 uid="uid://igpvnbi8qi6e"]
+[gd_scene load_steps=68 format=3 uid="uid://igpvnbi8qi6e"]

 [ext_resource type="Script" uid="uid://cqm6u7qa8japr" path="res://src/system/Projectile.cs" id="1_pk6yq"]
 [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_d874y"]
@@ -547,6 +547,8 @@ _data = {
 &"RESET": SubResource("Animation_8qeb2")
 }

+[sub_resource type="SphereShape3D" id="SphereShape3D_pk6yq"]
+
 [node name="FireReactor" type="Node3D"]
 script = ExtResource("1_pk6yq")
 AttackData = SubResource("Resource_14f5p")
@@ -581,3 +583,9 @@ root_node = NodePath("../AnimatedSprite3D")
 libraries = {
 &"": SubResource("AnimationLibrary_q8n6h")
 }
+
+[node name="WallCollision" type="RigidBody3D" parent="Bullet"]
+unique_name_in_owner = true
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Bullet/WallCollision"]
+shape = SubResource("SphereShape3D_pk6yq")
--- a/Zennysoft.Game.Ma/src/items/weapons/PersuaderProjectile.tscn
+++ b/Zennysoft.Game.Ma/src/items/weapons/PersuaderProjectile.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=72 format=3 uid="uid://d3nx0suvhbcda"]
+[gd_scene load_steps=73 format=3 uid="uid://d3nx0suvhbcda"]

 [ext_resource type="Script" uid="uid://cqm6u7qa8japr" path="res://src/system/Projectile.cs" id="1_7ykt2"]
 [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_3v8me"]
 [ext_resource type="Texture2D" uid="uid://c1x4iaqgj2rur" path="res://src/vfx/Items Etc/smokepuff.png" id="3_7ykt2"]
+[ext_resource type="AudioStream" uid="uid://bgvt4kqyvl5gp" path="res://src/audio/sfx/ENEMY_EDEN_FIRE.ogg" id="4_3v8me"]

 [sub_resource type="Resource" id="Resource_14f5p"]
 script = ExtResource("2_3v8me")
@@ -456,8 +457,7 @@ animations = [{

 [sub_resource type="Animation" id="Animation_xrn7e"]
 resource_name = "fire"
-length = 1.11667
-step = 0.0166667
+length = 0.66667
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -477,10 +477,10 @@ tracks/1/path = NodePath(".:frame")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.416667),
+"times": PackedFloat32Array(0.2, 0.666667),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [1, 67]
+"values": [0, 67]
 }
 tracks/2/type = "value"
 tracks/2/imported = false
@@ -489,7 +489,7 @@ tracks/2/path = NodePath("%ProjectileHitbox:position")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 1.1),
+"times": PackedFloat32Array(0, 0.666667),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
 "values": [Vector3(0, 2.1, 0), Vector3(0, 2.1, -40)]
@@ -501,11 +501,35 @@ tracks/3/path = NodePath("%ProjectileHitbox/CollisionShape3D:disabled")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
 tracks/3/keys = {
-"times": PackedFloat32Array(0, 0.0166667, 1.11667),
+"times": PackedFloat32Array(0, 0.0166667, 0.666667),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 1,
 "values": [true, false, true]
 }
+tracks/4/type = "value"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("../Bullet/ProjectileHitbox/AudioStreamPlayer3D:stream")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [ExtResource("4_3v8me")]
+}
+tracks/5/type = "value"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("../Bullet/ProjectileHitbox/AudioStreamPlayer3D:playing")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"times": PackedFloat32Array(0.0333333),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [true]
+}

 [sub_resource type="Animation" id="Animation_8qeb2"]
 length = 0.001
@@ -557,6 +581,18 @@ tracks/3/keys = {
 "update": 1,
 "values": [true]
 }
+tracks/4/type = "value"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("%AudioStreamPlayer3D:playing")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [false]
+}

 [sub_resource type="AnimationLibrary" id="AnimationLibrary_q8n6h"]
 _data = {
@@ -578,16 +614,16 @@ sprite_frames = SubResource("SpriteFrames_pck2g")

 [node name="ProjectileHitbox" type="Area3D" parent="Bullet"]
 unique_name_in_owner = true
-collision_layer = 0
-collision_mask = 2048
-monitorable = false
+collision_mask = 2049

 [node name="CollisionShape3D" type="CollisionShape3D" parent="Bullet/ProjectileHitbox"]
 shape = SubResource("SphereShape3D_kct8n")
 disabled = true

-[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Bullet"]
+[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Bullet/ProjectileHitbox"]
 unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.1, 5.8557)
+stream = ExtResource("4_3v8me")

 [node name="AnimationPlayer" type="AnimationPlayer" parent="Bullet"]
 unique_name_in_owner = true
--- a/Zennysoft.Game.Ma/src/items/weapons/WaterReactorProjectile.tscn
+++ b/Zennysoft.Game.Ma/src/items/weapons/WaterReactorProjectile.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=78 format=3 uid="uid://7p2sh52lj42o"]
+[gd_scene load_steps=79 format=3 uid="uid://7p2sh52lj42o"]

 [ext_resource type="Script" uid="uid://cqm6u7qa8japr" path="res://src/system/Projectile.cs" id="1_n88a7"]
 [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_er0le"]
@@ -621,6 +621,8 @@ _data = {
 &"RESET": SubResource("Animation_8qeb2")
 }

+[sub_resource type="SphereShape3D" id="SphereShape3D_n88a7"]
+
 [node name="WaterReactor" type="Node3D"]
 script = ExtResource("1_n88a7")
 AttackData = SubResource("Resource_k6pkx")
@@ -655,3 +657,9 @@ root_node = NodePath("../AnimatedSprite3D")
 libraries = {
 &"": SubResource("AnimationLibrary_q8n6h")
 }
+
+[node name="WallCollision" type="RigidBody3D" parent="Bullet"]
+unique_name_in_owner = true
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Bullet/WallCollision"]
+shape = SubResource("SphereShape3D_n88a7")