maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-07-03 11:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added weapons and fixed others

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

26
3D/MapScenes/TestLevel2.tscn
View file

@ -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

11
3D/Scenes/Props/Box_3D_Blue.tscn
View file

@ -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)

11
3D/Scenes/Props/Box_3D_Green.tscn
View file

@ -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)

11
3D/Scenes/Props/Box_3D_Red.tscn
View file

@ -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)

11
3D/Scenes/Props/Box_3D_Yellow.tscn
View file

@ -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)

12
3D/Scenes/Props/Wooden_Box.tscn
View file

@ -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)