diff --git a/3D/MapScenes/TestLevel.tscn b/3D/MapScenes/TestLevel.tscn index fc61be03..875de352 100644 --- a/3D/MapScenes/TestLevel.tscn +++ b/3D/MapScenes/TestLevel.tscn @@ -66,7 +66,6 @@ [ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="53_0tkve"] [ext_resource type="PackedScene" uid="uid://cf3kjg36q3wvd" path="res://3D/Scenes/Props/Terminal_Big_3D.tscn" id="53_anja4"] [ext_resource type="PackedScene" uid="uid://bkwuuk6ctadu0" path="res://3D/Scenes/Props/Capacitor_Mini_3D.tscn" id="53_xly81"] -[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="54_0tkve"] [ext_resource type="PackedScene" uid="uid://cpx5yjfg3a2hw" path="res://3D/Scenes/Props/Alarm_Box_3D.tscn" id="54_anja4"] [ext_resource type="PackedScene" uid="uid://c0262d4ffxx1w" path="res://3D/Scenes/Props/Door_Path_3D.tscn" id="57_orfn6"] [ext_resource type="PackedScene" uid="uid://c0fu2ul3gg8fl" path="res://3D/BlockbenchModels/Tank/Tank_3D_Huge.tscn" id="57_r8ono"] @@ -84,11 +83,12 @@ [ext_resource type="PackedScene" uid="uid://dyi4ji0t3ryi4" path="res://3D/Scenes/Props/chest_3d.tscn" id="70_005j7"] [ext_resource type="Resource" uid="uid://dy53gia1tmkah" path="res://Resources/Items/Points_Pickup.tres" id="72_51d8c"] [ext_resource type="Script" uid="uid://cpwn25m6b4lqf" path="res://Scripts/Activables/ScriptableArea3D.cs" id="73_51d8c"] -[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="73_kob5s"] [ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="75_hd6lw"] [ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="77_awrmj"] [ext_resource type="Resource" uid="uid://bdpbekqhuuq4l" path="res://Resources/Items/Shield_Extend_Pickup.tres" id="77_mf5at"] [ext_resource type="PackedScene" uid="uid://dioiq4nb7kiet" path="res://3D/Scenes/Props/ForceField_3D.tscn" id="83_51d8c"] +[ext_resource type="Resource" uid="uid://dau0s8ob7qnpc" path="res://Resources/Items/IceShotgun.tres" id="88_kob5s"] +[ext_resource type="Resource" uid="uid://bgcgeg187vg1h" path="res://Resources/Items/IcicleRepeater.tres" id="89_awrmj"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ar5cd"] albedo_texture = ExtResource("25_btjo4") @@ -3145,11 +3145,11 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -4.480 [node name="Chest" parent="Props" instance=ExtResource("70_005j7")] transform = Transform3D(1.31134e-07, 0, -1, 0, 1, 0, 1, 0, 1.31134e-07, 23.5714, 1.53711, 11.4827) -LootTable = Array[ExtResource("73_kob5s")]([ExtResource("72_51d8c")]) +LootTable = [ExtResource("72_51d8c")] [node name="Chest2" parent="Props" instance=ExtResource("70_005j7")] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 26.9381, 1.53711, 8.33437) -LootTable = Array[ExtResource("73_kob5s")]([ExtResource("72_51d8c")]) +LootTable = [ExtResource("72_51d8c")] [node name="Forcefield" parent="Props" instance=ExtResource("83_51d8c")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 44.9953, 2.00411, 21.5165) @@ -3290,9 +3290,18 @@ PixelSize = 0.05 metadata/_edit_group_ = true [node name="Gun" type="Marker3D" parent="Items"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 31.7462, 1.752, 11.084) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.9371, 1.752, 11.2371) script = ExtResource("52_0eudi") -Item = ExtResource("54_0tkve") +Item = ExtResource("88_kob5s") +AutoSpawn = true +Billboard = true +PixelSize = 0.05 +metadata/_edit_group_ = true + +[node name="Gun2" type="Marker3D" parent="Items"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.6522, 1.752, 11.1287) +script = ExtResource("52_0eudi") +Item = ExtResource("89_awrmj") AutoSpawn = true Billboard = true PixelSize = 0.05 diff --git a/Resources/Items/IceShotgun.tres b/Resources/Items/IceShotgun.tres index edad4f4b..e3a0bb86 100644 --- a/Resources/Items/IceShotgun.tres +++ b/Resources/Items/IceShotgun.tres @@ -1,8 +1,9 @@ -[gd_resource type="Resource" script_class="LootItem" load_steps=4 format=3 uid="uid://dau0s8ob7qnpc"] +[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://dau0s8ob7qnpc"] [ext_resource type="Resource" uid="uid://cyntngidhcbkc" path="res://Resources/Weapons/Ice_Shotgun_Weapon.tres" id="2_3le6e"] [ext_resource type="Texture2D" uid="uid://b46usr10jhmev" path="res://Sprites/Items/Ice_Shotgun.png" id="2_4ibag"] [ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_cjfxs"] +[ext_resource type="Resource" uid="uid://bsdi1iudx5431" path="res://Resources/Weapons/Ice_Shotgun_T0_3D.tres" id="3_k86gl"] [resource] script = ExtResource("3_cjfxs") @@ -14,6 +15,7 @@ Item = 9 Tier = 0 Price = 0 WeaponData = ExtResource("2_3le6e") +WeaponData3D = ExtResource("3_k86gl") Amount = 1 Max = 1 PickupIfMaxed = false diff --git a/Resources/Items/IcicleRepeater.tres b/Resources/Items/IcicleRepeater.tres index dd69e008..4aa9e423 100644 --- a/Resources/Items/IcicleRepeater.tres +++ b/Resources/Items/IcicleRepeater.tres @@ -1,7 +1,8 @@ -[gd_resource type="Resource" script_class="LootItem" load_steps=4 format=3 uid="uid://bgcgeg187vg1h"] +[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://bgcgeg187vg1h"] [ext_resource type="Texture2D" uid="uid://bxe747rnr5xt7" path="res://Sprites/Items/Ice_Repeater.png" id="2_3abss"] [ext_resource type="Resource" uid="uid://ccyl111fa1j2k" path="res://Resources/Weapons/IcicleRepeater_t0.tres" id="2_d42pt"] +[ext_resource type="Resource" uid="uid://dhi6ml0xhkka5" path="res://Resources/Weapons/IcicleRepeater_T0_3D.tres" id="3_3abss"] [ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="4_k6in2"] [resource] @@ -14,6 +15,7 @@ Item = 9 Tier = 0 Price = 0 WeaponData = ExtResource("2_d42pt") +WeaponData3D = ExtResource("3_3abss") Amount = 1 Max = 1 PickupIfMaxed = false diff --git a/Resources/Weapons/Ice_Shotgun_T0_3D.tres b/Resources/Weapons/Ice_Shotgun_T0_3D.tres new file mode 100644 index 00000000..6f17c5e6 --- /dev/null +++ b/Resources/Weapons/Ice_Shotgun_T0_3D.tres @@ -0,0 +1,26 @@ +[gd_resource type="Resource" script_class="WeaponResource" load_steps=5 format=3 uid="uid://bsdi1iudx5431"] + +[ext_resource type="Resource" uid="uid://csmq6hngkx41e" path="res://Resources/Bullets/icicle_gun_bullets_3D.tres" id="1_ublmp"] +[ext_resource type="AudioStream" uid="uid://jsv3yjluv1au" path="res://SFX/Weapons/Reload_01.wav" id="2_vgotw"] +[ext_resource type="AudioStream" uid="uid://oyjbk3qjp5cr" path="res://SFX/Chiptone_Source/Shotgun.wav" id="3_uxcop"] +[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="4_u3gqe"] + +[resource] +script = ExtResource("4_u3gqe") +Name = &"Ice Shotgun" +BulletData = ExtResource("1_ublmp") +Priority = 30 +AmmoPerShot = 1 +RateOfFire = 0.5 +BulletCapacity = 4 +ReloadTime = 0.8 +AutoReload = true +InfiniteAmmo = false +ItemKey = &"ICE_SHOTGUN" +AmmoKey = &"ICE_AMMO" +BulletsPerShot = 3 +SpreadAngle = 8.0 +RandomSpread = 15.0 +_rotationOffset = 0.0 +ReloadSound = ExtResource("2_vgotw") +ShootSound = ExtResource("3_uxcop") diff --git a/Resources/Weapons/IcicleRepeater_T0_3D.tres b/Resources/Weapons/IcicleRepeater_T0_3D.tres new file mode 100644 index 00000000..112f2b24 --- /dev/null +++ b/Resources/Weapons/IcicleRepeater_T0_3D.tres @@ -0,0 +1,26 @@ +[gd_resource type="Resource" script_class="WeaponResource" load_steps=5 format=3 uid="uid://dhi6ml0xhkka5"] + +[ext_resource type="Resource" uid="uid://csmq6hngkx41e" path="res://Resources/Bullets/icicle_gun_bullets_3D.tres" id="1_nxdsa"] +[ext_resource type="AudioStream" uid="uid://jsv3yjluv1au" path="res://SFX/Weapons/Reload_01.wav" id="2_grfjv"] +[ext_resource type="AudioStream" uid="uid://cjg8r7bthkfsy" path="res://SFX/Laser_shoot 11.wav" id="3_agxp1"] +[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="4_hppsh"] + +[resource] +script = ExtResource("4_hppsh") +Name = &"Icicle Repeater" +BulletData = ExtResource("1_nxdsa") +Priority = 10 +AmmoPerShot = 1 +RateOfFire = 0.05 +BulletCapacity = 6 +ReloadTime = 0.5 +AutoReload = true +InfiniteAmmo = false +ItemKey = &"ICICLE_REPEATER_T0" +AmmoKey = &"ICE_AMMO" +BulletsPerShot = 1 +SpreadAngle = 0.0 +RandomSpread = 0.0 +_rotationOffset = 0.0 +ReloadSound = ExtResource("2_grfjv") +ShootSound = ExtResource("3_agxp1") diff --git a/Sprites/Items/Ice_Repeater.png.import b/Sprites/Items/Ice_Repeater.png.import index f901f1ca..c8a40641 100644 --- a/Sprites/Items/Ice_Repeater.png.import +++ b/Sprites/Items/Ice_Repeater.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bxe747rnr5xt7" -path="res://.godot/imported/Ice_Repeater.png-a519c7bbe2fe7768f9927989ff738985.ctex" +path.s3tc="res://.godot/imported/Ice_Repeater.png-a519c7bbe2fe7768f9927989ff738985.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Sprites/Items/Ice_Repeater.png" -dest_files=["res://.godot/imported/Ice_Repeater.png-a519c7bbe2fe7768f9927989ff738985.ctex"] +dest_files=["res://.godot/imported/Ice_Repeater.png-a519c7bbe2fe7768f9927989ff738985.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +32,4 @@ 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 diff --git a/Sprites/Items/Ice_Shotgun.png.import b/Sprites/Items/Ice_Shotgun.png.import index 24b96478..ec9b0060 100644 --- a/Sprites/Items/Ice_Shotgun.png.import +++ b/Sprites/Items/Ice_Shotgun.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://b46usr10jhmev" -path="res://.godot/imported/Ice_Shotgun.png-dd1ea79451cc6e92cbb8950dee9ae79d.ctex" +path.s3tc="res://.godot/imported/Ice_Shotgun.png-dd1ea79451cc6e92cbb8950dee9ae79d.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Sprites/Items/Ice_Shotgun.png" -dest_files=["res://.godot/imported/Ice_Shotgun.png-dd1ea79451cc6e92cbb8950dee9ae79d.ctex"] +dest_files=["res://.godot/imported/Ice_Shotgun.png-dd1ea79451cc6e92cbb8950dee9ae79d.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 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="" @@ -31,4 +32,4 @@ 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