Mapping fixes and new tanks

This commit is contained in:
Marco 2025-08-25 15:03:10 +02:00
commit 3df9e2dd85
46 changed files with 1701 additions and 1281 deletions

View file

@ -0,0 +1,14 @@
[gd_scene load_steps=3 format=3 uid="uid://byyrqmraqy0ns"]
[ext_resource type="PackedScene" uid="uid://q4pr60yjt0ld" path="res://3D/BlockbenchModels/Tank/Tank_Mini.gltf" id="1_g3gx6"]
[sub_resource type="BoxShape3D" id="BoxShape3D_5dodm"]
size = Vector3(0.7694095, 0.89630145, 0.77337646)
[node name="Tank3dStandalone" type="StaticBody3D"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0004274398, 0.0014950633, 0.00088500977)
shape = SubResource("BoxShape3D_5dodm")
[node name="blockbench_export" parent="." instance=ExtResource("1_g3gx6")]

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -3199,7 +3199,7 @@
// entity 215
{
"classname" "actor_barrel_1"
"origin" "224 -512 64"
"origin" "288 -512 64"
}
// entity 216
{
@ -3744,6 +3744,69 @@
}
// entity 310
{
"classname" "actor_box_blue"
"origin" "216 -584 60"
}
// entity 311
{
"classname" "actor_box_blue"
"origin" "216 -584 68"
}
// entity 312
{
"classname" "actor_box_red"
"origin" "216 -568 60"
}
// entity 313
{
"classname" "actor_box_red"
"origin" "232 -576 60"
}
// entity 314
{
"classname" "actor_barrel_1"
"origin" "232 -560 64"
}
// entity 315
{
"classname" "actor_emitter_wall"
"origin" "228 -516 60"
"angles" "0 -90 0"
"script_path" "res://Resources/BulletScripts/Emitter_Blue_Narrow_Cone.tres"
}
// entity 316
{
"classname" "actor_tank"
"origin" "424 -688 64"
"angles" "0 90 0"
}
// entity 317
{
"classname" "actor_tank_standalone"
"origin" "384 -608 64"
}
// entity 318
{
"classname" "actor_tank_standalone"
"origin" "352 -104 24"
}
// entity 319
{
"classname" "actor_tank_standalone"
"origin" "384 -624 64"
}
// entity 320
{
"classname" "actor_tank_standalone"
"origin" "-280 0 -16"
}
// entity 321
{
"classname" "actor_tank_standalone"
"origin" "-296 0 -16"
}
// entity 322
{
"classname" "func_group"
"_tb_type" "_tb_layer"
"_tb_name" "Solid"
@ -6306,282 +6369,282 @@
( 272 24 48 ) ( 272 23 48 ) ( 272 24 49 ) special/clip [ -5.053215498074303e-16 -1 0 -8 ] [ 0 0 1 0 ] 270 1 -1
}
}
// entity 311
// entity 323
{
"classname" "actor_box_wood"
"origin" "172 -96 20"
"_tb_layer" "3"
}
// entity 312
// entity 324
{
"classname" "actor_box_blue"
"origin" "-80 -96 28"
"_tb_layer" "3"
}
// entity 313
// entity 325
{
"classname" "actor_box_red"
"origin" "-80 -88 20"
"_tb_layer" "3"
}
// entity 314
// entity 326
{
"classname" "actor_terminal"
"origin" "-60 -152 28"
"angle" "90"
"_tb_layer" "3"
}
// entity 315
// entity 327
{
"classname" "actor_ac_unit"
"origin" "-32 -156 24"
"angle" "270"
"_tb_layer" "3"
}
// entity 316
// entity 328
{
"classname" "actor_table"
"origin" "-56 -152 20"
"angle" "90"
"_tb_layer" "3"
}
// entity 317
// entity 329
{
"classname" "actor_box_wood"
"origin" "-72 -116 20"
"angles" "0 -30 0"
"_tb_layer" "3"
}
// entity 318
// entity 330
{
"classname" "actor_table"
"origin" "-8 -92 20"
"_tb_layer" "3"
}
// entity 319
// entity 331
{
"classname" "actor_box_wood"
"origin" "-84 -152 20"
"_tb_layer" "3"
}
// entity 320
// entity 332
{
"classname" "actor_box_wood"
"origin" "-76 -152 20"
"_tb_layer" "3"
}
// entity 321
// entity 333
{
"classname" "actor_box_wood"
"origin" "-80 -104 20"
"_tb_layer" "3"
}
// entity 322
// entity 334
{
"classname" "actor_tank"
"origin" "168 -544 64"
"_tb_layer" "3"
}
// entity 323
// entity 335
{
"classname" "actor_tank"
"origin" "168 -576 64"
"_tb_layer" "3"
}
// entity 324
// entity 336
{
"classname" "actor_box_wood"
"origin" "160 -600 60"
"_tb_layer" "3"
}
// entity 325
// entity 337
{
"classname" "actor_box_wood"
"origin" "160 -616 60"
"_tb_layer" "3"
}
// entity 326
// entity 338
{
"classname" "actor_box_red"
"origin" "164 -632 60"
"_tb_layer" "3"
}
// entity 327
// entity 339
{
"classname" "actor_box_blue"
"origin" "164 -632 68"
"_tb_layer" "3"
}
// entity 328
// entity 340
{
"classname" "actor_box_wood"
"origin" "276 -192 20"
"_tb_layer" "3"
}
// entity 329
// entity 341
{
"classname" "actor_elevator_1"
"origin" "216 -376 15"
"_tb_layer" "3"
}
// entity 330
// entity 342
{
"classname" "actor_tube_straight"
"origin" "-80 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 331
// entity 343
{
"classname" "actor_tube_straight"
"origin" "-64 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 332
// entity 344
{
"classname" "actor_tube_straight"
"origin" "-48 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 333
// entity 345
{
"classname" "actor_tube_straight"
"origin" "-32 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 334
// entity 346
{
"classname" "actor_tube_straight"
"origin" "-16 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 335
// entity 347
{
"classname" "actor_tube_straight"
"origin" "0 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 336
// entity 348
{
"classname" "actor_tube_straight"
"origin" "16 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 337
// entity 349
{
"classname" "actor_tube_straight"
"origin" "32 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 338
// entity 350
{
"classname" "actor_tube_straight"
"origin" "48 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 339
// entity 351
{
"classname" "actor_tube_straight"
"origin" "64 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 340
// entity 352
{
"classname" "actor_tube_straight"
"origin" "80 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 341
// entity 353
{
"classname" "actor_tube_straight"
"origin" "96 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 342
// entity 354
{
"classname" "actor_tube_straight"
"origin" "112 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 343
// entity 355
{
"classname" "actor_tube_straight"
"origin" "128 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 344
// entity 356
{
"classname" "actor_tube_corner"
"origin" "144 -48 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 345
// entity 357
{
"classname" "actor_tank"
"origin" "-216 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 346
// entity 358
{
"classname" "actor_tube_straight"
"origin" "-200 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 347
// entity 359
{
"classname" "actor_tube_straight"
"origin" "-184 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 348
// entity 360
{
"classname" "actor_tube_straight"
"origin" "-152 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 349
// entity 361
{
"classname" "actor_barrel_1"
"origin" "-252 -8 -16"
"_tb_layer" "3"
}
// entity 350
// entity 362
{
"classname" "actor_box_red"
"origin" "-264 -24 -20"
"_tb_layer" "3"
}
// entity 351
// entity 363
{
"classname" "actor_box_red"
"origin" "-264 -24 -12"
"_tb_layer" "3"
}
// entity 352
// entity 364
{
"classname" "actor_box_green"
"origin" "-264 -8 -20"
"_tb_layer" "3"
}
// entity 353
// entity 365
{
"classname" "func_group"
"_tb_type" "_tb_group"
@ -6600,7 +6663,7 @@
( -248 -64 0 ) ( -248 -64 1 ) ( -248 -63 0 ) special/clip [ -8.269460797427576e-16 1 0 0 ] [ 0 0 -1 -8 ] 270 1 1
}
}
// entity 354
// entity 366
{
"classname" "func_group"
"_tb_type" "_tb_group"
@ -6618,122 +6681,122 @@
( -104 -208 48 ) ( -104 -208 49 ) ( -104 -207 48 ) Manual/Blue_Panel_Wall_Thin [ 0 1 0 8 ] [ 0 0 -1 -16 ] 0 1 1
}
}
// entity 355
// entity 367
{
"classname" "actor_capacitor_mini"
"origin" "-184 -8 -16"
"_tb_layer" "3"
}
// entity 356
// entity 368
{
"classname" "actor_tank_large"
"origin" "-304 -24 -8"
"_tb_layer" "3"
}
// entity 357
// entity 369
{
"classname" "actor_chest_1"
"origin" "-252 -24 -16"
"_tb_layer" "3"
}
// entity 358
// entity 370
{
"classname" "actor_chest_1"
"origin" "40 -200 24"
"_tb_layer" "3"
}
// entity 359
// entity 371
{
"classname" "actor_elevator_1"
"origin" "-168 112 -25"
"targetname" "elevator_2"
"_tb_layer" "3"
}
// entity 360
// entity 372
{
"classname" "actor_terminal_big"
"origin" "92 -248 28"
"angle" "90"
"_tb_layer" "3"
}
// entity 361
// entity 373
{
"classname" "actor_barrel_1"
"origin" "180 -260 24"
"_tb_layer" "3"
}
// entity 362
// entity 374
{
"classname" "actor_barrel_1"
"origin" "176 -300 24"
"_tb_layer" "3"
}
// entity 363
// entity 375
{
"classname" "actor_barrel_1"
"origin" "188 -120 24"
"_tb_layer" "3"
}
// entity 364
// entity 376
{
"classname" "actor_barrel_1"
"origin" "-256 -36 -16"
"_tb_layer" "3"
}
// entity 365
// entity 377
{
"classname" "actor_barrel_1"
"origin" "-300 56 -16"
"_tb_layer" "3"
}
// entity 366
// entity 378
{
"classname" "actor_barrel_1"
"origin" "-300 68 -16"
"_tb_layer" "3"
}
// entity 367
// entity 379
{
"classname" "actor_barrel_1"
"origin" "-292 64 -16"
"_tb_layer" "3"
}
// entity 368
// entity 380
{
"classname" "actor_tube_straight"
"origin" "-168 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 369
// entity 381
{
"classname" "actor_tube_straight"
"origin" "-128 48 -32"
"angles" "0 0 90"
"_tb_layer" "3"
}
// entity 370
// entity 382
{
"classname" "actor_tube_straight"
"origin" "-128 48 -48"
"angles" "0 0 90"
"_tb_layer" "3"
}
// entity 371
// entity 383
{
"classname" "actor_tube_straight"
"origin" "-128 64 -36"
"angles" "0 0 90"
"_tb_layer" "3"
}
// entity 372
// entity 384
{
"classname" "actor_tube_straight"
"origin" "-128 64 -52"
"angles" "0 0 90"
"_tb_layer" "3"
}
// entity 373
// entity 385
{
"classname" "actor_capacitor_mini"
"origin" "8 320 -16"
@ -6741,7 +6804,7 @@
"activationtype" "Open"
"_tb_layer" "3"
}
// entity 374
// entity 386
{
"classname" "func_group"
"_tb_type" "_tb_layer"
@ -6750,7 +6813,7 @@
"_tb_layer_sort_index" "1"
"_tb_layer_hidden" "1"
}
// entity 375
// entity 387
{
"classname" "func_shroud"
"targetname" "secret_door_1"
@ -6766,7 +6829,7 @@
( 0 480 24 ) ( 0 480 25 ) ( 0 481 24 ) Manual/Black [ 0 1 0 0 ] [ 0 0 -1 0 ] 90 1 1
}
}
// entity 376
// entity 388
{
"classname" "func_shroud"
"targetname" "secret_door_1"
@ -6782,7 +6845,7 @@
( -84 376 24 ) ( -84 376 25 ) ( -84 377 24 ) Manual/Black [ 0 1 0 0 ] [ 0 0 -1 0 ] 90 1 1
}
}
// entity 377
// entity 389
{
"classname" "func_shroud"
"targetname" "door5"
@ -6798,7 +6861,7 @@
( 344 -112 64 ) ( 344 -112 65 ) ( 344 -111 64 ) Manual/Black [ 0 1 0 0 ] [ 0 0 -1 0 ] 180 1 1
}
}
// entity 378
// entity 390
{
"classname" "func_shroud"
"targetname" "secret_door_1"
@ -6814,7 +6877,7 @@
( -84 320 24 ) ( -84 320 25 ) ( -84 321 24 ) Manual/Black [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
}
}
// entity 379
// entity 391
{
"classname" "func_shroud"
"targetname" "secret_door_2"

View file

@ -259,3 +259,9 @@
"classname" "actor_teleporter"
"origin" "-40 -40 17"
}
// entity 17
{
"classname" "actor_controlpad"
"origin" "-44 28 28"
"target" "door"
}

View file

@ -0,0 +1,20 @@
[gd_resource type="Resource" script_class="FuncGodotFGDModelPointClass" load_steps=4 format=3 uid="uid://dd7haabidbq5s"]
[ext_resource type="Resource" uid="uid://5bc1qysixhmh" path="res://3D/TrenchBroom/EntityDefinitions/base/actor_base.tres" id="1_gcf4d"]
[ext_resource type="PackedScene" uid="uid://byyrqmraqy0ns" path="res://3D/BlockbenchModels/Tank/Tank_3D_Standalone.tscn" id="2_gcf4d"]
[ext_resource type="Script" uid="uid://dkmyelig23ub5" path="res://addons/func_godot/src/fgd/func_godot_fgd_model_point_class.gd" id="3_yhblj"]
[resource]
script = ExtResource("3_yhblj")
target_map_editor = 1
rotation_offset = Vector3(0, 180, 0)
scene_file = ExtResource("2_gcf4d")
apply_scale_on_map_build = false
classname = "actor_tank_standalone"
description = "Standalone Tank"
base_classes = Array[Resource]([ExtResource("1_gcf4d")])
meta_properties = {
"model": "\"3D/MapModels/actor_tank_standalone.glb\"",
"size": AABB(-8, -8, -8, 8, 8, 8)
}
metadata/_custom_type_script = "uid://c83r7t467hm4m"

View file

@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=45 format=3 uid="uid://b700sa4be6dfa"]
[gd_resource type="Resource" script_class="FuncGodotFGDFile" load_steps=46 format=3 uid="uid://b700sa4be6dfa"]
[ext_resource type="Resource" uid="uid://ia1t5p4mhom3" path="res://3D/TrenchBroom/EntityDefinitions/point/lights/light_omni.tres" id="1_7vcj1"]
[ext_resource type="Script" uid="uid://cknmd0lgmorx2" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="1_lykim"]
@ -44,8 +44,9 @@
[ext_resource type="Resource" uid="uid://cy6802obllcmv" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_valve.tres" id="41_q8hab"]
[ext_resource type="Resource" uid="uid://concvsutqjff2" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Emitter_Tube.tres" id="42_ekplg"]
[ext_resource type="Resource" uid="uid://oeoksvwbqvnf" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Emitter_Wall.tres" id="43_d7qk0"]
[ext_resource type="Resource" uid="uid://dd7haabidbq5s" path="res://3D/TrenchBroom/EntityDefinitions/point/actors/actor_tank_standalone.tres" id="44_k6g2u"]
[resource]
script = ExtResource("1_lykim")
entity_definitions = Array[Resource]([ExtResource("1_7vcj1"), ExtResource("2_u7uvb"), ExtResource("3_u7uvb"), ExtResource("4_1nmxk"), ExtResource("5_ljb2x"), ExtResource("6_seuvu"), ExtResource("7_fmwex"), ExtResource("8_c8m8m"), ExtResource("9_14sjf"), ExtResource("10_xik3w"), ExtResource("11_dgiqm"), ExtResource("12_1teik"), ExtResource("13_f0hti"), ExtResource("14_6ld6e"), ExtResource("15_g8j5j"), ExtResource("16_7h4of"), ExtResource("17_m3sbm"), ExtResource("18_m3sbm"), ExtResource("19_hvhb8"), ExtResource("20_3v5us"), ExtResource("21_g67cj"), ExtResource("22_iy67w"), ExtResource("23_b5lmu"), ExtResource("24_ndas4"), ExtResource("25_n7wsi"), ExtResource("26_v48k5"), ExtResource("27_ombvk"), ExtResource("28_31lma"), ExtResource("29_louv0"), ExtResource("30_wfgfu"), ExtResource("31_elv2e"), ExtResource("32_elv2e"), ExtResource("33_aawmv"), ExtResource("34_wy0ht"), ExtResource("35_3jqmy"), ExtResource("36_p5b6l"), ExtResource("37_53o7h"), ExtResource("38_mdgca"), ExtResource("39_d6b4f"), ExtResource("40_l3pck"), ExtResource("41_q8hab"), ExtResource("42_ekplg"), ExtResource("43_d7qk0")])
entity_definitions = Array[Resource]([ExtResource("1_7vcj1"), ExtResource("2_u7uvb"), ExtResource("3_u7uvb"), ExtResource("4_1nmxk"), ExtResource("5_ljb2x"), ExtResource("6_seuvu"), ExtResource("7_fmwex"), ExtResource("8_c8m8m"), ExtResource("9_14sjf"), ExtResource("10_xik3w"), ExtResource("11_dgiqm"), ExtResource("12_1teik"), ExtResource("13_f0hti"), ExtResource("14_6ld6e"), ExtResource("15_g8j5j"), ExtResource("16_7h4of"), ExtResource("17_m3sbm"), ExtResource("18_m3sbm"), ExtResource("19_hvhb8"), ExtResource("20_3v5us"), ExtResource("21_g67cj"), ExtResource("22_iy67w"), ExtResource("23_b5lmu"), ExtResource("24_ndas4"), ExtResource("25_n7wsi"), ExtResource("26_v48k5"), ExtResource("27_ombvk"), ExtResource("28_31lma"), ExtResource("29_louv0"), ExtResource("30_wfgfu"), ExtResource("31_elv2e"), ExtResource("32_elv2e"), ExtResource("33_aawmv"), ExtResource("34_wy0ht"), ExtResource("35_3jqmy"), ExtResource("36_p5b6l"), ExtResource("37_53o7h"), ExtResource("38_mdgca"), ExtResource("39_d6b4f"), ExtResource("40_l3pck"), ExtResource("41_q8hab"), ExtResource("42_ekplg"), ExtResource("43_d7qk0"), ExtResource("44_k6g2u")])
metadata/_custom_type_script = "uid://cknmd0lgmorx2"

View file

@ -11,6 +11,9 @@
<PropertyGroup Condition=" '$(Configuration)' == 'ExportRelease' ">
<DefineConstants>GODOT;GODOT_WINDOWS;GODOT_PC;GODOT4;GODOT4_5;GODOT4_5_0;GODOT4_OR_GREATER;GODOT4_0_OR_GREATER;GODOT4_1_OR_GREATER;GODOT4_2_OR_GREATER;GODOT4_3_OR_GREATER;GODOT4_4_OR_GREATER;GODOT4_5_OR_GREATER;GODOT4_5_0_OR_GREATER;GODOT;GODOT_WINDOWS;GODOT_PC;GODOT4;GODOT4_5;GODOT4_5_0;GODOT4_OR_GREATER;GODOT4_0_OR_GREATER;GODOT4_1_OR_GREATER;GODOT4_2_OR_GREATER;GODOT4_3_OR_GREATER;GODOT4_4_OR_GREATER;GODOT4_5_OR_GREATER;GODOT4_5_0_OR_GREATER;TRACE;DISABLE_DD3D</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>GODOT;GODOT_WINDOWS;GODOT_PC;GODOT4;GODOT4_5;GODOT4_5_0;GODOT4_OR_GREATER;GODOT4_0_OR_GREATER;GODOT4_1_OR_GREATER;GODOT4_2_OR_GREATER;GODOT4_3_OR_GREATER;GODOT4_4_OR_GREATER;GODOT4_5_OR_GREATER;GODOT4_5_0_OR_GREATER;TRACE;TOOLS</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Content Include="Export.ps1" />
<Content Include="omnisharp.json" />

View file

@ -8,6 +8,7 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastHelpers_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003F3c92637ae2e83da0a63791071c41eae291d594156062866d8621b7ed7245c_003FCastHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACharacterBody2D_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003F23fd556cc1333e1428b66422f2ce9db97b81d8d173ceefda39d58c9b0146f2c_003FCharacterBody2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACharacterBody2D_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003Fbba0bbd7a98ee58286e9484fbe86e01afff6232283f6efd3556eb7116453_003FCharacterBody2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACharacterBody3D_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003Fe56b84c3fa498fb86fc1eba376f62f482127e3fe80415c5fb2acde2bf6d89793_003FCharacterBody3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACirno_002EScripts_002EComponents_002EActors_002EDamageReceiver3D_005FScriptSignals_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FTemp_003FSourceGeneratedDocuments_003F4DC97777E7037C0C573FE095_003FGodot_002ESourceGenerators_003FGodot_002ESourceGenerators_002EScriptSignalsGenerator_003FCirno_002EScripts_002EComponents_002EActors_002EDamageReceiver3D_005FScriptSignals_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACirno_002EScripts_002EControllers_002ERogueliteRoom_005FScriptMethods_002Egenerated_002Ecs_002Fl_003AF_0021_003Ftemp_003FSourceGeneratedDocuments_003F912EB5EC64EA35C30E40DC6E_003FGodot_002ESourceGenerators_003FGodot_002ESourceGenerators_002EScriptMethodsGenerator_003FCirno_002EScripts_002EControllers_002ERogueliteRoom_005FScriptMethods_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACirno_002EScripts_002EUI_002EInventoryMenu_005FScriptMethods_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003F5ab35a8b9fadec7e5e6844898b6a96fc3e972d1_003FCirno_002EScripts_002EUI_002EInventoryMenu_005FScriptMethods_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

View file

@ -3,7 +3,7 @@
[ext_resource type="Script" uid="uid://ba0tf7ihw4hpp" path="res://Scripts/Misc/CameraController3D.cs" id="1_g4gcm"]
[ext_resource type="Script" uid="uid://b8g8mflgsr5dc" path="res://Scripts/GameController.cs" id="1_joeuf"]
[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="2_itd0i"]
[ext_resource type="Resource" uid="uid://bq2o78engsuyt" path="res://Resources/Maps/IsoMapTest2.tres" id="2_l7bgk"]
[ext_resource type="Resource" uid="uid://bq2o78engsuyt" path="res://Resources/Maps/3D/IsoMapTest2.tres" id="2_l7bgk"]
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="3_itd0i"]
[ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="6_w4wji"]
[ext_resource type="AudioStream" uid="uid://blohh20jktoyo" path="res://SFX/270641__phantastonia__alarm2.wav" id="7_5vm3d"]

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=16 format=3 uid="uid://dorx2l3svs58g"]
[ext_resource type="Script" uid="uid://b8g8mflgsr5dc" path="res://Scripts/GameController.cs" id="1_jexas"]
[ext_resource type="Resource" uid="uid://bq2o78engsuyt" path="res://Resources/Maps/IsoMapTest2.tres" id="2_21h4j"]
[ext_resource type="Resource" uid="uid://b32mqmglcdo64" path="res://Resources/Maps/3D/Tutorial_3D.tres" id="2_b1fwp"]
[ext_resource type="PackedScene" uid="uid://rimplblbptcd" path="res://Scenes/Actors/IsoPlayer_FSM.tscn" id="3_gvqvx"]
[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="4_dhiwy"]
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="5_nv8if"]
@ -29,7 +29,7 @@ sky = SubResource("Sky_yt8i6")
[node name="GameController" type="Node" parent="." node_paths=PackedStringArray("_cameraTarget", "PlayerParentNode")]
script = ExtResource("1_jexas")
_cameraTarget = NodePath("../CameraTarget")
MapResource = ExtResource("2_21h4j")
MapResource = ExtResource("2_b1fwp")
PlayerTemplate = ExtResource("3_gvqvx")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("../StartPosition")

View file

@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=44 format=3 uid="uid://d1lc8lhq1b05p"]
[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=46 format=3 uid="uid://d1lc8lhq1b05p"]
[ext_resource type="Script" uid="uid://durmwwyw3dnm6" path="res://Scripts/Resources/DebugMenu/DebugMapSelectData.cs" id="1_6kwth"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="1_ov731"]
@ -12,7 +12,8 @@
[ext_resource type="Resource" uid="uid://6ek4lmtuij4t" path="res://Resources/Maps/Roguelite.tres" id="9_ognca"]
[ext_resource type="Resource" uid="uid://cn8tu4jct04rp" path="res://Resources/StartData/Pistol_Start.tres" id="10_olpjo"]
[ext_resource type="Resource" uid="uid://d1rd3eep3b0jj" path="res://Resources/Maps/ReimuTest.tres" id="11_olpjo"]
[ext_resource type="Resource" uid="uid://bq2o78engsuyt" path="res://Resources/Maps/IsoMapTest2.tres" id="12_nbnej"]
[ext_resource type="Resource" uid="uid://bq2o78engsuyt" path="res://Resources/Maps/3D/IsoMapTest2.tres" id="12_w7lsm"]
[ext_resource type="Resource" uid="uid://b32mqmglcdo64" path="res://Resources/Maps/3D/Tutorial_3D.tres" id="13_vq1um"]
[sub_resource type="Resource" id="Resource_qnbi6"]
script = ExtResource("2_tnajf")
@ -190,10 +191,16 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m"
[sub_resource type="Resource" id="Resource_rmbs0"]
script = ExtResource("2_tnajf")
Map = ExtResource("12_nbnej")
Map = ExtResource("12_w7lsm")
_name = "Isometric Test"
metadata/_custom_type_script = "uid://dnthdjrx78u6m"
[sub_resource type="Resource" id="Resource_uqr0b"]
script = ExtResource("2_tnajf")
Map = ExtResource("13_vq1um")
_name = "Tutorial 3D"
metadata/_custom_type_script = "uid://dnthdjrx78u6m"
[resource]
script = ExtResource("1_6kwth")
Maps = Array[Object]([SubResource("Resource_qnbi6"), SubResource("Resource_0k62o"), SubResource("Resource_edoov"), SubResource("Resource_47bot"), SubResource("Resource_mgdm6"), SubResource("Resource_v2as6"), SubResource("Resource_pein5"), SubResource("Resource_6wrc7"), SubResource("Resource_x3w7w"), SubResource("Resource_ajht5"), SubResource("Resource_7vmdn"), SubResource("Resource_6ijnv"), SubResource("Resource_bkci5"), SubResource("Resource_ognca"), SubResource("Resource_nbnej"), SubResource("Resource_w7lsm"), SubResource("Resource_vq1um"), SubResource("Resource_hougo"), SubResource("Resource_xhgge"), SubResource("Resource_gkp3t"), SubResource("Resource_c3ldk"), SubResource("Resource_rmbs0")])
Maps = Array[Object]([SubResource("Resource_qnbi6"), SubResource("Resource_0k62o"), SubResource("Resource_edoov"), SubResource("Resource_47bot"), SubResource("Resource_mgdm6"), SubResource("Resource_v2as6"), SubResource("Resource_pein5"), SubResource("Resource_6wrc7"), SubResource("Resource_x3w7w"), SubResource("Resource_ajht5"), SubResource("Resource_7vmdn"), SubResource("Resource_6ijnv"), SubResource("Resource_bkci5"), SubResource("Resource_ognca"), SubResource("Resource_nbnej"), SubResource("Resource_w7lsm"), SubResource("Resource_vq1um"), SubResource("Resource_hougo"), SubResource("Resource_xhgge"), SubResource("Resource_gkp3t"), SubResource("Resource_c3ldk"), SubResource("Resource_rmbs0"), SubResource("Resource_uqr0b")])

View file

@ -0,0 +1,70 @@
[gd_resource type="Resource" script_class="EnemyResource" load_steps=19 format=3 uid="uid://bc860i6u1lsjb"]
[ext_resource type="SpriteFrames" uid="uid://df5mrk1pvnjvi" path="res://Resources/Enemies/Crystal_Purple_Animations.tres" id="1_1rnpq"]
[ext_resource type="SpriteFrames" uid="uid://xiirmmgfsya6" path="res://Resources/Sprites/Fairy_Guard_Dead.tres" id="2_11hho"]
[ext_resource type="PackedScene" uid="uid://l7a5p3vfsbn0" path="res://Scenes/Actors/Generic_Enemy_Debris_3D.tscn" id="3_0dkpk"]
[ext_resource type="Texture2D" uid="uid://d2uwmixqx8yr7" path="res://ExternalMaterial/CrystalEnemies/Crystal_Enemy.png.png" id="4_i3x07"]
[ext_resource type="Script" uid="uid://cq65aed620ijo" path="res://Scripts/Resources/Loot/LootDrop.cs" id="5_msuon"]
[ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="6_ysawo"]
[ext_resource type="Resource" uid="uid://dy53gia1tmkah" path="res://Resources/Items/Points_Pickup.tres" id="7_tkvwd"]
[ext_resource type="Resource" uid="uid://bhbufxodybsw4" path="res://Resources/Items/Shield_Pickup.tres" id="8_vvxx8"]
[ext_resource type="Resource" uid="uid://dodwpect0ldjf" path="res://Resources/Items/Heart_Pickup.tres" id="9_wdxee"]
[ext_resource type="Resource" uid="uid://clr1gln7nxa1o" path="res://Resources/Items/Power_Pickup.tres" id="10_016nb"]
[ext_resource type="Resource" uid="uid://c6ywv08e6is5o" path="res://Resources/Weapons/EnemyWeapon_Big_3D.tres" id="11_tshuv"]
[ext_resource type="Script" uid="uid://cd5o0ceb50jki" path="res://Scripts/Resources/EnemyResource.cs" id="12_0syc4"]
[sub_resource type="AtlasTexture" id="AtlasTexture_n54y5"]
atlas = ExtResource("4_i3x07")
region = Rect2(0, 0, 32, 32)
[sub_resource type="Resource" id="Resource_c8nix"]
script = ExtResource("5_msuon")
Item = ExtResource("6_ysawo")
Chance = 40.0
metadata/_custom_type_script = "uid://cq65aed620ijo"
[sub_resource type="Resource" id="Resource_gs2l3"]
script = ExtResource("5_msuon")
Item = ExtResource("7_tkvwd")
Chance = 10.0
metadata/_custom_type_script = "uid://cq65aed620ijo"
[sub_resource type="Resource" id="Resource_sqnvg"]
script = ExtResource("5_msuon")
Item = ExtResource("8_vvxx8")
Chance = 5.0
metadata/_custom_type_script = "uid://cq65aed620ijo"
[sub_resource type="Resource" id="Resource_5tyar"]
script = ExtResource("5_msuon")
Item = ExtResource("9_wdxee")
Chance = 5.0
metadata/_custom_type_script = "uid://cq65aed620ijo"
[sub_resource type="Resource" id="Resource_48xq6"]
script = ExtResource("5_msuon")
Item = ExtResource("10_016nb")
Chance = 6.0
metadata/_custom_type_script = "uid://cq65aed620ijo"
[resource]
script = ExtResource("12_0syc4")
EnemyName = &"Purple Crystal"
EnemyKey = &"CRYSTAL_PURPLE"
PrefabPath = &"uid://bh3vxmqflijgj"
MaxHealth = 10.0
MovementSpeed = 2.0
Weapon = ExtResource("11_tshuv")
LootDrops = Array[ExtResource("5_msuon")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")])
PlayerDetectionRange = 4.0
ViewRange = 5.0
AlarmReactRange = 8.0
PlayerDisengageRange = 10.0
StrafeSpeed = 1.5
MaxStrafeDistance = 1.0
MinStrafeDistance = 0.2
IconSprite = SubResource("AtlasTexture_n54y5")
AnimationFrames = ExtResource("1_1rnpq")
DebrisScene = ExtResource("3_0dkpk")
DeathAnimation = ExtResource("2_11hho")
metadata/_custom_type_script = "uid://cd5o0ceb50jki"

View file

@ -0,0 +1,59 @@
[gd_resource type="SpriteFrames" load_steps=6 format=3 uid="uid://df5mrk1pvnjvi"]
[ext_resource type="Texture2D" uid="uid://d2uwmixqx8yr7" path="res://ExternalMaterial/CrystalEnemies/Crystal_Enemy.png.png" id="1_bwygt"]
[sub_resource type="AtlasTexture" id="AtlasTexture_70ir1"]
atlas = ExtResource("1_bwygt")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_nltpy"]
atlas = ExtResource("1_bwygt")
region = Rect2(0, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_a502u"]
atlas = ExtResource("1_bwygt")
region = Rect2(0, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_rabkd"]
atlas = ExtResource("1_bwygt")
region = Rect2(0, 96, 32, 32)
[resource]
animations = [{
"frames": [],
"loop": true,
"name": &"dead",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_70ir1")
}],
"loop": true,
"name": &"down",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_nltpy")
}],
"loop": true,
"name": &"left",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_a502u")
}],
"loop": true,
"name": &"right",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_rabkd")
}],
"loop": true,
"name": &"up",
"speed": 5.0
}]

View file

@ -0,0 +1,19 @@
[gd_resource type="Resource" script_class="MapResource" load_steps=4 format=3 uid="uid://b32mqmglcdo64"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="1_ilxsg"]
[ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="2_kgbmv"]
[sub_resource type="Resource" id="Resource_kgbmv"]
script = ExtResource("1_ilxsg")
StartingEquipment = null
RemoveEquipment = null
metadata/_custom_type_script = "uid://mja0rk7n2kln"
[resource]
script = ExtResource("2_kgbmv")
MapName = &"Tutorial"
MapDescription = null
ScenePath = &"uid://dorx2l3svs58g"
WeaponsAllowed = true
StartData = SubResource("Resource_kgbmv")
metadata/_custom_type_script = "uid://quy4d4tgvqfy"

View file

@ -195,6 +195,7 @@ ResourceName = "Health"
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, -0.29, 0)
mesh = SubResource("QuadMesh_05pdu")
script = ExtResource("19_4fnoq")
AutoEnable = false
CollisionMask = 1
[node name="GravityProvider" type="Node" parent="."]

View file

@ -82,9 +82,9 @@ public partial class Idle : EnemyStateBase3D
if (DebugEnabled)
{
#if !DISABLE_DD3D
DebugDraw3D.DrawText(MainObject.GlobalPosition - new Vector3(0, 16, 0), "Idle");
#endif
// #if !DISABLE_DD3D
// DebugDraw3D.DrawText(MainObject.GlobalPosition - new Vector3(0, 16, 0), "Idle");
// #endif
}
MainObject.Velocity = new Vector3(MainObject.Velocity.X,