mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-14 05:05:54 +00:00
Added weapons and fixed others
This commit is contained in:
parent
8d5f1783e9
commit
400123a447
20 changed files with 185 additions and 67 deletions
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=647 format=4 uid="uid://cupulrjeeivxm"]
|
||||
[gd_scene load_steps=649 format=4 uid="uid://cupulrjeeivxm"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://kno58homctew" path="res://addons/func_godot/src/map/func_godot_map.gd" id="1_amw6e"]
|
||||
[ext_resource type="Resource" uid="uid://cx41lsryg5wpm" path="res://3D/TrenchBroom/map_settings.tres" id="2_smtsr"]
|
||||
|
|
@ -112,7 +112,9 @@
|
|||
[ext_resource type="PackedScene" uid="uid://djm3rsc7ul5jb" path="res://3D/Scenes/Props/Tube_3D_Emitter.tscn" id="106_upccm"]
|
||||
[ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="107_0njqu"]
|
||||
[ext_resource type="Resource" uid="uid://ckfqrq8a0uj1t" path="res://Resources/Items/LaserWeapon.tres" id="108_r6j3v"]
|
||||
[ext_resource type="Resource" uid="uid://diqm2ju0xakkt" path="res://Resources/Items/Yin_Yang_Ammo.tres" id="108_ymka0"]
|
||||
[ext_resource type="Resource" uid="uid://bgcgeg187vg1h" path="res://Resources/Items/IcicleRepeater.tres" id="109_gbc0s"]
|
||||
[ext_resource type="Resource" uid="uid://ccmuffmnevrt4" path="res://Resources/Items/Yin_Yang_Gun_Pickup.tres" id="110_p8a3e"]
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0njqu"]
|
||||
albedo_texture = ExtResource("3_bryct")
|
||||
|
|
@ -5596,8 +5598,17 @@ Billboard = true
|
|||
PixelSize = 0.05
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="Ammo6" type="Marker3D" parent="Props"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.172526, 1.3534348, 28.806143)
|
||||
script = ExtResource("76_bin7h")
|
||||
Item = ExtResource("108_ymka0")
|
||||
AutoSpawn = true
|
||||
Billboard = true
|
||||
PixelSize = 0.05
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="Weapon" type="Marker3D" parent="Props"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.340561, 1.3534348, 29.91616)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.424513, 1.3534348, 26.105299)
|
||||
script = ExtResource("76_bin7h")
|
||||
Item = ExtResource("108_r6j3v")
|
||||
AutoSpawn = true
|
||||
|
|
@ -5605,8 +5616,17 @@ Billboard = true
|
|||
PixelSize = 0.05
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="Weapon3" type="Marker3D" parent="Props"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.455607, 1.3534353, 29.358425)
|
||||
script = ExtResource("76_bin7h")
|
||||
Item = ExtResource("110_p8a3e")
|
||||
AutoSpawn = true
|
||||
Billboard = true
|
||||
PixelSize = 0.05
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="Weapon2" type="Marker3D" parent="Props"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.757989, 1.3534348, 28.568409)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.263203, 1.3534348, 27.20146)
|
||||
script = ExtResource("76_bin7h")
|
||||
Item = ExtResource("109_gbc0s")
|
||||
AutoSpawn = true
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=8 format=3 uid="uid://br01ww57uaky5"]
|
||||
[gd_scene load_steps=9 format=3 uid="uid://br01ww57uaky5"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://ccxnvbthsvka3" path="res://Scripts/Actors/Destructible3D.cs" id="1_hsg1w"]
|
||||
[ext_resource type="PackedScene" uid="uid://hxn4awevjyui" path="res://3D/BlockbenchModels/Box/Box_Blue.gltf" id="1_ropdl"]
|
||||
|
|
@ -6,6 +6,12 @@
|
|||
[ext_resource type="Script" uid="uid://ddsqqfx1usc3j" path="res://Scripts/Resources/DamageResistance.cs" id="3_kh78t"]
|
||||
[ext_resource type="Script" uid="uid://hkmutmmjqh1e" path="res://Scripts/Actors/3D/PropGravityModule3D.cs" id="5_0ktp8"]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_0ktp8"]
|
||||
script = ExtResource("3_kh78t")
|
||||
DamageType = 4
|
||||
Attribute = 2
|
||||
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_hsg1w"]
|
||||
size = Vector3(0.763428, 0.469452, 0.77832)
|
||||
|
||||
|
|
@ -21,8 +27,9 @@ axis_lock_angular_x = true
|
|||
axis_lock_angular_y = true
|
||||
axis_lock_angular_z = true
|
||||
script = ExtResource("1_hsg1w")
|
||||
Health = 8.0
|
||||
ExplosionData = ExtResource("2_cn5xh")
|
||||
DamageResistances = Array[ExtResource("3_kh78t")]([])
|
||||
DamageResistances = Array[ExtResource("3_kh78t")]([SubResource("Resource_0ktp8")])
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00549316, 0.0253752, -0.000488281)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=8 format=3 uid="uid://c8wwioforxms3"]
|
||||
[gd_scene load_steps=9 format=3 uid="uid://c8wwioforxms3"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://c5k6rsawax3gf" path="res://3D/BlockbenchModels/Box/Box_Green.gltf" id="1_03sp0"]
|
||||
[ext_resource type="Script" uid="uid://ccxnvbthsvka3" path="res://Scripts/Actors/Destructible3D.cs" id="1_e6kl3"]
|
||||
|
|
@ -6,6 +6,12 @@
|
|||
[ext_resource type="Script" uid="uid://ddsqqfx1usc3j" path="res://Scripts/Resources/DamageResistance.cs" id="3_fntiw"]
|
||||
[ext_resource type="Script" uid="uid://hkmutmmjqh1e" path="res://Scripts/Actors/3D/PropGravityModule3D.cs" id="5_jb4do"]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_fntiw"]
|
||||
script = ExtResource("3_fntiw")
|
||||
DamageType = 4
|
||||
Attribute = 2
|
||||
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_hsg1w"]
|
||||
size = Vector3(0.763428, 0.469452, 0.77832)
|
||||
|
||||
|
|
@ -16,8 +22,9 @@ size = Vector3(0.60668945, 0.09439087, 0.595726)
|
|||
collision_layer = 16
|
||||
collision_mask = 0
|
||||
script = ExtResource("1_e6kl3")
|
||||
Health = 8.0
|
||||
ExplosionData = ExtResource("2_bguu7")
|
||||
DamageResistances = Array[ExtResource("3_fntiw")]([])
|
||||
DamageResistances = Array[ExtResource("3_fntiw")]([SubResource("Resource_fntiw")])
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00549316, 0.0253752, -0.000488281)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=8 format=3 uid="uid://jffyxmft3nbw"]
|
||||
[gd_scene load_steps=9 format=3 uid="uid://jffyxmft3nbw"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://ninnis3a3jbn" path="res://3D/BlockbenchModels/Box/Box_Red.gltf" id="1_fi646"]
|
||||
[ext_resource type="Script" uid="uid://ccxnvbthsvka3" path="res://Scripts/Actors/Destructible3D.cs" id="1_kvqx7"]
|
||||
|
|
@ -6,6 +6,12 @@
|
|||
[ext_resource type="Script" uid="uid://ddsqqfx1usc3j" path="res://Scripts/Resources/DamageResistance.cs" id="3_7px86"]
|
||||
[ext_resource type="Script" uid="uid://hkmutmmjqh1e" path="res://Scripts/Actors/3D/PropGravityModule3D.cs" id="5_qq3cg"]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_7px86"]
|
||||
script = ExtResource("3_7px86")
|
||||
DamageType = 4
|
||||
Attribute = 2
|
||||
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_hsg1w"]
|
||||
size = Vector3(0.763428, 0.469452, 0.77832)
|
||||
|
||||
|
|
@ -16,8 +22,9 @@ size = Vector3(0.60668945, 0.09439087, 0.595726)
|
|||
collision_layer = 16
|
||||
collision_mask = 0
|
||||
script = ExtResource("1_kvqx7")
|
||||
Health = 8.0
|
||||
ExplosionData = ExtResource("2_jolck")
|
||||
DamageResistances = Array[ExtResource("3_7px86")]([])
|
||||
DamageResistances = Array[ExtResource("3_7px86")]([SubResource("Resource_7px86")])
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00549316, 0.0253752, -0.000488281)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=8 format=3 uid="uid://c6cdl3y3i3axl"]
|
||||
[gd_scene load_steps=9 format=3 uid="uid://c6cdl3y3i3axl"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://cpwolnoq46foq" path="res://3D/BlockbenchModels/Box/Box_Yellow.gltf" id="1_0rxnx"]
|
||||
[ext_resource type="Script" uid="uid://ccxnvbthsvka3" path="res://Scripts/Actors/Destructible3D.cs" id="1_l0sp5"]
|
||||
|
|
@ -6,6 +6,12 @@
|
|||
[ext_resource type="Script" uid="uid://ddsqqfx1usc3j" path="res://Scripts/Resources/DamageResistance.cs" id="3_6qeec"]
|
||||
[ext_resource type="Script" uid="uid://hkmutmmjqh1e" path="res://Scripts/Actors/3D/PropGravityModule3D.cs" id="5_njaax"]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_6qeec"]
|
||||
script = ExtResource("3_6qeec")
|
||||
DamageType = 4
|
||||
Attribute = 2
|
||||
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_hsg1w"]
|
||||
size = Vector3(0.763428, 0.469452, 0.77832)
|
||||
|
||||
|
|
@ -16,8 +22,9 @@ size = Vector3(0.60668945, 0.09439087, 0.595726)
|
|||
collision_layer = 16
|
||||
collision_mask = 0
|
||||
script = ExtResource("1_l0sp5")
|
||||
Health = 8.0
|
||||
ExplosionData = ExtResource("2_1if0l")
|
||||
DamageResistances = Array[ExtResource("3_6qeec")]([])
|
||||
DamageResistances = Array[ExtResource("3_6qeec")]([SubResource("Resource_6qeec")])
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00549316, 0.0253752, -0.000488281)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=8 format=3 uid="uid://d2kqcbr5rufxb"]
|
||||
[gd_scene load_steps=9 format=3 uid="uid://d2kqcbr5rufxb"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://etmm2bm8mj06" path="res://3D/BlockbenchModels/WoodenBox/Wooden_Box.gltf" id="1_2t24b"]
|
||||
[ext_resource type="Script" uid="uid://ccxnvbthsvka3" path="res://Scripts/Actors/Destructible3D.cs" id="1_nnmn3"]
|
||||
|
|
@ -6,6 +6,12 @@
|
|||
[ext_resource type="Script" uid="uid://ddsqqfx1usc3j" path="res://Scripts/Resources/DamageResistance.cs" id="3_cyk87"]
|
||||
[ext_resource type="Script" uid="uid://hkmutmmjqh1e" path="res://Scripts/Actors/3D/PropGravityModule3D.cs" id="5_81jt2"]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_cyk87"]
|
||||
script = ExtResource("3_cyk87")
|
||||
DamageType = 4
|
||||
Attribute = 2
|
||||
metadata/_custom_type_script = "uid://ddsqqfx1usc3j"
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_hsg1w"]
|
||||
size = Vector3(1, 0.498138, 0.543457)
|
||||
|
||||
|
|
@ -16,9 +22,9 @@ size = Vector3(0.60668945, 0.1053009, 0.49469566)
|
|||
collision_layer = 16
|
||||
collision_mask = 0
|
||||
script = ExtResource("1_nnmn3")
|
||||
Health = 4.0
|
||||
Health = 8.0
|
||||
ExplosionData = ExtResource("2_5j3e2")
|
||||
DamageResistances = Array[ExtResource("3_cyk87")]([])
|
||||
DamageResistances = Array[ExtResource("3_cyk87")]([SubResource("Resource_cyk87")])
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0022127, -0.0178223)
|
||||
|
|
|
|||
21
Resources/Bullets/3D/player_laser_3D.tres
Normal file
21
Resources/Bullets/3D/player_laser_3D.tres
Normal 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 = []
|
||||
31
Resources/Bullets/3D/yin_yang_bullet_3D.tres
Normal file
31
Resources/Bullets/3D/yin_yang_bullet_3D.tres
Normal 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")])
|
||||
|
|
@ -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")])
|
||||
|
|
|
|||
|
|
@ -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 = []
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
16
Resources/Weapons/Yin_Yang_Gun_3D.tres
Normal file
16
Resources/Weapons/Yin_Yang_Gun_3D.tres
Normal 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"
|
||||
|
|
@ -159,11 +159,10 @@ public partial class Weapon3D : Node3D
|
|||
if (GameController.Instance.Player.Storage.Shield.CurrentResource >= WeaponData.AmmoPerShot)
|
||||
{
|
||||
GameController.Instance.Player.Storage.Shield.CurrentResource -= WeaponData.AmmoPerShot;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
EmitSignalEmpty();
|
||||
}
|
||||
|
||||
EmitSignalEmpty();
|
||||
_cooldownTimer.Start(WeaponData?.RateOfFire ?? 0);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -255,7 +254,7 @@ public partial class Weapon3D : Node3D
|
|||
//
|
||||
// }
|
||||
|
||||
if (_ammoType is WeaponAmmoType.Ammo && WeaponData.AutoReload)
|
||||
if (_ammoType is WeaponAmmoType.Ammo && WeaponData.AutoReload && LoadedAmmo < WeaponData.AmmoPerShot)
|
||||
{
|
||||
Reload();
|
||||
}
|
||||
|
|
|
|||
BIN
Sprites/Bullets/player_laser_bullet.aseprite
(Stored with Git LFS)
BIN
Sprites/Bullets/player_laser_bullet.aseprite
(Stored with Git LFS)
Binary file not shown.
BIN
Sprites/Bullets/player_laser_bullet.png
(Stored with Git LFS)
BIN
Sprites/Bullets/player_laser_bullet.png
(Stored with Git LFS)
Binary file not shown.
|
|
@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/player_laser_bullet.png-8d682ab2556c88d479f00
|
|||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
|
|
@ -25,6 +27,10 @@ mipmaps/generate=false
|
|||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
|
|
|
|||
|
|
@ -3,22 +3,23 @@
|
|||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://b61po207ggn63"
|
||||
path.s3tc="res://.godot/imported/Yin_Ammo.png-a006a21b0965b3c91c2670f3e4ece755.s3tc.ctex"
|
||||
path="res://.godot/imported/Yin_Ammo.png-a006a21b0965b3c91c2670f3e4ece755.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc_bptc"],
|
||||
"vram_texture": true
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://Sprites/Items/Yin_Ammo.png"
|
||||
dest_files=["res://.godot/imported/Yin_Ammo.png-a006a21b0965b3c91c2670f3e4ece755.s3tc.ctex"]
|
||||
dest_files=["res://.godot/imported/Yin_Ammo.png-a006a21b0965b3c91c2670f3e4ece755.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=2
|
||||
compress/mode=3
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
|
|
@ -26,6 +27,10 @@ mipmaps/generate=true
|
|||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
|
|
|
|||
|
|
@ -15,20 +15,26 @@ dest_files=["res://.godot/imported/YingYangOrb.png-01d9bcdc51df8c9073515f91d9aea
|
|||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/mode=3
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
detect_3d/compress_to=0
|
||||
|
|
|
|||
|
|
@ -15,20 +15,26 @@ dest_files=["res://.godot/imported/Ying_Yang_Gun.png-d9d5fde2dcfe741e21c3da70ba6
|
|||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/mode=3
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/generate=true
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
detect_3d/compress_to=0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue