Added weapons and fixed others

This commit is contained in:
Marco 2025-08-14 10:58:54 +02:00
commit 400123a447
20 changed files with 185 additions and 67 deletions

View file

@ -0,0 +1,21 @@
[gd_resource type="Resource" script_class="BulletResource" load_steps=5 format=3 uid="uid://6e8or0ytw18c"]
[ext_resource type="PackedScene" uid="uid://crcdug04y1dxy" path="res://Scenes/Weapons/base_generic_bullet_3D.tscn" id="1_afikq"]
[ext_resource type="Texture2D" uid="uid://dpg67vdjmoy6t" path="res://Sprites/Bullets/player_laser_bullet.png" id="2_ds7sg"]
[ext_resource type="Resource" uid="uid://dye4820oabo2f" path="res://Resources/Bullets/3D/Bullet_Spark_Harmless_3D.tres" id="3_8qct8"]
[ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="4_udb6j"]
[resource]
script = ExtResource("4_udb6j")
BulletScene = ExtResource("1_afikq")
BulletSprite = ExtResource("2_ds7sg")
BulletSize = 0.161
DestructionParticlesBullet = ExtResource("3_8qct8")
BulletSpeed = 10.0
BulletDamage = 4.0
MaxDamage = 8.0
Knockback = 150.0
Owner = 1
GrazeValue = 1.0
Attributes = 320
TimeModifiers = []

View file

@ -0,0 +1,31 @@
[gd_resource type="Resource" script_class="BulletResource" load_steps=7 format=3 uid="uid://djwwan7ud5kl4"]
[ext_resource type="PackedScene" uid="uid://crcdug04y1dxy" path="res://Scenes/Weapons/base_generic_bullet_3D.tscn" id="1_q20o6"]
[ext_resource type="Texture2D" uid="uid://cy86tmig4yx8k" path="res://Sprites/Bullets/mid_bullet_yinyang.png" id="2_3hx0d"]
[ext_resource type="Resource" uid="uid://bpreje4f8ok62" path="res://Resources/Bullets/3D/Explosion_3D.tres" id="3_ndohm"]
[ext_resource type="Script" uid="uid://ci2vjo54w7i18" path="res://Scripts/Resources/Modifiers/DelayedSpeedIncreaseModifier.cs" id="4_uhna8"]
[ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="5_5lpt1"]
[sub_resource type="Resource" id="Resource_lcgqc"]
script = ExtResource("4_uhna8")
TransitionType = 2
Duration = 0.5
TimeInSeconds = 0.0
Value = 3.0
metadata/_custom_type_script = "uid://ci2vjo54w7i18"
[resource]
script = ExtResource("5_5lpt1")
BulletScene = ExtResource("1_q20o6")
BulletSprite = ExtResource("2_3hx0d")
BulletSize = 0.161
DestructionParticlesBullet = ExtResource("3_ndohm")
BulletSpeed = 2.5
BulletDamage = 8.0
MaxDamage = 12.0
Knockback = 200.0
Owner = 1
DamageType = 1
GrazeValue = 1.0
Attributes = 264
TimeModifiers = Array[Object]([SubResource("Resource_lcgqc")])

View file

@ -8,33 +8,17 @@
[sub_resource type="Resource" id="Resource_3a5dw"]
script = ExtResource("2_7jsp7")
TimeInSeconds = 0.8
ModifierType = 0
Value = 0.0
Continuous = false
[sub_resource type="Resource" id="Resource_rtncg"]
script = ExtResource("3_ps6u0")
TimeInSeconds = 0.9
ModifierType = 2
Value = 0.0
Continuous = false
[resource]
script = ExtResource("4_xv6y0")
BulletScene = ExtResource("1_w3uhv")
BulletSpeed = 40.0
Direction = Vector2(1, 0)
BulletDamage = 20.0
MaxDamage = 1.0
Knockback = 1.0
LifeTime = 20.0
DestroyOnCollision = false
Owner = 2
DamageType = 0
RotateSprite = false
Controllable = false
Freezable = true
Grazeable = false
GrazeValue = 0.2
Attributes = 0
TimeModifiers = Array[Object]([SubResource("Resource_3a5dw"), SubResource("Resource_rtncg")])

View file

@ -9,18 +9,11 @@ script = ExtResource("3_77nif")
BulletScene = ExtResource("1_k71c3")
DestructionParticlesScene = ExtResource("2_x6hhy")
BulletSpeed = 300.0
Direction = Vector2(1, 0)
BulletDamage = 4.0
MaxDamage = 8.0
Knockback = 150.0
LifeTime = 10.0
DestroyOnCollision = true
Owner = 1
DamageType = 3
RotateSprite = true
Controllable = false
Freezable = false
Grazeable = false
GrazeValue = 1.0
Attributes = 320
TimeModifiers = []

View file

@ -1,8 +1,9 @@
[gd_resource type="Resource" script_class="LootItem" load_steps=4 format=3 uid="uid://ccmuffmnevrt4"]
[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://ccmuffmnevrt4"]
[ext_resource type="Texture2D" uid="uid://61kfxc7k3do" path="res://Sprites/Items/Ying_Yang_Gun.png" id="1_2w24o"]
[ext_resource type="Resource" uid="uid://ba0r3qmsrm0td" path="res://Resources/Weapons/Yin_Yang_Gun.tres" id="1_cuxft"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_2w24o"]
[ext_resource type="Resource" uid="uid://dmnk118xmsa1m" path="res://Resources/Weapons/Yin_Yang_Gun_3D.tres" id="3_ajo0o"]
[resource]
script = ExtResource("2_2w24o")
@ -11,16 +12,13 @@ ShortName = &"SM-3"
ItemDescription = &"A weapon that shoots explosive Yin-Yang Orbs"
ItemKey = &"YINYANG_GUN"
Item = 9
Tier = 0
Price = 0
WeaponData = ExtResource("1_cuxft")
WeaponData3D = ExtResource("3_ajo0o")
Amount = 1
Max = 1
PickupIfMaxed = true
ConsumeOnUse = false
UiType = 0
UiType = 14
Selectable = true
AutoPickup = false
InventorySprite = ExtResource("1_2w24o")
DropScenePath = &"res://Scenes/Items/GenericItem.tscn"
DropScenePath3D = &"uid://cnot7sft7lpf3"

View file

@ -1,20 +1,19 @@
[gd_resource type="Resource" script_class="WeaponResource" load_steps=4 format=3 uid="uid://d2tgk8rnd4sfs"]
[ext_resource type="Resource" uid="uid://csmq6hngkx41e" path="res://Resources/Bullets/3D/icicle_gun_bullets_3D.tres" id="1_boxvv"]
[ext_resource type="Resource" uid="uid://6e8or0ytw18c" path="res://Resources/Bullets/3D/player_laser_3D.tres" id="1_f21bu"]
[ext_resource type="AudioStream" uid="uid://c1au3v0mynil8" path="res://SFX/Weapons/Laser_shoot 7.wav" id="2_f21bu"]
[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="4_wga0n"]
[resource]
script = ExtResource("4_wga0n")
Name = &"Laser"
BulletData = ExtResource("1_boxvv")
BulletData = ExtResource("1_f21bu")
Priority = 1
AmmoPerShot = 2
RateOfFire = 0.3000000000029104
BulletCapacity = 5
ReloadTime = 0.6000000000058208
InfiniteAmmo = false
ItemKey = &"LASER_WEAPON"
AmmoKey = &"SHIELD"
SpreadAngle = 5.0
RandomSpread = 2.5
ShootSound = ExtResource("2_f21bu")

View file

@ -0,0 +1,16 @@
[gd_resource type="Resource" script_class="WeaponResource" load_steps=3 format=3 uid="uid://dmnk118xmsa1m"]
[ext_resource type="Resource" uid="uid://djwwan7ud5kl4" path="res://Resources/Bullets/3D/yin_yang_bullet_3D.tres" id="1_eanua"]
[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="2_kq323"]
[resource]
script = ExtResource("2_kq323")
Name = &"Yin-Yang Gun"
BulletData = ExtResource("1_eanua")
Priority = 20
RateOfFire = 0.8
BulletCapacity = 3
ReloadTime = 0.4
InfiniteAmmo = false
ItemKey = &"YINYANG_GUN"
AmmoKey = &"YINYANG_AMMO"