From 5b57939452dcd2b37da7b3df3a3ebe5c1cdef204 Mon Sep 17 00:00:00 2001 From: Zenny Date: Tue, 4 Mar 2025 23:32:25 -0800 Subject: [PATCH] Minor drop/throw adjustment --- src/items/accessory/resources/MaskShunned.tres | 2 +- src/items/accessory/resources/MaskSloth.tres | 2 +- src/items/dropped/DroppedItem.tscn | 2 +- src/items/thrown/ThrownItem.tscn | 2 +- .../weapons/resources/Swan Sword Odette.tres | 16 +++++++++------- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/items/accessory/resources/MaskShunned.tres b/src/items/accessory/resources/MaskShunned.tres index a0833655..28947289 100644 --- a/src/items/accessory/resources/MaskShunned.tres +++ b/src/items/accessory/resources/MaskShunned.tres @@ -19,4 +19,4 @@ ThrowSpeed = 12.0 HealHPAmount = 0 HealVTAmount = 0 ThrowDamage = 5 -ItemTags = Array[int]([]) +ItemTag = 0 diff --git a/src/items/accessory/resources/MaskSloth.tres b/src/items/accessory/resources/MaskSloth.tres index f2666bce..6b10572d 100644 --- a/src/items/accessory/resources/MaskSloth.tres +++ b/src/items/accessory/resources/MaskSloth.tres @@ -19,4 +19,4 @@ ThrowSpeed = 12.0 HealHPAmount = 0 HealVTAmount = 0 ThrowDamage = 5 -ItemTags = Array[int]([]) +ItemTag = 0 diff --git a/src/items/dropped/DroppedItem.tscn b/src/items/dropped/DroppedItem.tscn index 94ec5467..93ab8be0 100644 --- a/src/items/dropped/DroppedItem.tscn +++ b/src/items/dropped/DroppedItem.tscn @@ -53,7 +53,7 @@ collision_mask = 5 axis_lock_angular_x = true axis_lock_angular_y = true axis_lock_angular_z = true -mass = 10.0 +gravity_scale = 0.8 contact_monitor = true max_contacts_reported = 50 script = ExtResource("1_67jk4") diff --git a/src/items/thrown/ThrownItem.tscn b/src/items/thrown/ThrownItem.tscn index 7a21c887..1b3b906c 100644 --- a/src/items/thrown/ThrownItem.tscn +++ b/src/items/thrown/ThrownItem.tscn @@ -13,7 +13,7 @@ viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport") collision_layer = 1040 collision_mask = 25 mass = 0.1 -gravity_scale = 0.01 +gravity_scale = 0.2 contact_monitor = true max_contacts_reported = 50 script = ExtResource("1_wlplc") diff --git a/src/items/weapons/resources/Swan Sword Odette.tres b/src/items/weapons/resources/Swan Sword Odette.tres index e60fd69e..17cbcf01 100644 --- a/src/items/weapons/resources/Swan Sword Odette.tres +++ b/src/items/weapons/resources/Swan Sword Odette.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://bpdbuf0k0exb5"] -[ext_resource type="Script" path="res://src/items/weapons/WeaponStats.cs" id="1_cik6n"] +[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="1_cik6n"] [ext_resource type="Texture2D" uid="uid://cvtcsi2sagfwm" path="res://src/items/weapons/textures/SWAN SWORD.PNG" id="1_qc4eu"] [resource] @@ -8,12 +8,9 @@ script = ExtResource("1_cik6n") Damage = 12 Luck = 0.05 AttackSpeed = 1.25 -TelluricDamageBonus = 0.0 -AeolicDamageBonus = 0.0 -BaseHydricDamageBonus = 0.0 -IgneousDamageBonus = 0.0 -FerrumDamageBonus = 0.0 -WeaponTags = [1] +WeaponElement = 0 +ElementalDamageBonus = 1.0 +WeaponTag = 0 Name = "Swan Sword Odette" Description = "+12 ATK Ignores Affinity. @@ -21,3 +18,8 @@ Ignores Affinity. The blade of a thousand faced heroine." Texture = ExtResource("1_qc4eu") SpawnRate = 0.01 +ThrowSpeed = 12.0 +HealHPAmount = 0 +HealVTAmount = 0 +ThrowDamage = 5 +ItemTag = 0