From c4880f353c0bf3cdf623648dfd91380afb60ede3 Mon Sep 17 00:00:00 2001 From: luke358 Date: Tue, 19 May 2026 22:56:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=A4=9A=E7=A7=8D?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=AD=A6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../items/weapons/range/SMG/item_SMG_1.tres | 18 +++++++++++++++ .../items/weapons/range/SMG/item_SMG_2.tres | 19 ++++++++++++++++ .../items/weapons/range/SMG/item_SMG_3.tres | 19 ++++++++++++++++ .../items/weapons/range/SMG/item_SMG_4.tres | 17 ++++++++++++++ .../items/weapons/range/SMG/stats_SMG_1.tres | 20 +++++++++++++++++ .../items/weapons/range/SMG/stats_SMG_2.tres | 20 +++++++++++++++++ .../items/weapons/range/SMG/stats_SMG_3.tres | 20 +++++++++++++++++ .../items/weapons/range/SMG/stats_SMG_4.tres | 20 +++++++++++++++++ .../weapons/range/laser/item_laser_1.tres | 9 +++++--- .../weapons/range/laser/item_laser_2.tres | 19 ++++++++++++++++ .../weapons/range/laser/item_laser_3.tres | 19 ++++++++++++++++ .../weapons/range/laser/item_laser_4.tres | 17 ++++++++++++++ .../weapons/range/laser/stats_laser_1.tres | 15 +++++++++++++ .../weapons/range/laser/stats_laser_2.tres | 22 +++++++++++++++++++ .../weapons/range/laser/stats_laser_3.tres | 22 +++++++++++++++++++ .../weapons/range/laser/stats_laser_4.tres | 18 +++++++++++++++ .../weapons/range/pistol/stats_pistol_1.tres | 6 ++--- .../weapons/range/pistol/stats_pistol_2.tres | 6 +++-- .../weapons/range/pistol/stats_pistol_3.tres | 6 +++-- .../weapons/range/pistol/stats_pistol_4.tres | 6 +++-- .../range/revolver/item_revolver_1.tres | 18 +++++++++++++++ .../range/revolver/item_revolver_2.tres | 19 ++++++++++++++++ .../range/revolver/item_revolver_3.tres | 19 ++++++++++++++++ .../range/revolver/item_revolver_4.tres | 17 ++++++++++++++ .../range/revolver/stats_revolver_1.tres | 19 ++++++++++++++++ .../range/revolver/stats_revolver_2.tres | 20 +++++++++++++++++ .../range/revolver/stats_revolver_3.tres | 20 +++++++++++++++++ .../range/revolver/stats_revolver_4.tres | 20 +++++++++++++++++ .../weapons/range/shotgun/item_shotgun_1.tres | 18 +++++++++++++++ .../weapons/range/shotgun/item_shotgun_2.tres | 19 ++++++++++++++++ .../weapons/range/shotgun/item_shotgun_3.tres | 19 ++++++++++++++++ .../weapons/range/shotgun/item_shotgun_4.tres | 17 ++++++++++++++ .../range/shotgun/stats_shotgun_1.tres | 12 ++++++++++ .../range/shotgun/stats_shotgun_2.tres | 22 +++++++++++++++++++ .../range/shotgun/stats_shotgun_3.tres | 20 +++++++++++++++++ .../range/shotgun/stats_shotgun_4.tres | 20 +++++++++++++++++ scenes/arena/arena.tscn | 6 +++++ scenes/unit/players/player.gd | 7 +++++- scenes/weapons/range/range_behavior.gd | 1 - scenes/weapons/range/weapon_revolver.tscn | 20 +++++++++++++++++ scenes/weapons/range/weapon_shotgun.tscn | 19 ++++++++++++++++ scenes/weapons/range/weapon_smg.tscn | 19 ++++++++++++++++ 42 files changed, 674 insertions(+), 15 deletions(-) create mode 100644 resources/items/weapons/range/SMG/item_SMG_1.tres create mode 100644 resources/items/weapons/range/SMG/item_SMG_2.tres create mode 100644 resources/items/weapons/range/SMG/item_SMG_3.tres create mode 100644 resources/items/weapons/range/SMG/item_SMG_4.tres create mode 100644 resources/items/weapons/range/SMG/stats_SMG_1.tres create mode 100644 resources/items/weapons/range/SMG/stats_SMG_2.tres create mode 100644 resources/items/weapons/range/SMG/stats_SMG_3.tres create mode 100644 resources/items/weapons/range/SMG/stats_SMG_4.tres create mode 100644 resources/items/weapons/range/laser/item_laser_2.tres create mode 100644 resources/items/weapons/range/laser/item_laser_3.tres create mode 100644 resources/items/weapons/range/laser/item_laser_4.tres create mode 100644 resources/items/weapons/range/laser/stats_laser_2.tres create mode 100644 resources/items/weapons/range/laser/stats_laser_3.tres create mode 100644 resources/items/weapons/range/laser/stats_laser_4.tres create mode 100644 resources/items/weapons/range/revolver/item_revolver_1.tres create mode 100644 resources/items/weapons/range/revolver/item_revolver_2.tres create mode 100644 resources/items/weapons/range/revolver/item_revolver_3.tres create mode 100644 resources/items/weapons/range/revolver/item_revolver_4.tres create mode 100644 resources/items/weapons/range/revolver/stats_revolver_1.tres create mode 100644 resources/items/weapons/range/revolver/stats_revolver_2.tres create mode 100644 resources/items/weapons/range/revolver/stats_revolver_3.tres create mode 100644 resources/items/weapons/range/revolver/stats_revolver_4.tres create mode 100644 resources/items/weapons/range/shotgun/item_shotgun_1.tres create mode 100644 resources/items/weapons/range/shotgun/item_shotgun_2.tres create mode 100644 resources/items/weapons/range/shotgun/item_shotgun_3.tres create mode 100644 resources/items/weapons/range/shotgun/item_shotgun_4.tres create mode 100644 resources/items/weapons/range/shotgun/stats_shotgun_1.tres create mode 100644 resources/items/weapons/range/shotgun/stats_shotgun_2.tres create mode 100644 resources/items/weapons/range/shotgun/stats_shotgun_3.tres create mode 100644 resources/items/weapons/range/shotgun/stats_shotgun_4.tres create mode 100644 scenes/weapons/range/weapon_revolver.tscn create mode 100644 scenes/weapons/range/weapon_shotgun.tscn create mode 100644 scenes/weapons/range/weapon_smg.tscn diff --git a/resources/items/weapons/range/SMG/item_SMG_1.tres b/resources/items/weapons/range/SMG/item_SMG_1.tres new file mode 100644 index 0000000..83e519f --- /dev/null +++ b/resources/items/weapons/range/SMG/item_SMG_1.tres @@ -0,0 +1,18 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://dgiq00qbjoc2w"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_amruu"] +[ext_resource type="PackedScene" uid="uid://ms0ay0qjj0lj" path="res://scenes/weapons/range/weapon_smg.tscn" id="2_sb37u"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_tahff"] +[ext_resource type="Resource" uid="uid://clqag222k2rpn" path="res://resources/items/weapons/range/SMG/stats_SMG_1.tres" id="4_2f3l7"] +[ext_resource type="Resource" uid="uid://clpm4c7p6xwnd" path="res://resources/items/weapons/range/SMG/item_SMG_2.tres" id="5_vyojh"] + +[resource] +script = ExtResource("3_tahff") +type = 1 +scene = ExtResource("2_sb37u") +stats = ExtResource("4_2f3l7") +upgradge_to = ExtResource("5_vyojh") +item_name = "SMG I" +item_icon = ExtResource("1_amruu") +item_cost = 10 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/SMG/item_SMG_2.tres b/resources/items/weapons/range/SMG/item_SMG_2.tres new file mode 100644 index 0000000..1b34737 --- /dev/null +++ b/resources/items/weapons/range/SMG/item_SMG_2.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://clpm4c7p6xwnd"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_6h54u"] +[ext_resource type="PackedScene" uid="uid://ms0ay0qjj0lj" path="res://scenes/weapons/range/weapon_smg.tscn" id="2_4ig5k"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_pvwvs"] +[ext_resource type="Resource" uid="uid://bvbk8u1rtj7io" path="res://resources/items/weapons/range/SMG/stats_SMG_2.tres" id="4_rkkou"] +[ext_resource type="Resource" uid="uid://c44e00ksy5qa0" path="res://resources/items/weapons/range/SMG/item_SMG_3.tres" id="5_if8v8"] + +[resource] +script = ExtResource("3_pvwvs") +type = 1 +scene = ExtResource("2_4ig5k") +stats = ExtResource("4_rkkou") +upgradge_to = ExtResource("5_if8v8") +item_name = "SMG II" +item_icon = ExtResource("1_6h54u") +item_tier = 1 +item_cost = 25 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/SMG/item_SMG_3.tres b/resources/items/weapons/range/SMG/item_SMG_3.tres new file mode 100644 index 0000000..8130324 --- /dev/null +++ b/resources/items/weapons/range/SMG/item_SMG_3.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://c44e00ksy5qa0"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_5wtlv"] +[ext_resource type="PackedScene" uid="uid://ms0ay0qjj0lj" path="res://scenes/weapons/range/weapon_smg.tscn" id="2_4rlhy"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_7t0fn"] +[ext_resource type="Resource" uid="uid://djaos6hoctxvx" path="res://resources/items/weapons/range/SMG/stats_SMG_3.tres" id="4_7781m"] +[ext_resource type="Resource" uid="uid://bdhu83etmnitr" path="res://resources/items/weapons/range/SMG/item_SMG_4.tres" id="5_p0nr8"] + +[resource] +script = ExtResource("3_7t0fn") +type = 1 +scene = ExtResource("2_4rlhy") +stats = ExtResource("4_7781m") +upgradge_to = ExtResource("5_p0nr8") +item_name = "SMG III" +item_icon = ExtResource("1_5wtlv") +item_tier = 2 +item_cost = 68 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/SMG/item_SMG_4.tres b/resources/items/weapons/range/SMG/item_SMG_4.tres new file mode 100644 index 0000000..edd0c3b --- /dev/null +++ b/resources/items/weapons/range/SMG/item_SMG_4.tres @@ -0,0 +1,17 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://bdhu83etmnitr"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_v16yo"] +[ext_resource type="PackedScene" uid="uid://ms0ay0qjj0lj" path="res://scenes/weapons/range/weapon_smg.tscn" id="2_yeikq"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_gg3gq"] +[ext_resource type="Resource" uid="uid://b5tro1s54mu1l" path="res://resources/items/weapons/range/SMG/stats_SMG_4.tres" id="4_b7jaf"] + +[resource] +script = ExtResource("3_gg3gq") +type = 1 +scene = ExtResource("2_yeikq") +stats = ExtResource("4_b7jaf") +item_name = "SMG IV" +item_icon = ExtResource("1_v16yo") +item_tier = 3 +item_cost = 155 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/SMG/stats_SMG_1.tres b/resources/items/weapons/range/SMG/stats_SMG_1.tres new file mode 100644 index 0000000..5831c78 --- /dev/null +++ b/resources/items/weapons/range/SMG/stats_SMG_1.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://clqag222k2rpn"] + +[ext_resource type="PackedScene" uid="uid://7doitq0bldjw" path="res://scenes/projectiles/projectile_smg.tscn" id="1_h3vrf"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_1s4xs"] + +[resource] +script = ExtResource("2_1s4xs") +damage = 3.0 +accurary = 0.6 +cooldown = 0.8 +crit_chance = 0.1 +crit_damage = 2.0 +max_range = 320.0 +knockback = 0.5 +recoil = 20.0 +attack_duration = 0.15000000000000002 +back_duration = 0.1 +projectile_scene = ExtResource("1_h3vrf") +projectile_speed = 1850.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/SMG/stats_SMG_2.tres b/resources/items/weapons/range/SMG/stats_SMG_2.tres new file mode 100644 index 0000000..59cfeaa --- /dev/null +++ b/resources/items/weapons/range/SMG/stats_SMG_2.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://bvbk8u1rtj7io"] + +[ext_resource type="PackedScene" uid="uid://7doitq0bldjw" path="res://scenes/projectiles/projectile_smg.tscn" id="1_qyo7y"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_uwdte"] + +[resource] +script = ExtResource("2_uwdte") +damage = 6.0 +accurary = 0.6 +cooldown = 0.7 +crit_chance = 0.15 +crit_damage = 2.0 +max_range = 330.0 +knockback = 0.5 +recoil = 20.0 +attack_duration = 0.15000000000000002 +back_duration = 0.1 +projectile_scene = ExtResource("1_qyo7y") +projectile_speed = 1850.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/SMG/stats_SMG_3.tres b/resources/items/weapons/range/SMG/stats_SMG_3.tres new file mode 100644 index 0000000..115f6a1 --- /dev/null +++ b/resources/items/weapons/range/SMG/stats_SMG_3.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://djaos6hoctxvx"] + +[ext_resource type="PackedScene" uid="uid://7doitq0bldjw" path="res://scenes/projectiles/projectile_smg.tscn" id="1_ph7fe"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_lckg5"] + +[resource] +script = ExtResource("2_lckg5") +damage = 12.0 +accurary = 0.6 +cooldown = 0.6 +crit_chance = 0.18 +crit_damage = 2.0 +max_range = 340.0 +knockback = 0.5 +recoil = 20.0 +attack_duration = 0.15000000000000002 +back_duration = 0.1 +projectile_scene = ExtResource("1_ph7fe") +projectile_speed = 1850.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/SMG/stats_SMG_4.tres b/resources/items/weapons/range/SMG/stats_SMG_4.tres new file mode 100644 index 0000000..71ba920 --- /dev/null +++ b/resources/items/weapons/range/SMG/stats_SMG_4.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://b5tro1s54mu1l"] + +[ext_resource type="PackedScene" uid="uid://7doitq0bldjw" path="res://scenes/projectiles/projectile_smg.tscn" id="1_26l6a"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_gqwis"] + +[resource] +script = ExtResource("2_gqwis") +damage = 20.0 +accurary = 0.85 +cooldown = 0.5 +crit_chance = 0.2 +crit_damage = 2.0 +max_range = 380.0 +knockback = 0.3 +recoil = 20.0 +attack_duration = 0.15000000000000002 +back_duration = 0.11 +projectile_scene = ExtResource("1_26l6a") +projectile_speed = 1850.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/laser/item_laser_1.tres b/resources/items/weapons/range/laser/item_laser_1.tres index 98e3ba5..f68da0e 100644 --- a/resources/items/weapons/range/laser/item_laser_1.tres +++ b/resources/items/weapons/range/laser/item_laser_1.tres @@ -1,15 +1,18 @@ [gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://0388m8srn1no"] -[ext_resource type="PackedScene" uid="uid://c6spr5c4dva2i" path="res://scenes/weapons/range/weapon_laser.tscn" id="1_0fjlb"] [ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_jll5j"] [ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="1_yn83p"] [ext_resource type="Resource" uid="uid://c3bcyvr88qh20" path="res://resources/items/weapons/range/laser/stats_laser_1.tres" id="2_ckl18"] +[ext_resource type="PackedScene" uid="uid://c6spr5c4dva2i" path="res://scenes/weapons/range/weapon_laser.tscn" id="2_jll5j"] +[ext_resource type="Resource" uid="uid://rbn3og82d8fj" path="res://resources/items/weapons/range/laser/item_laser_2.tres" id="5_sjcuc"] [resource] script = ExtResource("1_yn83p") type = 1 -scene = ExtResource("1_0fjlb") +scene = ExtResource("2_jll5j") stats = ExtResource("2_ckl18") +upgradge_to = ExtResource("5_sjcuc") +item_name = "Laser I" item_icon = ExtResource("1_jll5j") -item_cost = 15 +item_cost = 18 metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/laser/item_laser_2.tres b/resources/items/weapons/range/laser/item_laser_2.tres new file mode 100644 index 0000000..d8f7354 --- /dev/null +++ b/resources/items/weapons/range/laser/item_laser_2.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://rbn3og82d8fj"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_eu1p2"] +[ext_resource type="PackedScene" uid="uid://c6spr5c4dva2i" path="res://scenes/weapons/range/weapon_laser.tscn" id="2_a6mo0"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_kjjc7"] +[ext_resource type="Resource" uid="uid://b7ayjjguydc4t" path="res://resources/items/weapons/range/laser/stats_laser_2.tres" id="4_a6mo0"] +[ext_resource type="Resource" uid="uid://bd6s4wbvahtrf" path="res://resources/items/weapons/range/laser/item_laser_3.tres" id="5_a6mo0"] + +[resource] +script = ExtResource("3_kjjc7") +type = 1 +scene = ExtResource("2_a6mo0") +stats = ExtResource("4_a6mo0") +upgradge_to = ExtResource("5_a6mo0") +item_name = "Laser II" +item_icon = ExtResource("1_eu1p2") +item_tier = 1 +item_cost = 36 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/laser/item_laser_3.tres b/resources/items/weapons/range/laser/item_laser_3.tres new file mode 100644 index 0000000..bd8743b --- /dev/null +++ b/resources/items/weapons/range/laser/item_laser_3.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://bd6s4wbvahtrf"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_ynpba"] +[ext_resource type="PackedScene" uid="uid://c6spr5c4dva2i" path="res://scenes/weapons/range/weapon_laser.tscn" id="2_cw1th"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_6s16p"] +[ext_resource type="Resource" uid="uid://b6l82yi8c51hn" path="res://resources/items/weapons/range/laser/stats_laser_3.tres" id="4_cw1th"] +[ext_resource type="Resource" uid="uid://ypq8h7r2i0v4" path="res://resources/items/weapons/range/laser/item_laser_4.tres" id="5_cw1th"] + +[resource] +script = ExtResource("3_6s16p") +type = 1 +scene = ExtResource("2_cw1th") +stats = ExtResource("4_cw1th") +upgradge_to = ExtResource("5_cw1th") +item_name = "Laser III" +item_icon = ExtResource("1_ynpba") +item_tier = 2 +item_cost = 85 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/laser/item_laser_4.tres b/resources/items/weapons/range/laser/item_laser_4.tres new file mode 100644 index 0000000..e387a72 --- /dev/null +++ b/resources/items/weapons/range/laser/item_laser_4.tres @@ -0,0 +1,17 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://ypq8h7r2i0v4"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_gqc2u"] +[ext_resource type="PackedScene" uid="uid://c6spr5c4dva2i" path="res://scenes/weapons/range/weapon_laser.tscn" id="2_fjkma"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_gdgb5"] +[ext_resource type="Resource" uid="uid://dnot0xafc1cr7" path="res://resources/items/weapons/range/laser/stats_laser_4.tres" id="4_gqc2u"] + +[resource] +script = ExtResource("3_gdgb5") +type = 1 +scene = ExtResource("2_fjkma") +stats = ExtResource("4_gqc2u") +item_name = "Laser IV" +item_icon = ExtResource("1_gqc2u") +item_tier = 3 +item_cost = 180 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/laser/stats_laser_1.tres b/resources/items/weapons/range/laser/stats_laser_1.tres index e178657..f4b3920 100644 --- a/resources/items/weapons/range/laser/stats_laser_1.tres +++ b/resources/items/weapons/range/laser/stats_laser_1.tres @@ -1,7 +1,22 @@ [gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://c3bcyvr88qh20"] [ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="1_cjtyd"] +[ext_resource type="PackedScene" uid="uid://dgxgta5rdunaj" path="res://scenes/projectiles/projectile_laser.tscn" id="1_r7hd3"] [resource] script = ExtResource("1_cjtyd") +damage = 8.0 +accurary = 1.0 +cooldown = 2.0 +crit_chance = 0.1 +crit_damage = 2.5 +max_range = 450.0 +knockback = 2.0 +life_steal = 0.05 +recoil = 35.0 +recoil_duration = 0.2 +attack_duration = 0.25 +back_duration = 0.2 +projectile_scene = ExtResource("1_r7hd3") +projectile_speed = 1900.0 metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/laser/stats_laser_2.tres b/resources/items/weapons/range/laser/stats_laser_2.tres new file mode 100644 index 0000000..e9a2a6e --- /dev/null +++ b/resources/items/weapons/range/laser/stats_laser_2.tres @@ -0,0 +1,22 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://b7ayjjguydc4t"] + +[ext_resource type="PackedScene" uid="uid://dgxgta5rdunaj" path="res://scenes/projectiles/projectile_laser.tscn" id="1_58w58"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_6e1dy"] + +[resource] +script = ExtResource("2_6e1dy") +damage = 16.0 +accurary = 1.0 +cooldown = 1.7 +crit_chance = 0.15 +crit_damage = 2.5 +max_range = 450.0 +knockback = 2.0 +life_steal = 0.1 +recoil = 35.0 +recoil_duration = 0.2 +attack_duration = 0.25 +back_duration = 0.2 +projectile_scene = ExtResource("1_58w58") +projectile_speed = 1900.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/laser/stats_laser_3.tres b/resources/items/weapons/range/laser/stats_laser_3.tres new file mode 100644 index 0000000..fa5338b --- /dev/null +++ b/resources/items/weapons/range/laser/stats_laser_3.tres @@ -0,0 +1,22 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://b6l82yi8c51hn"] + +[ext_resource type="PackedScene" uid="uid://dgxgta5rdunaj" path="res://scenes/projectiles/projectile_laser.tscn" id="1_0yhrx"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_b73dm"] + +[resource] +script = ExtResource("2_b73dm") +damage = 45.0 +accurary = 1.0 +cooldown = 1.1 +crit_chance = 0.2 +crit_damage = 2.5 +max_range = 450.0 +knockback = 2.0 +life_steal = 0.15 +recoil = 35.0 +recoil_duration = 0.2 +attack_duration = 0.25 +back_duration = 0.2 +projectile_scene = ExtResource("1_0yhrx") +projectile_speed = 1900.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/laser/stats_laser_4.tres b/resources/items/weapons/range/laser/stats_laser_4.tres new file mode 100644 index 0000000..d890c2f --- /dev/null +++ b/resources/items/weapons/range/laser/stats_laser_4.tres @@ -0,0 +1,18 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://dnot0xafc1cr7"] + +[ext_resource type="PackedScene" uid="uid://dgxgta5rdunaj" path="res://scenes/projectiles/projectile_laser.tscn" id="1_38u5n"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_srbpj"] + +[resource] +script = ExtResource("2_srbpj") +damage = 75.0 +accurary = 0.85 +cooldown = 0.7 +crit_chance = 0.3 +crit_damage = 2.0 +max_range = 380.0 +knockback = 1.3 +life_steal = 0.3 +projectile_scene = ExtResource("1_38u5n") +projectile_speed = 1700.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/pistol/stats_pistol_1.tres b/resources/items/weapons/range/pistol/stats_pistol_1.tres index 15a00e5..af0469b 100644 --- a/resources/items/weapons/range/pistol/stats_pistol_1.tres +++ b/resources/items/weapons/range/pistol/stats_pistol_1.tres @@ -5,12 +5,10 @@ [resource] script = ExtResource("1_khnh1") -damage = 30.0 +damage = 5.0 accurary = 0.85 -cooldown = 0.7 -crit_chance = 0.15 crit_damage = 2.0 -max_range = 380.0 +max_range = 350.0 knockback = 1.3 projectile_scene = ExtResource("1_eqhys") projectile_speed = 1700.0 diff --git a/resources/items/weapons/range/pistol/stats_pistol_2.tres b/resources/items/weapons/range/pistol/stats_pistol_2.tres index 7191f92..4341250 100644 --- a/resources/items/weapons/range/pistol/stats_pistol_2.tres +++ b/resources/items/weapons/range/pistol/stats_pistol_2.tres @@ -5,10 +5,12 @@ [resource] script = ExtResource("2_dhuvg") -damage = 5.0 +damage = 10.0 accurary = 0.85 +cooldown = 0.9 +crit_chance = 0.08 crit_damage = 2.0 -max_range = 350.0 +max_range = 360.0 knockback = 1.3 projectile_scene = ExtResource("1_7jjae") projectile_speed = 1700.0 diff --git a/resources/items/weapons/range/pistol/stats_pistol_3.tres b/resources/items/weapons/range/pistol/stats_pistol_3.tres index da40f3d..a1fd8b2 100644 --- a/resources/items/weapons/range/pistol/stats_pistol_3.tres +++ b/resources/items/weapons/range/pistol/stats_pistol_3.tres @@ -5,10 +5,12 @@ [resource] script = ExtResource("2_oprbb") -damage = 5.0 +damage = 18.0 accurary = 0.85 +cooldown = 0.8 +crit_chance = 0.1 crit_damage = 2.0 -max_range = 350.0 +max_range = 370.0 knockback = 1.3 projectile_scene = ExtResource("1_i0vrm") projectile_speed = 1700.0 diff --git a/resources/items/weapons/range/pistol/stats_pistol_4.tres b/resources/items/weapons/range/pistol/stats_pistol_4.tres index 013ed32..aabfa87 100644 --- a/resources/items/weapons/range/pistol/stats_pistol_4.tres +++ b/resources/items/weapons/range/pistol/stats_pistol_4.tres @@ -5,10 +5,12 @@ [resource] script = ExtResource("2_hrw3j") -damage = 5.0 +damage = 30.0 accurary = 0.85 +cooldown = 0.7 +crit_chance = 0.15 crit_damage = 2.0 -max_range = 350.0 +max_range = 380.0 knockback = 1.3 projectile_scene = ExtResource("1_r12us") projectile_speed = 1700.0 diff --git a/resources/items/weapons/range/revolver/item_revolver_1.tres b/resources/items/weapons/range/revolver/item_revolver_1.tres new file mode 100644 index 0000000..c20dc0b --- /dev/null +++ b/resources/items/weapons/range/revolver/item_revolver_1.tres @@ -0,0 +1,18 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://cwpf4ko1wqfw"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_gkva4"] +[ext_resource type="PackedScene" uid="uid://cft8rb2ggqdui" path="res://scenes/weapons/range/weapon_revolver.tscn" id="2_gkva4"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_3lweq"] +[ext_resource type="Resource" uid="uid://mvyr6bjvkby3" path="res://resources/items/weapons/range/revolver/stats_revolver_1.tres" id="4_bhw8q"] +[ext_resource type="Resource" uid="uid://c5qwouecqphq4" path="res://resources/items/weapons/range/revolver/item_revolver_2.tres" id="5_u61nj"] + +[resource] +script = ExtResource("3_3lweq") +type = 1 +scene = ExtResource("2_gkva4") +stats = ExtResource("4_bhw8q") +upgradge_to = ExtResource("5_u61nj") +item_name = "Revolver I" +item_icon = ExtResource("1_gkva4") +item_cost = 16 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/revolver/item_revolver_2.tres b/resources/items/weapons/range/revolver/item_revolver_2.tres new file mode 100644 index 0000000..203b263 --- /dev/null +++ b/resources/items/weapons/range/revolver/item_revolver_2.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://c5qwouecqphq4"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_c2x3g"] +[ext_resource type="PackedScene" uid="uid://cft8rb2ggqdui" path="res://scenes/weapons/range/weapon_revolver.tscn" id="2_c2x3g"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_de5fj"] +[ext_resource type="Resource" uid="uid://bisolktdrc70u" path="res://resources/items/weapons/range/revolver/stats_revolver_2.tres" id="4_20htl"] +[ext_resource type="Resource" uid="uid://dmnou87x438qf" path="res://resources/items/weapons/range/revolver/item_revolver_3.tres" id="5_2trr2"] + +[resource] +script = ExtResource("3_de5fj") +type = 1 +scene = ExtResource("2_c2x3g") +stats = ExtResource("4_20htl") +upgradge_to = ExtResource("5_2trr2") +item_name = "Revolver II" +item_icon = ExtResource("1_c2x3g") +item_tier = 1 +item_cost = 34 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/revolver/item_revolver_3.tres b/resources/items/weapons/range/revolver/item_revolver_3.tres new file mode 100644 index 0000000..032a01b --- /dev/null +++ b/resources/items/weapons/range/revolver/item_revolver_3.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://dmnou87x438qf"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_26sto"] +[ext_resource type="PackedScene" uid="uid://cft8rb2ggqdui" path="res://scenes/weapons/range/weapon_revolver.tscn" id="2_26sto"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_jn486"] +[ext_resource type="Resource" uid="uid://iloar4r1agmp" path="res://resources/items/weapons/range/revolver/stats_revolver_3.tres" id="4_pa0y4"] +[ext_resource type="Resource" uid="uid://bsf2qfs6n5ijf" path="res://resources/items/weapons/range/revolver/item_revolver_4.tres" id="5_jlain"] + +[resource] +script = ExtResource("3_jn486") +type = 1 +scene = ExtResource("2_26sto") +stats = ExtResource("4_pa0y4") +upgradge_to = ExtResource("5_jlain") +item_name = "Revolver III" +item_icon = ExtResource("1_26sto") +item_tier = 2 +item_cost = 72 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/revolver/item_revolver_4.tres b/resources/items/weapons/range/revolver/item_revolver_4.tres new file mode 100644 index 0000000..f80d3c2 --- /dev/null +++ b/resources/items/weapons/range/revolver/item_revolver_4.tres @@ -0,0 +1,17 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://bsf2qfs6n5ijf"] + +[ext_resource type="Texture2D" uid="uid://crs6paux78un0" path="res://assets/sprites/Weapons/Icons/weapon_laser_icon.png" id="1_jqy67"] +[ext_resource type="PackedScene" uid="uid://cft8rb2ggqdui" path="res://scenes/weapons/range/weapon_revolver.tscn" id="2_jqy67"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_oov67"] +[ext_resource type="Resource" uid="uid://brq5gwg5hy6s2" path="res://resources/items/weapons/range/revolver/stats_revolver_4.tres" id="4_k8anh"] + +[resource] +script = ExtResource("3_oov67") +type = 1 +scene = ExtResource("2_jqy67") +stats = ExtResource("4_k8anh") +item_name = "Revolver IV" +item_icon = ExtResource("1_jqy67") +item_tier = 3 +item_cost = 165 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/revolver/stats_revolver_1.tres b/resources/items/weapons/range/revolver/stats_revolver_1.tres new file mode 100644 index 0000000..af95084 --- /dev/null +++ b/resources/items/weapons/range/revolver/stats_revolver_1.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://mvyr6bjvkby3"] + +[ext_resource type="PackedScene" uid="uid://bvdn35euxceps" path="res://scenes/projectiles/projectile_revolver.tscn" id="1_scsyx"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_ehwww"] + +[resource] +script = ExtResource("2_ehwww") +damage = 10.0 +accurary = 0.7 +cooldown = 1.5 +crit_damage = 2.5 +max_range = 350.0 +knockback = 2.0 +life_steal = 0.05 +recoil_duration = 0.15000000000000002 +back_duration = 0.18 +projectile_scene = ExtResource("1_scsyx") +projectile_speed = 1800.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/revolver/stats_revolver_2.tres b/resources/items/weapons/range/revolver/stats_revolver_2.tres new file mode 100644 index 0000000..7bace8b --- /dev/null +++ b/resources/items/weapons/range/revolver/stats_revolver_2.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://bisolktdrc70u"] + +[ext_resource type="PackedScene" uid="uid://bvdn35euxceps" path="res://scenes/projectiles/projectile_revolver.tscn" id="1_bx0og"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_ld54v"] + +[resource] +script = ExtResource("2_ld54v") +damage = 20.0 +accurary = 0.7 +cooldown = 1.4 +crit_chance = 0.07 +crit_damage = 2.5 +max_range = 350.0 +knockback = 2.0 +life_steal = 0.07 +recoil_duration = 0.15000000000000002 +back_duration = 0.18 +projectile_scene = ExtResource("1_bx0og") +projectile_speed = 1800.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/revolver/stats_revolver_3.tres b/resources/items/weapons/range/revolver/stats_revolver_3.tres new file mode 100644 index 0000000..0e38410 --- /dev/null +++ b/resources/items/weapons/range/revolver/stats_revolver_3.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://iloar4r1agmp"] + +[ext_resource type="PackedScene" uid="uid://bvdn35euxceps" path="res://scenes/projectiles/projectile_revolver.tscn" id="1_wqftu"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_cg7eg"] + +[resource] +script = ExtResource("2_cg7eg") +damage = 20.0 +accurary = 0.7 +cooldown = 1.3 +crit_chance = 0.09 +crit_damage = 2.5 +max_range = 350.0 +knockback = 2.0 +life_steal = 0.09 +recoil_duration = 0.15000000000000002 +back_duration = 0.18 +projectile_scene = ExtResource("1_wqftu") +projectile_speed = 1800.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/revolver/stats_revolver_4.tres b/resources/items/weapons/range/revolver/stats_revolver_4.tres new file mode 100644 index 0000000..4f8ee6a --- /dev/null +++ b/resources/items/weapons/range/revolver/stats_revolver_4.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://brq5gwg5hy6s2"] + +[ext_resource type="PackedScene" uid="uid://bvdn35euxceps" path="res://scenes/projectiles/projectile_revolver.tscn" id="1_vwmgv"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_oirfp"] + +[resource] +script = ExtResource("2_oirfp") +damage = 40.0 +accurary = 0.7 +cooldown = 1.2 +crit_chance = 0.12 +crit_damage = 2.5 +max_range = 350.0 +knockback = 2.0 +life_steal = 0.12 +recoil_duration = 0.15000000000000002 +back_duration = 0.18 +projectile_scene = ExtResource("1_vwmgv") +projectile_speed = 1800.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/shotgun/item_shotgun_1.tres b/resources/items/weapons/range/shotgun/item_shotgun_1.tres new file mode 100644 index 0000000..78131ef --- /dev/null +++ b/resources/items/weapons/range/shotgun/item_shotgun_1.tres @@ -0,0 +1,18 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://cyobkqxhoqqbq"] + +[ext_resource type="Texture2D" uid="uid://dx2oqsohwycoa" path="res://assets/sprites/Weapons/Icons/weapon_shotgun_icon.png" id="1_hnhw4"] +[ext_resource type="PackedScene" uid="uid://ddi16trhufcq" path="res://scenes/weapons/range/weapon_shotgun.tscn" id="2_hnhw4"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_k81rj"] +[ext_resource type="Resource" uid="uid://chun71v2fsf6p" path="res://resources/items/weapons/range/shotgun/stats_shotgun_1.tres" id="4_f8qu5"] +[ext_resource type="Resource" uid="uid://cs1hn0bcvfk81" path="res://resources/items/weapons/range/shotgun/item_shotgun_2.tres" id="5_6cgaj"] + +[resource] +script = ExtResource("3_k81rj") +type = 1 +scene = ExtResource("2_hnhw4") +stats = ExtResource("4_f8qu5") +upgradge_to = ExtResource("5_6cgaj") +item_name = "Shotgun I" +item_icon = ExtResource("1_hnhw4") +item_cost = 15 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/shotgun/item_shotgun_2.tres b/resources/items/weapons/range/shotgun/item_shotgun_2.tres new file mode 100644 index 0000000..75df72c --- /dev/null +++ b/resources/items/weapons/range/shotgun/item_shotgun_2.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://cs1hn0bcvfk81"] + +[ext_resource type="Texture2D" uid="uid://dx2oqsohwycoa" path="res://assets/sprites/Weapons/Icons/weapon_shotgun_icon.png" id="1_61ngo"] +[ext_resource type="PackedScene" uid="uid://ddi16trhufcq" path="res://scenes/weapons/range/weapon_shotgun.tscn" id="2_61ngo"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_m7iqr"] +[ext_resource type="Resource" uid="uid://dhvirv3y7vra3" path="res://resources/items/weapons/range/shotgun/stats_shotgun_2.tres" id="4_nn5o4"] +[ext_resource type="Resource" uid="uid://cjf7mr1rmtoq" path="res://resources/items/weapons/range/shotgun/item_shotgun_3.tres" id="5_l20ef"] + +[resource] +script = ExtResource("3_m7iqr") +type = 1 +scene = ExtResource("2_61ngo") +stats = ExtResource("4_nn5o4") +upgradge_to = ExtResource("5_l20ef") +item_name = "Shotgun II" +item_icon = ExtResource("1_61ngo") +item_tier = 1 +item_cost = 32 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/shotgun/item_shotgun_3.tres b/resources/items/weapons/range/shotgun/item_shotgun_3.tres new file mode 100644 index 0000000..1e6ffbf --- /dev/null +++ b/resources/items/weapons/range/shotgun/item_shotgun_3.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://cjf7mr1rmtoq"] + +[ext_resource type="Texture2D" uid="uid://dx2oqsohwycoa" path="res://assets/sprites/Weapons/Icons/weapon_shotgun_icon.png" id="1_lwww7"] +[ext_resource type="PackedScene" uid="uid://ddi16trhufcq" path="res://scenes/weapons/range/weapon_shotgun.tscn" id="2_lwww7"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_nyvps"] +[ext_resource type="Resource" uid="uid://dq2whbsm3xrsw" path="res://resources/items/weapons/range/shotgun/stats_shotgun_3.tres" id="4_rt7cp"] +[ext_resource type="Resource" uid="uid://bpqeay8ckqj5i" path="res://resources/items/weapons/range/shotgun/item_shotgun_4.tres" id="5_6w62a"] + +[resource] +script = ExtResource("3_nyvps") +type = 1 +scene = ExtResource("2_lwww7") +stats = ExtResource("4_rt7cp") +upgradge_to = ExtResource("5_6w62a") +item_name = "Shotgun III" +item_icon = ExtResource("1_lwww7") +item_tier = 2 +item_cost = 70 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/shotgun/item_shotgun_4.tres b/resources/items/weapons/range/shotgun/item_shotgun_4.tres new file mode 100644 index 0000000..5ad3d68 --- /dev/null +++ b/resources/items/weapons/range/shotgun/item_shotgun_4.tres @@ -0,0 +1,17 @@ +[gd_resource type="Resource" script_class="ItemWeapon" format=3 uid="uid://bpqeay8ckqj5i"] + +[ext_resource type="Texture2D" uid="uid://dx2oqsohwycoa" path="res://assets/sprites/Weapons/Icons/weapon_shotgun_icon.png" id="1_bul0y"] +[ext_resource type="PackedScene" uid="uid://ddi16trhufcq" path="res://scenes/weapons/range/weapon_shotgun.tscn" id="2_bul0y"] +[ext_resource type="Script" uid="uid://26bxxaoso6np" path="res://resources/items/weapons/item_weapon.gd" id="3_eyiuy"] +[ext_resource type="Resource" uid="uid://b2jocl3rtywoa" path="res://resources/items/weapons/range/shotgun/stats_shotgun_4.tres" id="4_xlr0m"] + +[resource] +script = ExtResource("3_eyiuy") +type = 1 +scene = ExtResource("2_bul0y") +stats = ExtResource("4_xlr0m") +item_name = "Shotgun IV" +item_icon = ExtResource("1_bul0y") +item_tier = 3 +item_cost = 170 +metadata/_custom_type_script = "uid://26bxxaoso6np" diff --git a/resources/items/weapons/range/shotgun/stats_shotgun_1.tres b/resources/items/weapons/range/shotgun/stats_shotgun_1.tres new file mode 100644 index 0000000..2606ebe --- /dev/null +++ b/resources/items/weapons/range/shotgun/stats_shotgun_1.tres @@ -0,0 +1,12 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://chun71v2fsf6p"] + +[ext_resource type="PackedScene" uid="uid://5mv5jtkql7pm" path="res://scenes/projectiles/projectile_shotgun.tscn" id="1_elnca"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_2qhof"] + +[resource] +script = ExtResource("2_2qhof") +damage = 5.0 +accurary = 0.8 +projectile_scene = ExtResource("1_elnca") +projectile_speed = 1500.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/shotgun/stats_shotgun_2.tres b/resources/items/weapons/range/shotgun/stats_shotgun_2.tres new file mode 100644 index 0000000..af06156 --- /dev/null +++ b/resources/items/weapons/range/shotgun/stats_shotgun_2.tres @@ -0,0 +1,22 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://dhvirv3y7vra3"] + +[ext_resource type="PackedScene" uid="uid://5mv5jtkql7pm" path="res://scenes/projectiles/projectile_shotgun.tscn" id="1_oeq4a"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_tewxw"] + +[resource] +script = ExtResource("2_tewxw") +damage = 18.0 +accurary = 0.85 +cooldown = 1.3 +crit_chance = 0.07 +crit_damage = 2.0 +max_range = 350.0 +knockback = 3.0 +life_steal = 0.05 +recoil = 35.0 +recoil_duration = 0.25 +attack_duration = 0.25 +back_duration = 0.2 +projectile_scene = ExtResource("1_oeq4a") +projectile_speed = 1800.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/shotgun/stats_shotgun_3.tres b/resources/items/weapons/range/shotgun/stats_shotgun_3.tres new file mode 100644 index 0000000..a1565fe --- /dev/null +++ b/resources/items/weapons/range/shotgun/stats_shotgun_3.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://dq2whbsm3xrsw"] + +[ext_resource type="PackedScene" uid="uid://5mv5jtkql7pm" path="res://scenes/projectiles/projectile_shotgun.tscn" id="1_ggb7m"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_i6s3s"] + +[resource] +script = ExtResource("2_i6s3s") +damage = 32.0 +accurary = 0.85 +cooldown = 1.1 +crit_chance = 0.09 +crit_damage = 2.0 +max_range = 350.0 +knockback = 3.0 +life_steal = 0.05 +recoil = 35.0 +recoil_duration = 0.2 +projectile_scene = ExtResource("1_ggb7m") +projectile_speed = 1800.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/resources/items/weapons/range/shotgun/stats_shotgun_4.tres b/resources/items/weapons/range/shotgun/stats_shotgun_4.tres new file mode 100644 index 0000000..a23f662 --- /dev/null +++ b/resources/items/weapons/range/shotgun/stats_shotgun_4.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="WeaponStats" format=3 uid="uid://b2jocl3rtywoa"] + +[ext_resource type="PackedScene" uid="uid://5mv5jtkql7pm" path="res://scenes/projectiles/projectile_shotgun.tscn" id="1_6q0d1"] +[ext_resource type="Script" uid="uid://d3d6rctbb48mk" path="res://resources/items/weapons/weapon_stats.gd" id="2_ty11c"] + +[resource] +script = ExtResource("2_ty11c") +damage = 48.0 +accurary = 0.85 +cooldown = 0.9 +crit_chance = 0.11 +crit_damage = 2.0 +max_range = 350.0 +knockback = 3.0 +life_steal = 0.05 +recoil = 35.0 +recoil_duration = 0.2 +projectile_scene = ExtResource("1_6q0d1") +projectile_speed = 1800.0 +metadata/_custom_type_script = "uid://d3d6rctbb48mk" diff --git a/scenes/arena/arena.tscn b/scenes/arena/arena.tscn index 1c8dd7c..ad2188b 100644 --- a/scenes/arena/arena.tscn +++ b/scenes/arena/arena.tscn @@ -35,4 +35,10 @@ position = Vector2(-493, 26) position = Vector2(-382, 165) [node name="EnemyChaserSlow3" parent="." unique_id=597651166 instance=ExtResource("6_jx0ua")] +position = Vector2(-673, -291) + +[node name="EnemyChaserSlow4" parent="." unique_id=770584794 instance=ExtResource("6_jx0ua")] +position = Vector2(-785, -79) + +[node name="EnemyChaserSlow5" parent="." unique_id=364194487 instance=ExtResource("6_jx0ua")] position = Vector2(-385, -141) diff --git a/scenes/unit/players/player.gd b/scenes/unit/players/player.gd index 1919a49..a13b34a 100644 --- a/scenes/unit/players/player.gd +++ b/scenes/unit/players/player.gd @@ -24,7 +24,12 @@ func _ready() -> void: dash_cooldown_timer.wait_time = dash_cooldown #add_weapon(preload("uid://murcuuks1j8l")) - add_weapon(preload("uid://bxlu2qkyn4xqf")) + + #add_weapon(preload("uid://bxlu2qkyn4xqf")) + #add_weapon(preload("uid://0388m8srn1no")) + #add_weapon(preload("uid://cwpf4ko1wqfw")) + #add_weapon(preload("uid://dgiq00qbjoc2w")) + add_weapon(preload("uid://cyobkqxhoqqbq")) diff --git a/scenes/weapons/range/range_behavior.gd b/scenes/weapons/range/range_behavior.gd index 5cde532..6ac77ca 100644 --- a/scenes/weapons/range/range_behavior.gd +++ b/scenes/weapons/range/range_behavior.gd @@ -3,7 +3,6 @@ class_name RangeBehavior @onready var muzzle: Marker2D = %Muzzle - func execute_attack() -> void: weapon.is_attacking = true diff --git a/scenes/weapons/range/weapon_revolver.tscn b/scenes/weapons/range/weapon_revolver.tscn new file mode 100644 index 0000000..8055e25 --- /dev/null +++ b/scenes/weapons/range/weapon_revolver.tscn @@ -0,0 +1,20 @@ +[gd_scene format=3 uid="uid://cft8rb2ggqdui"] + +[ext_resource type="PackedScene" uid="uid://dcc7rsdy4j8v6" path="res://scenes/weapons/weapon_base.tscn" id="1_t4t44"] +[ext_resource type="Texture2D" uid="uid://duqh85poxmumg" path="res://assets/sprites/Weapons/Range/WeaponRevolver.png" id="2_bgd6k"] +[ext_resource type="Script" uid="uid://f71mwa3ckrj8" path="res://scenes/weapons/range/range_behavior.gd" id="3_bgd6k"] + +[node name="WeaponRevolver" unique_id=63743776 instance=ExtResource("1_t4t44")] + +[node name="Sprite2D" parent="." index="0" unique_id=1011668514] +position = Vector2(18, -2) +texture = ExtResource("2_bgd6k") + +[node name="Muzzle" type="Marker2D" parent="Sprite2D" index="0" unique_id=1041128520] +unique_name_in_owner = true +position = Vector2(88, -22) +scale = Vector2(2, 2) + +[node name="WeaponBehavior" parent="." index="3" unique_id=1507497844 node_paths=PackedStringArray("weapon")] +script = ExtResource("3_bgd6k") +weapon = NodePath("..") diff --git a/scenes/weapons/range/weapon_shotgun.tscn b/scenes/weapons/range/weapon_shotgun.tscn new file mode 100644 index 0000000..01dc063 --- /dev/null +++ b/scenes/weapons/range/weapon_shotgun.tscn @@ -0,0 +1,19 @@ +[gd_scene format=3 uid="uid://ddi16trhufcq"] + +[ext_resource type="PackedScene" uid="uid://dcc7rsdy4j8v6" path="res://scenes/weapons/weapon_base.tscn" id="1_do0ve"] +[ext_resource type="Texture2D" uid="uid://c7cwrud8hbq0b" path="res://assets/sprites/Weapons/Range/WeaponShotgun.png" id="2_q2o1a"] +[ext_resource type="Script" uid="uid://f71mwa3ckrj8" path="res://scenes/weapons/range/range_behavior.gd" id="3_bhln8"] + +[node name="WeaponShotgun" unique_id=63743776 instance=ExtResource("1_do0ve")] + +[node name="Sprite2D" parent="." index="0" unique_id=1011668514] +position = Vector2(26, -1) +texture = ExtResource("2_q2o1a") + +[node name="Muzzle" type="Marker2D" parent="Sprite2D" index="0" unique_id=1915122265] +unique_name_in_owner = true +position = Vector2(98, -16) + +[node name="WeaponBehavior" parent="." index="3" unique_id=1507497844 node_paths=PackedStringArray("weapon")] +script = ExtResource("3_bhln8") +weapon = NodePath("..") diff --git a/scenes/weapons/range/weapon_smg.tscn b/scenes/weapons/range/weapon_smg.tscn new file mode 100644 index 0000000..f93e000 --- /dev/null +++ b/scenes/weapons/range/weapon_smg.tscn @@ -0,0 +1,19 @@ +[gd_scene format=3 uid="uid://ms0ay0qjj0lj"] + +[ext_resource type="PackedScene" uid="uid://dcc7rsdy4j8v6" path="res://scenes/weapons/weapon_base.tscn" id="1_hnjef"] +[ext_resource type="Texture2D" uid="uid://c2y5upwgfl7p4" path="res://assets/sprites/Weapons/Range/WeaponSMG.png" id="2_p43dw"] +[ext_resource type="Script" uid="uid://f71mwa3ckrj8" path="res://scenes/weapons/range/range_behavior.gd" id="3_a067a"] + +[node name="WeaponSMG" unique_id=63743776 instance=ExtResource("1_hnjef")] + +[node name="Sprite2D" parent="." index="0" unique_id=1011668514] +position = Vector2(21, -5) +texture = ExtResource("2_p43dw") + +[node name="Muzzle" type="Marker2D" parent="Sprite2D" index="0" unique_id=468608715] +unique_name_in_owner = true +position = Vector2(84, -18) + +[node name="WeaponBehavior" parent="." index="3" unique_id=1507497844 node_paths=PackedStringArray("weapon")] +script = ExtResource("3_a067a") +weapon = NodePath("..")