Shooting and big tank fix

This commit is contained in:
Marco 2025-06-20 15:39:19 +02:00
commit 0a6e89faed
26 changed files with 797 additions and 9 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,37 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://sy821kigcoqx"
path="res://.godot/imported/Floor_Emitter.gltf-1cce213213ebe4efb5932c1347f0601f.scn"
[deps]
source_file="res://3D/BlockbenchModels/FloorEmitter/Floor_Emitter.gltf"
dest_files=["res://.godot/imported/Floor_Emitter.gltf-1cce213213ebe4efb5932c1347f0601f.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1

BIN
3D/BlockbenchModels/FloorEmitter/Floor_Emitter_0.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,37 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://1cuticategid"
path="res://.godot/imported/Floor_Emitter_0.png-80f8ab069919460163571a408c1b25cc.ctex"
metadata={
"vram_texture": false
}
generator_parameters={
"md5": "03044050c81c04b0e47e67d76e9b6c81"
}
[deps]
source_file="res://3D/BlockbenchModels/FloorEmitter/Floor_Emitter_0.png"
dest_files=["res://.godot/imported/Floor_Emitter_0.png-80f8ab069919460163571a408c1b25cc.ctex"]
[params]
compress/mode=3
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
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=0

BIN
3D/BlockbenchModels/FloorEmitter/Floor_Emitter_Texture.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://vak6buokgaem"
path="res://.godot/imported/Floor_Emitter_Texture.png-65ae20c317b4847f0ac11fbf70da0349.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://3D/BlockbenchModels/FloorEmitter/Floor_Emitter_Texture.png"
dest_files=["res://.godot/imported/Floor_Emitter_Texture.png-65ae20c317b4847f0ac11fbf70da0349.ctex"]
[params]
compress/mode=3
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
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=0

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=270 format=4 uid="uid://c8gtrjf2xeue7"]
[gd_scene load_steps=272 format=4 uid="uid://c8gtrjf2xeue7"]
[ext_resource type="Script" uid="uid://kno58homctew" path="res://addons/func_godot/src/map/func_godot_map.gd" id="1_n6h0p"]
[ext_resource type="Script" uid="uid://crpgy1o73rtlx" path="res://Scripts/Utils/MapProxy3D.cs" id="1_pvlbf"]
@ -64,6 +64,8 @@
[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"]
[ext_resource type="PackedScene" uid="uid://dx4denbc7xkfm" path="res://3D/Scenes/Props/Posters/Poster_Warning.tscn" id="63_booe2"]
[ext_resource type="PackedScene" uid="uid://d4ek8xjuh6y11" path="res://3D/Scenes/Props/Floor_Emitter_3D.tscn" id="63_r8ono"]
[ext_resource type="Resource" uid="uid://bbogxl60hvdp1" path="res://Resources/BulletScripts/Emitter_Sprial_Test_Bullets.tres" id="64_fi82p"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_aq78g"]
albedo_texture = ExtResource("25_btjo4")
@ -2199,6 +2201,10 @@ metadata/_edit_group_ = true
[node name="Door" parent="Props" instance=ExtResource("57_orfn6")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 7.38277, 2, 25.0228)
[node name="FloorEmitter" parent="Props" instance=ExtResource("63_r8ono")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.9526, 1.32944, 25.5859)
Script = ExtResource("64_fi82p")
[node name="Light" type="Node3D" parent="."]
[node name="OmniLight3D4" type="OmniLight3D" parent="Light"]

View file

@ -1517,6 +1517,106 @@
( 196 372 20 ) ( 197 372 20 ) ( 196 372 21 ) Floors/Floor26 [ 1 0 0 0 ] [ 0 0 -1 0 ] 270 1 1
( 196 372 20 ) ( 196 372 21 ) ( 196 373 20 ) Floors/Floor26 [ 0 1 0 -4 ] [ 0 0 -1 0 ] 90 1 1
}
// brush 168
{
( 244 624 20 ) ( 244 596 20 ) ( 244 624 16 ) __TB_empty [ 0 1 0 -8 ] [ 0 0 -1 -4 ] 90 1 1
( 252 596 16 ) ( 244 596 16 ) ( 252 596 20 ) __TB_empty [ 1 0 0 28 ] [ 0 0 -1 0 ] 180 1 1
( 252 624 16 ) ( 244 624 16 ) ( 252 596 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 252 596 20 ) ( 244 596 20 ) ( 252 624 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 252 624 20 ) ( 244 624 20 ) ( 252 624 16 ) __TB_empty [ -1 0 0 -28 ] [ 0 0 -1 0 ] 90 1 1
( 252 596 20 ) ( 252 624 20 ) ( 252 596 16 ) __TB_empty [ 0 1 0 0 ] [ 0 0 -1 0 ] 180 1 1
}
// brush 169
{
( 224 596 16 ) ( 224 624 16 ) ( 224 596 20 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 -1 0 ] 90 1 1
( 224 596 20 ) ( 232 596 20 ) ( 224 596 16 ) __TB_empty [ 1 0 0 28 ] [ 0 0 -1 0 ] 180 1 1
( 224 596 16 ) ( 232 596 16 ) ( 224 624 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 224 624 20 ) ( 232 624 20 ) ( 224 596 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 224 624 16 ) ( 232 624 16 ) ( 224 624 20 ) __TB_empty [ -1 0 0 -28 ] [ 0 0 -1 0 ] 90 1 1
( 232 596 16 ) ( 232 596 20 ) ( 232 624 16 ) __TB_empty [ 0 -1 0 8 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 170
{
( 244 611.6076951545867 20 ) ( 244 611.6076951545867 16 ) ( 236.84529946162075 624 20 ) __TB_empty [ -0.4999999999999999 0.8660254037844387 0 -6.928192 ] [ 0 0 -1 -4 ] 90 1 1
( 244 624 16 ) ( 236.84529946162075 624 16 ) ( 244 611.6076951545867 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 244 624 20 ) ( 244 611.6076951545867 20 ) ( 236.84529946162075 624 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 244 624 20 ) ( 236.84529946162075 624 20 ) ( 244 624 16 ) __TB_empty [ -1 0 0 -28 ] [ 0 0 -1 0 ] 90 1 1
( 244 624 16 ) ( 244 611.6076951545867 16 ) ( 244 624 20 ) __TB_empty [ 0 1 0 -8 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 171
{
( 232 596 16 ) ( 232 608.3923048454133 16 ) ( 232 596 20 ) __TB_empty [ 0 -1 0 8 ] [ 0 0 -1 -4 ] 90 1 1
( 232 596 20 ) ( 239.15470053837925 596 20 ) ( 232 596 16 ) __TB_empty [ 1 0 0 28 ] [ 0 0 -1 0 ] 180 1 1
( 232 596 16 ) ( 239.15470053837925 596 16 ) ( 232 608.3923048454133 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 232 596 20 ) ( 232 608.3923048454133 20 ) ( 239.15470053837925 596 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 232 608.3923048454133 16 ) ( 239.15470053837925 596 16 ) ( 232 608.3923048454133 20 ) __TB_empty [ 0.4999999999999999 -0.8660254037844387 0 6.928192 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 172
{
( 232 624 20 ) ( 232 611.6076951545867 20 ) ( 232 624 16 ) __TB_empty [ 0 -1 0 8 ] [ 0 0 -1 -4 ] 90 1 1
( 232 624 16 ) ( 232 611.6076951545867 16 ) ( 236.84529946162075 624 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 236.84529946162075 624 20 ) ( 238 622 20 ) ( 232 624 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 232 624 16 ) ( 236.84529946162075 624 16 ) ( 232 624 20 ) __TB_empty [ -1 0 0 -28 ] [ 0 0 -1 0 ] 90 1 1
( 238 622 20 ) ( 238 622 16 ) ( 232 611.6076951545867 20 ) __TB_empty [ -0.4999999999999999 -0.8660254037844387 0 6.9282227 ] [ 0 0 -1 -4 ] 90 1 1
( 236.84529946162075 624 16 ) ( 238 622 16 ) ( 236.84529946162075 624 20 ) __TB_empty [ -0.4999999999999999 0.8660254037844387 0 -6.928192 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 173
{
( 239.15470053837925 596 16 ) ( 238 598 16 ) ( 239.15470053837925 596 20 ) __TB_empty [ 0.4999999999999999 -0.8660254037844387 0 6.928192 ] [ 0 0 -1 -4 ] 90 1 1
( 244 608.3923048454133 16 ) ( 244 608.3923048454133 20 ) ( 238 598 16 ) __TB_empty [ 0.4999999999999999 0.8660254037844387 0 -6.9282227 ] [ 0 0 -1 -4 ] 90 1 1
( 244 596 16 ) ( 239.15470053837925 596 16 ) ( 244 596 20 ) __TB_empty [ 1 0 0 28 ] [ 0 0 -1 0 ] 180 1 1
( 244 596 16 ) ( 244 608.3923048454133 16 ) ( 239.15470053837925 596 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 239.15470053837925 596 20 ) ( 238 598 20 ) ( 244 596 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 244 596 20 ) ( 244 608.3923048454133 20 ) ( 244 596 16 ) __TB_empty [ 0 1 0 -8 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 174
{
( 238 622 20 ) ( 234.53589838486224 616 20 ) ( 238 622 16 ) __TB_empty [ -0.4999999999999999 -0.8660254037844387 0 0.92822266 ] [ 0 0 -1 0 ] 90 1 1
( 234.53589838486224 616 16 ) ( 234.53589838486224 616 20 ) ( 241.46410161513776 616 16 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 -4 ] 90 1 1
( 238 622 16 ) ( 234.53589838486224 616 16 ) ( 241.46410161513776 616 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 238 622 20 ) ( 241.46410161513776 616 20 ) ( 234.53589838486224 616 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 238 622 16 ) ( 241.46410161513776 616 16 ) ( 238 622 20 ) __TB_empty [ -0.4999999999999999 0.8660254037844387 0 -6.928192 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 175
{
( 238 598 16 ) ( 234.53589838486224 604 16 ) ( 238 598 20 ) __TB_empty [ 0.4999999999999999 -0.8660254037844387 0 6.928192 ] [ 0 0 -1 -4 ] 90 1 1
( 238 598 16 ) ( 241.46410161513776 604 16 ) ( 234.53589838486224 604 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 238 598 20 ) ( 234.53589838486224 604 20 ) ( 241.46410161513776 604 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 241.46410161513776 604 16 ) ( 241.46410161513776 604 20 ) ( 234.53589838486224 604 16 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 -4 ] 90 1 1
( 238 598 20 ) ( 241.46410161513776 604 20 ) ( 238 598 16 ) __TB_empty [ 0.4999999999999999 0.8660254037844387 0 -6.9282227 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 176
{
( 239.60769515458685 616 20 ) ( 242.39230484541324 614.3923048454133 20 ) ( 239.60769515458685 616 16 ) __TB_empty [ -0.8660254037844387 0.4999999999999999 0 -4 ] [ 0 0 -1 -4 ] 90 1 1
( 241.46410161513776 616 16 ) ( 239.60769515458685 616 16 ) ( 242.39230484541324 614.3923048454133 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 241.46410161513776 616 20 ) ( 242.39230484541324 614.3923048454133 20 ) ( 239.60769515458685 616 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 241.46410161513776 616 20 ) ( 239.60769515458685 616 20 ) ( 241.46410161513776 616 16 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 -4 ] 90 1 1
( 241.46410161513776 616 16 ) ( 242.39230484541324 614.3923048454133 16 ) ( 241.46410161513776 616 20 ) __TB_empty [ -0.4999999999999999 0.8660254037844387 0 -6.928192 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 177
{
( 234.53589838486224 604 16 ) ( 233.60769515458668 605.6076951545868 16 ) ( 234.53589838486224 604 20 ) __TB_empty [ 0.4999999999999999 -0.8660254037844387 0 6.928192 ] [ 0 0 -1 -4 ] 90 1 1
( 234.53589838486224 604 20 ) ( 236.39230484541338 604 20 ) ( 234.53589838486224 604 16 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 -4 ] 90 1 1
( 234.53589838486224 604 16 ) ( 236.39230484541338 604 16 ) ( 233.60769515458668 605.6076951545868 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 234.53589838486224 604 20 ) ( 233.60769515458668 605.6076951545868 20 ) ( 236.39230484541338 604 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 236.39230484541338 604 20 ) ( 233.60769515458668 605.6076951545868 20 ) ( 236.39230484541338 604 16 ) __TB_empty [ 0.8660254037844387 -0.4999999999999999 0 4 ] [ 0 0 -1 -4 ] 90 1 1
}
// brush 178
{
( 242.39230484541324 605.6076951545867 16 ) ( 242.39230484541324 605.6076951545867 20 ) ( 239.60769515458682 604 16 ) __TB_empty [ 0.8660254037844387 0.4999999999999999 0 -4 ] [ 0 0 -1 -4 ] 90 1 1
( 241.46410161513776 604 16 ) ( 239.60769515458682 604 16 ) ( 241.46410161513776 604 20 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 -4 ] 90 1 1
( 241.46410161513776 604 16 ) ( 242.39230484541324 605.6076951545867 16 ) ( 239.60769515458682 604 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 241.46410161513776 604 20 ) ( 239.60769515458682 604 20 ) ( 242.39230484541324 605.6076951545867 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 241.46410161513776 604 20 ) ( 242.39230484541324 605.6076951545867 20 ) ( 241.46410161513776 604 16 ) __TB_empty [ 0.4999999999999999 0.8660254037844387 0 -0.92822266 ] [ 0 0 -1 0 ] 90 1 1
}
// brush 179
{
( 234.53589838486224 616 20 ) ( 233.6076951545867 614.3923048454133 20 ) ( 234.53589838486224 616 16 ) __TB_empty [ -0.4999999999999999 -0.8660254037844387 0 0.92822266 ] [ 0 0 -1 0 ] 90 1 1
( 234.53589838486224 616 16 ) ( 233.6076951545867 614.3923048454133 16 ) ( 236.39230484541332 616 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 234.53589838486224 616 20 ) ( 236.39230484541332 616 20 ) ( 233.6076951545867 614.3923048454133 20 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 8 ] 90 1 1
( 234.53589838486224 616 16 ) ( 236.39230484541332 616 16 ) ( 234.53589838486224 616 20 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 -4 ] 90 1 1
( 236.39230484541332 616 20 ) ( 236.39230484541332 616 16 ) ( 233.6076951545867 614.3923048454133 20 ) __TB_empty [ -0.8660254037844387 -0.4999999999999999 0 4 ] [ 0 0 -1 -4 ] 90 1 1
}
}
// entity 1
{
@ -2231,6 +2331,7 @@
"classname" "actor_box_red"
"origin" "376 488 28"
"targetname" "actor_elevator_test"
"angle" "45"
}
// entity 69
{
@ -2753,6 +2854,6 @@
// entity 148
{
"classname" "actor_tank_large"
"origin" "432 464 32"
"angle" "90"
"origin" "429.93 463.728 32"
"angles" "0 90 0"
}

View file

@ -0,0 +1,23 @@
[gd_scene load_steps=5 format=3 uid="uid://d4ek8xjuh6y11"]
[ext_resource type="Script" uid="uid://dpibtd73awwp7" path="res://Scripts/Actors/ScriptableBulletsEmitter3D.cs" id="1_dtfaj"]
[ext_resource type="PackedScene" uid="uid://sy821kigcoqx" path="res://3D/BlockbenchModels/FloorEmitter/Floor_Emitter.gltf" id="3_ro7iq"]
[ext_resource type="Script" uid="uid://bf5f2phitdqw8" path="res://Scripts/Actors/BulletSpawner3D.cs" id="4_0cjnq"]
[sub_resource type="BoxShape3D" id="BoxShape3D_hsg1w"]
size = Vector3(0.763428, 0.469452, 0.77832)
[node name="FloorEmitter" type="StaticBody3D"]
collision_layer = 16
collision_mask = 0
script = ExtResource("1_dtfaj")
EmitOnStart = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00549316, 0.0253752, -0.000488281)
shape = SubResource("BoxShape3D_hsg1w")
[node name="blockbench_export" parent="." instance=ExtResource("3_ro7iq")]
[node name="BulletSpawner3D" type="Node3D" parent="."]
script = ExtResource("4_0cjnq")