update

2026-02-13 16:11:38 -08:00
parent 0ab6ef1343
commit fe0241ac88
6 changed files with 53 additions and 82 deletions
--- a/Zennysoft.Game.Ma.Implementation/Player/IPlayer.cs
+++ b/Zennysoft.Game.Ma.Implementation/Player/IPlayer.cs
@@ -26,7 +26,7 @@ public interface IPlayer : IKillable, ICharacterBody3D

  public void PlayJumpScareAnimation();

-  public void ApplyNewAugment(Jewel jewel, IAugmentableItem equipableItem);
+  public void ApplyNewAugment(IAugmentItem jewel, IAugmentableItem equipableItem);

  public void IdentifyItem(IBaseInventoryItem unidentifiedItem);

--- a/Zennysoft.Game.Ma/src/items/weapons/resources/Kubel.tres
+++ b/Zennysoft.Game.Ma/src/items/weapons/resources/Kubel.tres
@@ -1,14 +1,14 @@
-[gd_resource type="Resource" script_class="WeaponStats" load_steps=4 format=3 uid="uid://db075qhmlmrcu"]
+[gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://db075qhmlmrcu"]

 [ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="1_kbje7"]
-[ext_resource type="Texture2D" uid="uid://bkntmni5jxfpk" path="res://src/items/weapons/textures/KUBEL.PNG" id="1_kwtbu"]
-[ext_resource type="AudioStream" uid="uid://ilf2s8ct2stt" path="res://src/audio/sfx/PLAYER_slower_slash.ogg" id="1_xfglq"]
+[ext_resource type="Texture2D" uid="uid://cb86dpkft2m03" path="res://src/items/weapons/textures/KUBEL.PNG" id="1_kwtbu"]

 [resource]
 script = ExtResource("1_kbje7")
 AttackSpeed = 1.0
 WeaponElement = 5
 WeaponTag = 0
+SelfDamage = 0
 SoundEffect = 4
 Name = "Kubel"
 Description = "+9 ATK
@@ -25,8 +25,9 @@ TelluricResistance = 0
 HydricResistance = 0
 IgneousResistance = 0
 FerrumResistance = 0
+HolyResistance = 0
+CurseResistance = 0
 ThrowSpeed = 12.0
 ThrowDamage = 5
 ItemTag = 0
 Texture = ExtResource("1_kwtbu")
-AudioStream = ExtResource("1_xfglq")
--- a/Zennysoft.Game.Ma/src/items/weapons/textures/KUBEL.PNG.import
+++ b/Zennysoft.Game.Ma/src/items/weapons/textures/KUBEL.PNG.import
@@ -3,7 +3,7 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cb86dpkft2m03"
-path.bptc="res://.godot/imported/Kubel.png-c9f101c338fbe11a0030ed91a86239ab.bptc.ctex"
+path.bptc="res://.godot/imported/KUBEL.PNG-bd6eff6ed8307de491529365dab55876.bptc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={

 [deps]

-source_file="res://src/items/weapons/textures/Kubel.png"
-dest_files=["res://.godot/imported/Kubel.png-c9f101c338fbe11a0030ed91a86239ab.bptc.ctex"]
+source_file="res://src/items/weapons/textures/KUBEL.PNG"
+dest_files=["res://.godot/imported/KUBEL.PNG-bd6eff6ed8307de491529365dab55876.bptc.ctex"]

 [params]

--- a/Zennysoft.Game.Ma/src/player/Player.cs
+++ b/Zennysoft.Game.Ma/src/player/Player.cs
@@ -336,7 +336,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
      PersuaderCrosshair.Hide();
  }

-  public void ApplyNewAugment(Jewel jewel, IAugmentableItem augmentableItem)
+  public void ApplyNewAugment(IAugmentItem jewel, IAugmentableItem augmentableItem)
  {
    Inventory.Remove(jewel);

--- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn
+++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn
@@ -1,6 +1,6 @@
-[gd_scene load_steps=17 format=3 uid="uid://c3e6hbctay1us"]
+[gd_scene load_steps=17 format=3 uid="uid://cbxw70qa7gifp"]

-[ext_resource type="Script" uid="uid://yh8qxmn058w2" path="res://src/ui/inventory_menu/InventoryMenu.cs" id="1_unikd"]
+[ext_resource type="Script" path="res://src/ui/inventory_menu/InventoryMenu2.cs" id="1_unikd"]
 [ext_resource type="FontFile" uid="uid://beh6d5lo5ihq0" path="res://src/ui/fonts/georgiai.ttf" id="2_7co7g"]
 [ext_resource type="StyleBox" uid="uid://bxuy4tnftibfq" path="res://src/options/SelectedOptionsBox.tres" id="3_b6rkr"]
 [ext_resource type="StyleBox" uid="uid://bl15q835s4ene" path="res://src/options/UnselectedOptionsBox.tres" id="4_l0byb"]
--- a/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn
+++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn
@@ -1,92 +1,62 @@
-[gd_scene load_steps=7 format=3 uid="uid://c005nd0m2eim"]
+[gd_scene load_steps=5 format=3 uid="uid://c005nd0m2eim"]

 [ext_resource type="Script" uid="uid://cglxk7v8hpesn" path="res://src/ui/inventory_menu/ItemSlot.cs" id="1_yttxt"]
 [ext_resource type="Texture2D" uid="uid://dymrg1fmwho35" path="res://src/items/weapons/textures/Cross Sword.png" id="2_rf22b"]
 [ext_resource type="StyleBox" uid="uid://bxuy4tnftibfq" path="res://src/options/SelectedOptionsBox.tres" id="4_lt1pw"]
-[ext_resource type="StyleBox" uid="uid://bl15q835s4ene" path="res://src/options/UnselectedOptionsBox.tres" id="4_rf22b"]
 [ext_resource type="FontFile" uid="uid://0syyay37admf" path="res://src/ui/fonts/georgiab.ttf" id="4_t6dim"]
-[ext_resource type="Texture2D" uid="uid://d3bx1j5irhdes" path="res://src/items/jewels/texture/Igneous Jewel.png" id="5_lt1pw"]

-[node name="ItemSlot" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
+[node name="ItemSlot" type="Button"]
+custom_minimum_size = Vector2(100, 50)
+anchors_preset = -1
+anchor_right = 0.885
+anchor_bottom = 0.093
+offset_left = 123.0
+offset_right = -1414.2
+offset_bottom = -50.44
 grow_vertical = 2
-script = ExtResource("1_yttxt")
-
-[node name="Row" type="HBoxContainer" parent="."]
-layout_mode = 1
-anchors_preset = 5
-anchor_left = 0.5
-anchor_right = 0.5
-offset_left = -215.0
-offset_right = 215.0
-offset_bottom = 50.0
-grow_horizontal = 2
-size_flags_vertical = 3
-theme_override_constants/separation = 10
-
-[node name="ItemInfo" type="HBoxContainer" parent="Row"]
-layout_mode = 2
-theme_override_constants/separation = 20
-alignment = 1
-
-[node name="EquippedLabel" type="Label" parent="Row/ItemInfo"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(25, 50)
-layout_mode = 2
-theme_override_fonts/font = ExtResource("4_t6dim")
-theme_override_font_sizes/font_size = 25
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="ItemTexture" type="TextureRect" parent="Row/ItemInfo"]
-unique_name_in_owner = true
-custom_minimum_size = Vector2(50, 50)
-layout_mode = 2
-texture = ExtResource("2_rf22b")
-
-[node name="Control" type="HBoxContainer" parent="Row/ItemInfo"]
-layout_mode = 2
-
-[node name="ItemName" type="Button" parent="Row/ItemInfo/Control"]
-unique_name_in_owner = true
-layout_mode = 2
+size_flags_horizontal = 4
 size_flags_vertical = 4
+mouse_filter = 2
+theme_override_constants/h_separation = 20
 theme_override_fonts/font = ExtResource("4_t6dim")
 theme_override_font_sizes/font_size = 25
 theme_override_styles/focus = ExtResource("4_lt1pw")
-theme_override_styles/disabled_mirrored = ExtResource("4_rf22b")
-theme_override_styles/disabled = ExtResource("4_rf22b")
-theme_override_styles/hover_pressed_mirrored = ExtResource("4_rf22b")
-theme_override_styles/hover_pressed = ExtResource("4_rf22b")
-theme_override_styles/hover_mirrored = ExtResource("4_rf22b")
-theme_override_styles/hover = ExtResource("4_rf22b")
-theme_override_styles/pressed_mirrored = ExtResource("4_rf22b")
-theme_override_styles/pressed = ExtResource("4_rf22b")
-theme_override_styles/normal_mirrored = ExtResource("4_rf22b")
-theme_override_styles/normal = ExtResource("4_rf22b")
+theme_override_styles/disabled_mirrored = ExtResource("4_lt1pw")
+theme_override_styles/disabled = ExtResource("4_lt1pw")
+theme_override_styles/hover_pressed_mirrored = ExtResource("4_lt1pw")
+theme_override_styles/hover_pressed = ExtResource("4_lt1pw")
+theme_override_styles/hover_mirrored = ExtResource("4_lt1pw")
+theme_override_styles/hover = ExtResource("4_lt1pw")
+theme_override_styles/pressed_mirrored = ExtResource("4_lt1pw")
+theme_override_styles/pressed = ExtResource("4_lt1pw")
+theme_override_styles/normal_mirrored = ExtResource("4_lt1pw")
+theme_override_styles/normal = ExtResource("4_lt1pw")
 button_mask = 0
 text = "Cross Sword"
+flat = true
+alignment = 0
+script = ExtResource("1_yttxt")

-[node name="AugmentTexture" type="TextureRect" parent="Row/ItemInfo/Control"]
+[node name="ItemTexture" type="TextureRect" parent="."]
 unique_name_in_owner = true
-visible = false
-custom_minimum_size = Vector2(15, 20)
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 4
-texture = ExtResource("5_lt1pw")
-stretch_mode = 2
+layout_mode = 0
+offset_left = -65.0
+offset_top = 6.0
+offset_right = -25.0
+offset_bottom = 46.0
+texture = ExtResource("2_rf22b")
+expand_mode = 2
+stretch_mode = 4

-[node name="ItemCountLabel" type="Label" parent="Row"]
+[node name="Equipped" type="Label" parent="."]
 unique_name_in_owner = true
+custom_minimum_size = Vector2(25, 50)
 layout_mode = 2
-size_flags_horizontal = 10
+offset_left = -122.0
+offset_right = -78.0
+offset_bottom = 50.0
 theme_override_fonts/font = ExtResource("4_t6dim")
 theme_override_font_sizes/font_size = 25
-text = "x99"
-horizontal_alignment = 2
+text = "E"
+horizontal_alignment = 1
 vertical_alignment = 1