From ecfd54f3e8cc7074305fa061792e1580ec310a7c Mon Sep 17 00:00:00 2001 From: Marco Date: Thu, 11 Sep 2025 14:41:00 +0200 Subject: [PATCH] Factory 4 map --- 3D/Maps/Factory4.map | 68 ++++++++++++ 3D/Maps/Factory4.map.import | 14 +++ IsoTest/Factory4.tscn | 157 ++++++++++++++++++++++++++++ IsoTest/IsoMapTest3.tscn | 2 +- Resources/Debug/DebugLevels.tres | 11 +- Resources/Maps/3D/Factory4_Map.tres | 16 +++ Resources/Maps/Briefing_1.tres | 1 + Resources/Maps/MapsDatabase.tres | 5 +- Resources/Maps/Tutorial.tres | 1 + 9 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 3D/Maps/Factory4.map create mode 100644 3D/Maps/Factory4.map.import create mode 100644 IsoTest/Factory4.tscn create mode 100644 Resources/Maps/3D/Factory4_Map.tres diff --git a/3D/Maps/Factory4.map b/3D/Maps/Factory4.map new file mode 100644 index 00000000..38de8505 --- /dev/null +++ b/3D/Maps/Factory4.map @@ -0,0 +1,68 @@ +// Game: FuncGodot +// Format: Valve +// entity 0 +{ +"mapversion" "220" +"wad" "" +"classname" "worldspawn" +// brush 0 +{ +( -64 -64 -16 ) ( -64 -63 -16 ) ( -64 -64 -15 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -64 -64 -16 ) ( -64 -64 -15 ) ( -63 -64 -16 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -64 -64 8 ) ( -63 -64 8 ) ( -64 -63 8 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1 +( 64 64 16 ) ( 64 65 16 ) ( 65 64 16 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 64 64 16 ) ( 65 64 16 ) ( 64 64 17 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 64 64 16 ) ( 64 64 17 ) ( 64 65 16 ) __TB_empty [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +} +// brush 1 +{ +( -64 -64 16 ) ( -64 -63 16 ) ( -64 -64 17 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -64 -64 16 ) ( -64 -64 17 ) ( -63 -64 16 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -64 -64 16 ) ( -63 -64 16 ) ( -64 -63 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -56 64 48 ) ( -56 65 48 ) ( -55 64 48 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1 +( -56 64 24 ) ( -55 64 24 ) ( -56 64 25 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -56 64 24 ) ( -56 64 25 ) ( -56 65 24 ) __TB_empty [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +} +// brush 2 +{ +( -56 -64 16 ) ( -56 -63 16 ) ( -56 -64 17 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 -1 8 ] 180 1 1 +( -96 -64 16 ) ( -96 -64 17 ) ( -95 -64 16 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 8 ] 270 1 1 +( -96 -64 16 ) ( -95 -64 16 ) ( -96 -63 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1 +( 80 -56 48 ) ( 80 -55 48 ) ( 81 -56 48 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 0 ] 180 1 1 +( 80 -56 24 ) ( 81 -56 24 ) ( 80 -56 25 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 8 ] 270 1 1 +( 64 -56 24 ) ( 64 -56 25 ) ( 64 -55 24 ) __TB_empty [ 0 1 0 0 ] [ 0 0 -1 8 ] 180 1 1 +} +// brush 3 +{ +( -56 56 16 ) ( -56 57 16 ) ( -56 56 17 ) __TB_empty [ 0 -1 0 24 ] [ 0 0 -1 8 ] 0 1 1 +( -96 56 16 ) ( -96 56 17 ) ( -95 56 16 ) __TB_empty [ 1 0 0 0 ] [ 0 0 -1 8 ] 90 1 1 +( -96 56 16 ) ( -95 56 16 ) ( -96 57 16 ) __TB_empty [ -1 0 0 0 ] [ 0 -1 0 24 ] 90 1 1 +( 80 64 48 ) ( 80 65 48 ) ( 81 64 48 ) __TB_empty [ 1 0 0 0 ] [ 0 -1 0 24 ] 0 1 1 +( 80 64 24 ) ( 81 64 24 ) ( 80 64 25 ) __TB_empty [ -1 0 0 0 ] [ 0 0 -1 8 ] 90 1 1 +( 64 64 24 ) ( 64 64 25 ) ( 64 65 24 ) __TB_empty [ 0 1 0 -24 ] [ 0 0 -1 8 ] 0 1 1 +} +// brush 4 +{ +( 56 -72 16 ) ( 56 -71 16 ) ( 56 -72 17 ) __TB_empty [ 0 -1 0 -8 ] [ 0 0 -1 0 ] 90 1 1 +( 56 -56 16 ) ( 56 -56 17 ) ( 57 -56 16 ) __TB_empty [ 1 0 0 -24 ] [ 0 0 -1 0 ] 0 1 1 +( 56 -72 16 ) ( 57 -72 16 ) ( 56 -71 16 ) __TB_empty [ -1 0 0 24 ] [ 0 -1 0 -8 ] 90 1 1 +( 64 56 48 ) ( 64 57 48 ) ( 65 56 48 ) __TB_empty [ 1 0 0 -24 ] [ 0 -1 0 -8 ] 0 1 1 +( 64 56 24 ) ( 65 56 24 ) ( 64 56 25 ) __TB_empty [ -1 0 0 24 ] [ 0 0 -1 0 ] 90 1 1 +( 64 56 24 ) ( 64 56 25 ) ( 64 57 24 ) __TB_empty [ 0 1 0 8 ] [ 0 0 -1 0 ] 90 1 1 +} +} +// entity 1 +{ +"classname" "actor_teleporter" +"origin" "-40 8 17" +} +// entity 2 +{ +"classname" "actor_table" +"origin" "-40 -36 20" +} +// entity 3 +{ +"classname" "actor_locker" +"origin" "-44 48 28" +} diff --git a/3D/Maps/Factory4.map.import b/3D/Maps/Factory4.map.import new file mode 100644 index 00000000..0d460812 --- /dev/null +++ b/3D/Maps/Factory4.map.import @@ -0,0 +1,14 @@ +[remap] + +importer="func_godot.map" +type="Resource" +uid="uid://dbv5p8qyjy6u4" +path="res://.godot/imported/Factory4.map-8d846f7bd3088e01c2c77793d43ce081.tres" + +[deps] + +source_file="res://3D/Maps/Factory4.map" +dest_files=["res://.godot/imported/Factory4.map-8d846f7bd3088e01c2c77793d43ce081.tres"] + +[params] + diff --git a/IsoTest/Factory4.tscn b/IsoTest/Factory4.tscn new file mode 100644 index 00000000..fb527f30 --- /dev/null +++ b/IsoTest/Factory4.tscn @@ -0,0 +1,157 @@ +[gd_scene load_steps=25 format=4 uid="uid://u3np1731pcoj"] + +[ext_resource type="PackedScene" uid="uid://bv7tjma3g7nkf" path="res://Scenes/Actors/3D/game_controller.tscn" id="1_w3okp"] +[ext_resource type="Resource" uid="uid://bwg6xki3d8yow" path="res://Resources/Maps/3D/Factory4_Map.tres" id="2_f1ieg"] +[ext_resource type="Script" uid="uid://csruxpdnpj18r" path="res://Scripts/Actors/3D/PlayerStartMarker3D.cs" id="3_555m8"] +[ext_resource type="Script" uid="uid://dnslcy71dgea" path="res://Scripts/Misc/CameraTarget3D.cs" id="4_f1ieg"] +[ext_resource type="Script" uid="uid://ba0tf7ihw4hpp" path="res://Scripts/Misc/CameraController3D.cs" id="5_unwtk"] +[ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="7_mtei5"] +[ext_resource type="Resource" uid="uid://b12ldmtfhlvf0" path="res://Resources/Music/Apparitions_Stalk_The_Factory.tres" id="8_bv7qr"] +[ext_resource type="Script" uid="uid://kno58homctew" path="res://addons/func_godot/src/map/func_godot_map.gd" id="8_f1ieg"] +[ext_resource type="Resource" uid="uid://cx41lsryg5wpm" path="res://3D/TrenchBroom/map_settings.tres" id="9_unwtk"] +[ext_resource type="Script" uid="uid://oq2ep51w11u5" path="res://3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd" id="10_eflie"] +[ext_resource type="Texture2D" uid="uid://cyg2snr1w5xw5" path="res://addons/func_godot/textures/default_texture.png" id="11_mtei5"] +[ext_resource type="PackedScene" uid="uid://dbv1l74q66rdr" path="res://3D/Scenes/Props/Teleporter_3D.tscn" id="12_mtei5"] +[ext_resource type="PackedScene" uid="uid://ou07lptfp0d1" path="res://3D/Scenes/Props/Table_3D.tscn" id="13_bv7qr"] +[ext_resource type="PackedScene" uid="uid://c54tcqntl7vmn" path="res://3D/Scenes/Props/Locker_3D.tscn" id="14_14ntx"] + +[sub_resource type="Environment" id="Environment_d6hgs"] +background_mode = 1 +ambient_light_source = 3 +reflected_light_source = 1 + +[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_w45nv"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b3peu"] +albedo_texture = ExtResource("11_mtei5") +metallic_specular = 0.0 +texture_filter = 2 + +[sub_resource type="ArrayMesh" id="ArrayMesh_04e2y"] +_surfaces = [{ +"aabb": AABB(-4, 0.5, -4, 8, 2.5, 8), +"attribute_data": PackedByteArray("AACAPwAAgL4AAIA/AAAAvgAAgL8AAAC+AACAvwAAgL4AAIC/AACAvgAAgD8AAIC+AACAPwAAAL4AAIC/AAAAvgAAgD8AAIC/AACAPwAAgD8AAIC/AACAPwAAgL8AAIC/AACAvwAAgL8AAIA/AACAvwAAgD8AAIA/AACAvwAAgD8AAIA/AACAvgAAgD8AAAC+AACAvwAAAL4AAIC/AACAvgAAgL8AAIC+AACAPwAAgL4AAIA/AAAAvgAAgL8AAAC+AACAPwAAQL8AAIA/AACAvgAAgL8AAIC+AACAvwAAQL8AAIC/AABAvwAAYL8AAEC/AABgvwAAgL4AAIC/AACAvgAAgD8AAIC/AACAPwAAgD8AAGA/AACAPwAAYD8AAIC/AACAvwAAgL8AAGC/AACAvwAAYL8AAIA/AACAvwAAgD8AAIA/AABAvwAAgD8AAIC+AABgPwAAgL4AAGA/AABAvwAAgL8AAEC/AACAPwAAQL8AAIA/AACAvgAAgL8AAIC+AACAPwAAIL8AAIA/AAAAvgAAYD8AAAC+AABgPwAAIL8AAGC/AAAgvwAAgD8AACC/AACAPwAAAL4AAGC/AAAAvgAAYD8AAGA/AABgPwAAgD8AAIC/AACAPwAAgL8AAGA/AABgvwAAYD8AAIA/AABgPwAAgD8AAIA/AABgvwAAgD8AAGA/AAAgvwAAYD8AAAC+AACAvwAAAL4AAIC/AAAgvwAAgL8AACC/AABgvwAAIL8AAGC/AAAAvgAAgL8AAAC+AAAAvwAAIL8AAAC/AAAAvgAAIL8AAAC+AAAgvwAAIL8AAGC/AAAgvwAAgD8AACC/AACAPwAAAL4AAGC/AAAAvgAAYD8AACC/AABgPwAAAL8AAIC/AAAAvwAAgL8AACC/AABgvwAAIL8AAIA/AAAgvwAAgD8AAAC/AABgvwAAAL8AAGA/AAAgvwAAYD8AAAC+AACAvwAAAL4AAIC/AAAgvwAAAD8AACC/AAAgPwAAIL8AACA/AAAAvgAAAD8AAAC+AABAPwAAQL8AAEA/AACAvgAAgL8AAIC+AACAvwAAQL8AAAA/AABAvwAAID8AAEC/AAAgPwAAgL4AAAA/AACAvgAAAL8AAIC/AAAAvwAAQD8AACC/AABAPwAAIL8AAIC/AAAAPwAAgL8AACA/AACAvwAAID8AAEA/AAAAPwAAQD8AAAC/AABAvwAAAL8AAIC+AAAgvwAAgL4AACC/AABAvwAAQL8AAEC/AACAPwAAQL8AAIA/AACAvgAAQL8AAIC+"), +"format": 34359742487, +"index_count": 180, +"index_data": PackedByteArray("AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMAFAAVABYAFAAWABcAGAAZABoAGAAaABsAHAAdAB4AHAAeAB8AIAAhACIAIAAiACMAJAAlACYAJAAmACcAKAApACoAKAAqACsALAAtAC4ALAAuAC8AMAAxADIAMAAyADMANAA1ADYANAA2ADcAOAA5ADoAOAA6ADsAPAA9AD4APAA+AD8AQABBAEIAQABCAEMARABFAEYARABGAEcASABJAEoASABKAEsATABNAE4ATABOAE8AUABRAFIAUABSAFMAVABVAFYAVABWAFcAWABZAFoAWABaAFsAXABdAF4AXABeAF8AYABhAGIAYABiAGMAZABlAGYAZABmAGcAaABpAGoAaABqAGsAbABtAG4AbABuAG8AcABxAHIAcAByAHMAdAB1AHYAdAB2AHcA"), +"material": SubResource("StandardMaterial3D_b3peu"), +"name": "__TB_empty", +"primitive": 3, +"uv_scale": Vector4(0, 0, 0, 0), +"vertex_count": 120, +"vertex_data": PackedByteArray("AACAwAAAgD8AAIDAAACAwAAAAD8AAIDAAACAQAAAAD8AAIDAAACAQAAAgD8AAIDAAACAwAAAgD8AAIDAAACAwAAAgD8AAIBAAACAwAAAAD8AAIBAAACAwAAAAD8AAIDAAACAQAAAAD8AAIDAAACAwAAAAD8AAIDAAACAwAAAAD8AAIBAAACAQAAAAD8AAIBAAACAQAAAgD8AAIDAAACAQAAAgD8AAIBAAACAwAAAgD8AAIBAAACAwAAAgD8AAIDAAACAQAAAgD8AAIDAAACAQAAAAD8AAIDAAACAQAAAAD8AAIBAAACAQAAAgD8AAIBAAACAwAAAgD8AAIBAAACAQAAAgD8AAIBAAACAQAAAAD8AAIBAAACAwAAAAD8AAIBAAACAwAAAQEAAAIDAAACAwAAAgD8AAIDAAACAQAAAgD8AAIDAAACAQAAAQEAAAIDAAACAwAAAQEAAAIDAAACAwAAAQEAAAGDAAACAwAAAgD8AAGDAAACAwAAAgD8AAIDAAACAQAAAgD8AAIDAAACAwAAAgD8AAIDAAACAwAAAgD8AAGDAAACAQAAAgD8AAGDAAACAQAAAQEAAAIDAAACAQAAAQEAAAGDAAACAwAAAQEAAAGDAAACAwAAAQEAAAIDAAACAQAAAQEAAAIDAAACAQAAAgD8AAIDAAACAQAAAgD8AAGDAAACAQAAAQEAAAGDAAACAwAAAQEAAAGDAAACAQAAAQEAAAGDAAACAQAAAgD8AAGDAAACAwAAAgD8AAGDAAACAwAAAQEAAAGDAAACAwAAAgD8AAGDAAABgwAAAgD8AAGDAAABgwAAAQEAAAGDAAACAwAAAQEAAAGDAAACAwAAAQEAAAIBAAACAwAAAgD8AAIBAAACAwAAAgD8AAGDAAABgwAAAgD8AAGDAAACAwAAAgD8AAGDAAACAwAAAgD8AAIBAAABgwAAAgD8AAIBAAABgwAAAQEAAAGDAAABgwAAAQEAAAIBAAACAwAAAQEAAAIBAAACAwAAAQEAAAGDAAABgwAAAQEAAAGDAAABgwAAAgD8AAGDAAABgwAAAgD8AAIBAAABgwAAAQEAAAIBAAACAwAAAQEAAAIBAAABgwAAAQEAAAIBAAABgwAAAgD8AAIBAAACAwAAAgD8AAIBAAABgQAAAQEAAAGDAAABgQAAAgD8AAGDAAACAQAAAgD8AAGDAAACAQAAAQEAAAGDAAABgQAAAQEAAAGDAAABgQAAAQEAAAIBAAABgQAAAgD8AAIBAAABgQAAAgD8AAGDAAACAQAAAgD8AAGDAAABgQAAAgD8AAGDAAABgQAAAgD8AAIBAAACAQAAAgD8AAIBAAACAQAAAQEAAAGDAAACAQAAAQEAAAIBAAABgQAAAQEAAAIBAAABgQAAAQEAAAGDAAACAQAAAQEAAAGDAAACAQAAAgD8AAGDAAACAQAAAgD8AAIBAAACAQAAAQEAAAIBAAABgQAAAQEAAAIBAAACAQAAAQEAAAIBAAACAQAAAgD8AAIBAAABgQAAAgD8AAIBAAABgwAAAQEAAAGBAAABgwAAAgD8AAGBAAABgQAAAgD8AAGBAAABgQAAAQEAAAGBAAABgwAAAQEAAAGBAAABgwAAAQEAAAIBAAABgwAAAgD8AAIBAAABgwAAAgD8AAGBAAABgQAAAgD8AAGBAAABgwAAAgD8AAGBAAABgwAAAgD8AAIBAAABgQAAAgD8AAIBAAABgQAAAQEAAAGBAAABgQAAAQEAAAIBAAABgwAAAQEAAAIBAAABgwAAAQEAAAGBAAABgQAAAQEAAAGBAAABgQAAAgD8AAGBAAABgQAAAgD8AAIBAAABgQAAAQEAAAIBAAABgwAAAQEAAAIBAAABgQAAAQEAAAIBAAABgQAAAgD8AAIBAAABgwAAAgD8AAIBA/////wAA/7//////AAD/v/////8AAP+//////wAA/78AAP9//3//vwAA/3//f/+/AAD/f/9//78AAP9//3//v/9/AAD//////38AAP//////fwAA//////9/AAD//////3////9//7//f////3//v/9/////f/+//3////9//7////9//////////3//////////f/////////9///////9//3////+//3//f////7//f/9/////v/9//3////+//////wAA/7//////AAD/v/////8AAP+//////wAA/78AAP9//3//vwAA/3//f/+/AAD/f/9//78AAP9//3//v/9/AAD//////38AAP//////fwAA//////9/AAD//////3////9//7//f////3//v/9/////f/+//3////9//7////9//////////3//////////f/////////9///////9//3////+//3//f////7//f/9/////v/9//3////+//////wAA/7//////AAD/v/////8AAP+//////wAA/78AAP9//3//vwAA/3//f/+/AAD/f/9//78AAP9//3//v/9/AAD//////38AAP//////fwAA//////9/AAD//////3////9//7//f////3//v/9/////f/+//3////9//7////9//////////3//////////f/////////9///////9//3////+//3//f////7//f/9/////v/9//3////+//////wAA/7//////AAD/v/////8AAP+//////wAA/78AAP9//3//vwAA/3//f/+/AAD/f/9//78AAP9//3//v/9/AAD//////38AAP//////fwAA//////9/AAD//////3////9//7//f////3//v/9/////f/+//3////9//7////9//////////3//////////f/////////9///////9//3////+//3//f////7//f/9/////v/9//3////+//////wAA/7//////AAD/v/////8AAP+//////wAA/78AAP9//3//vwAA/3//f/+/AAD/f/9//78AAP9//3//v/9/AAD//////38AAP//////fwAA//////9/AAD//////3////9//7//f////3//v/9/////f/+//3////9//7////9//////////3//////////f/////////9///////9//3////+//3//f////7//f/9/////v/9//3////+/") +}] + +[sub_resource type="ArrayOccluder3D" id="ArrayOccluder3D_73hyv"] +vertices = PackedVector3Array(-4, 1, -4, -4, 0.5, -4, 4, 0.5, -4, 4, 1, -4, -4, 1, -4, -4, 1, 4, -4, 0.5, 4, -4, 0.5, -4, 4, 0.5, -4, -4, 0.5, -4, -4, 0.5, 4, 4, 0.5, 4, 4, 1, -4, 4, 1, 4, -4, 1, 4, -4, 1, -4, 4, 1, -4, 4, 0.5, -4, 4, 0.5, 4, 4, 1, 4, -4, 1, 4, 4, 1, 4, 4, 0.5, 4, -4, 0.5, 4, -4, 3, -4, -4, 1, -4, 4, 1, -4, 4, 3, -4, -4, 3, -4, -4, 3, -3.5, -4, 1, -3.5, -4, 1, -4, 4, 1, -4, -4, 1, -4, -4, 1, -3.5, 4, 1, -3.5, 4, 3, -4, 4, 3, -3.5, -4, 3, -3.5, -4, 3, -4, 4, 3, -4, 4, 1, -4, 4, 1, -3.5, 4, 3, -3.5, -4, 3, -3.5, 4, 3, -3.5, 4, 1, -3.5, -4, 1, -3.5, -4, 3, -3.5, -4, 1, -3.5, -3.5, 1, -3.5, -3.5, 3, -3.5, -4, 3, -3.5, -4, 3, 4, -4, 1, 4, -4, 1, -3.5, -3.5, 1, -3.5, -4, 1, -3.5, -4, 1, 4, -3.5, 1, 4, -3.5, 3, -3.5, -3.5, 3, 4, -4, 3, 4, -4, 3, -3.5, -3.5, 3, -3.5, -3.5, 1, -3.5, -3.5, 1, 4, -3.5, 3, 4, -4, 3, 4, -3.5, 3, 4, -3.5, 1, 4, -4, 1, 4, 3.5, 3, -3.5, 3.5, 1, -3.5, 4, 1, -3.5, 4, 3, -3.5, 3.5, 3, -3.5, 3.5, 3, 4, 3.5, 1, 4, 3.5, 1, -3.5, 4, 1, -3.5, 3.5, 1, -3.5, 3.5, 1, 4, 4, 1, 4, 4, 3, -3.5, 4, 3, 4, 3.5, 3, 4, 3.5, 3, -3.5, 4, 3, -3.5, 4, 1, -3.5, 4, 1, 4, 4, 3, 4, 3.5, 3, 4, 4, 3, 4, 4, 1, 4, 3.5, 1, 4, -3.5, 3, 3.5, -3.5, 1, 3.5, 3.5, 1, 3.5, 3.5, 3, 3.5, -3.5, 3, 3.5, -3.5, 3, 4, -3.5, 1, 4, -3.5, 1, 3.5, 3.5, 1, 3.5, -3.5, 1, 3.5, -3.5, 1, 4, 3.5, 1, 4, 3.5, 3, 3.5, 3.5, 3, 4, -3.5, 3, 4, -3.5, 3, 3.5, 3.5, 3, 3.5, 3.5, 1, 3.5, 3.5, 1, 4, 3.5, 3, 4, -3.5, 3, 4, 3.5, 3, 4, 3.5, 1, 4, -3.5, 1, 4) +indices = PackedInt32Array(0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13, 14, 12, 14, 15, 16, 17, 18, 16, 18, 19, 20, 21, 22, 20, 22, 23, 24, 25, 26, 24, 26, 27, 28, 29, 30, 28, 30, 31, 32, 33, 34, 32, 34, 35, 36, 37, 38, 36, 38, 39, 40, 41, 42, 40, 42, 43, 44, 45, 46, 44, 46, 47, 48, 49, 50, 48, 50, 51, 52, 53, 54, 52, 54, 55, 56, 57, 58, 56, 58, 59, 60, 61, 62, 60, 62, 63, 64, 65, 66, 64, 66, 67, 68, 69, 70, 68, 70, 71, 72, 73, 74, 72, 74, 75, 76, 77, 78, 76, 78, 79, 80, 81, 82, 80, 82, 83, 84, 85, 86, 84, 86, 87, 88, 89, 90, 88, 90, 91, 92, 93, 94, 92, 94, 95, 96, 97, 98, 96, 98, 99, 100, 101, 102, 100, 102, 103, 104, 105, 106, 104, 106, 107, 108, 109, 110, 108, 110, 111, 112, 113, 114, 112, 114, 115, 116, 117, 118, 116, 118, 119) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_nxk1u"] +points = PackedVector3Array(-4, 1, -4, -4, 0.5, -4, 4, 0.5, -4, 4, 1, -4, -4, 1, 4, -4, 0.5, 4, 4, 0.5, 4, 4, 1, 4) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_nqwqe"] +points = PackedVector3Array(-4, 3, -4, -4, 1, -4, 4, 1, -4, 4, 3, -4, -4, 3, -3.5, -4, 1, -3.5, 4, 1, -3.5, 4, 3, -3.5) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_trskx"] +points = PackedVector3Array(-4, 3, -3.5, -4, 1, -3.5, -3.5, 1, -3.5, -3.5, 3, -3.5, -4, 3, 4, -4, 1, 4, -3.5, 1, 4, -3.5, 3, 4) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_hhok7"] +points = PackedVector3Array(3.5, 3, -3.5, 3.5, 1, -3.5, 4, 1, -3.5, 4, 3, -3.5, 3.5, 3, 4, 3.5, 1, 4, 4, 1, 4, 4, 3, 4) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_5xf4s"] +points = PackedVector3Array(-3.5, 3, 3.5, -3.5, 1, 3.5, 3.5, 1, 3.5, 3.5, 3, 3.5, -3.5, 3, 4, -3.5, 1, 4, 3.5, 1, 4, 3.5, 3, 4) + +[node name="Factory4" type="Node3D"] + +[node name="GameController" parent="." node_paths=PackedStringArray("_cameraTarget") instance=ExtResource("1_w3okp")] +_cameraTarget = NodePath("../CameraTarget") +MapResource = ExtResource("2_f1ieg") +SpawnMarkers = Dictionary[int, NodePath]({ +0: NodePath("../StartPosition") +}) + +[node name="DirectionalLight3D_Original" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.442606, -0.744379, 0.5, 0.287606, 0.645974, 0.707107, -0.849343, -0.169167, 0.5, 28.5973, 5.82742, 17.535) +visible = false +light_energy = 1.375 +light_bake_mode = 1 +shadow_enabled = true + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.401703, -0.767225, 0.5, 0.322119, 0.629476, 0.707107, -0.857248, -0.122987, 0.5, 28.5973, 5.82742, 17.535) +light_energy = 1.375 +light_bake_mode = 1 + +[node name="DirectionalLight3D2" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.0306036, -0.825802, -0.56313, -0.675985, -0.43211, 0.596931, -0.73628, 0.362399, -0.571454, 27.8154, 5.82742, 13.9456) +light_energy = 0.932 +light_bake_mode = 1 +shadow_enabled = true +shadow_blur = 0.51 +sky_mode = 1 + +[node name="StartPosition" type="Marker3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.46095562, 1.4927001, -1.4939041) +script = ExtResource("3_555m8") + +[node name="CameraTarget" type="Marker3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.0461216, 2.33215, 2.5474238) +script = ExtResource("4_f1ieg") + +[node name="Camera3D" type="Camera3D" parent="."] +physics_interpolation_mode = 1 +transform = Transform3D(0.7071068, -0.49999997, 0.50000006, 0, 0.7071069, 0.70710677, -0.7071068, -0.49999997, 0.50000006, -3.7983856, 7.935, 5.0604153) +projection = 1 +size = 8.0 +script = ExtResource("5_unwtk") +MaxAimOffsetDistance = 16.0 +CameraOffset = Vector3(8, 12, 8) +TargetPath = NodePath("../CameraTarget") + +[node name="AudioStreamPlayer2D" parent="." instance=ExtResource("7_mtei5")] +autoplay = true +MusicData = ExtResource("8_bv7qr") + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_d6hgs") +camera_attributes = SubResource("CameraAttributesPractical_w45nv") + +[node name="FuncGodotMap" type="Node3D" parent="."] +script = ExtResource("8_f1ieg") +local_map_file = "uid://dbv5p8qyjy6u4" +map_settings = ExtResource("9_unwtk") +metadata/_custom_type_script = "uid://kno58homctew" + +[node name="entity_0_worldspawn" type="StaticBody3D" parent="FuncGodotMap" groups=["Solid"]] +collision_mask = 0 +script = ExtResource("10_eflie") + +[node name="entity_0_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_0_worldspawn"] +mesh = SubResource("ArrayMesh_04e2y") + +[node name="entity_0_occluder_instance" type="OccluderInstance3D" parent="FuncGodotMap/entity_0_worldspawn"] +occluder = SubResource("ArrayOccluder3D_73hyv") + +[node name="entity_0_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_0_worldspawn"] +shape = SubResource("ConvexPolygonShape3D_nxk1u") + +[node name="entity_0_brush_1_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_0_worldspawn"] +shape = SubResource("ConvexPolygonShape3D_nqwqe") + +[node name="entity_0_brush_2_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_0_worldspawn"] +shape = SubResource("ConvexPolygonShape3D_trskx") + +[node name="entity_0_brush_3_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_0_worldspawn"] +shape = SubResource("ConvexPolygonShape3D_hhok7") + +[node name="entity_0_brush_4_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_0_worldspawn"] +shape = SubResource("ConvexPolygonShape3D_5xf4s") + +[node name="entity_1_actor_teleporter" parent="FuncGodotMap" instance=ExtResource("12_mtei5")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.5, 1.0625, -2.5) + +[node name="entity_2_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -2.25, 1.25, -2.5) + +[node name="entity_3_actor_locker" parent="FuncGodotMap" instance=ExtResource("14_14ntx")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 3, 1.75, -2.75) diff --git a/IsoTest/IsoMapTest3.tscn b/IsoTest/IsoMapTest3.tscn index b57cc90a..efffd55a 100644 --- a/IsoTest/IsoMapTest3.tscn +++ b/IsoTest/IsoMapTest3.tscn @@ -16,7 +16,7 @@ reflected_light_source = 1 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_w45nv"] -[node name="IsoMapTest2" type="Node3D"] +[node name="Factory3" type="Node3D"] [node name="GameController" parent="." node_paths=PackedStringArray("_cameraTarget") instance=ExtResource("1_d6hgs")] _cameraTarget = NodePath("../CameraTarget") diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index 2d4c4ceb..bf735a2d 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=48 format=3 uid="uid://d1lc8lhq1b05p"] +[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=50 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"] @@ -15,6 +15,7 @@ [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"] [ext_resource type="Resource" uid="uid://bxju78og0t8ca" path="res://Resources/Maps/3D/IsoMapTest3.tres" id="14_vq1um"] +[ext_resource type="Resource" uid="uid://bwg6xki3d8yow" path="res://Resources/Maps/3D/Factory4_Map.tres" id="15_hougo"] [sub_resource type="Resource" id="Resource_qnbi6"] script = ExtResource("2_tnajf") @@ -208,6 +209,12 @@ Map = ExtResource("14_vq1um") _name = "Factory 3" metadata/_custom_type_script = "uid://dnthdjrx78u6m" +[sub_resource type="Resource" id="Resource_57q5n"] +script = ExtResource("2_tnajf") +Map = ExtResource("15_hougo") +_name = "Factory 4" +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"), SubResource("Resource_uqr0b"), SubResource("Resource_3pxnb")]) +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"), SubResource("Resource_3pxnb"), SubResource("Resource_57q5n")]) diff --git a/Resources/Maps/3D/Factory4_Map.tres b/Resources/Maps/3D/Factory4_Map.tres new file mode 100644 index 00000000..6f97a292 --- /dev/null +++ b/Resources/Maps/3D/Factory4_Map.tres @@ -0,0 +1,16 @@ +[gd_resource type="Resource" script_class="MapResource" load_steps=3 format=3 uid="uid://bwg6xki3d8yow"] + +[ext_resource type="Resource" uid="uid://cn8tu4jct04rp" path="res://Resources/StartData/Pistol_Start.tres" id="1_kee3v"] +[ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="2_ap3e7"] + +[resource] +script = ExtResource("2_ap3e7") +MapId = &"Factory4" +MapName = null +MapDescription = null +ScenePath = &"D:/Maddo/cirnogodot/IsoTest/Factory4.tscn" +NextMap = &"Factory5" +WeaponsAllowed = true +StartData = ExtResource("1_kee3v") +MapType = 1 +metadata/_custom_type_script = "uid://quy4d4tgvqfy" diff --git a/Resources/Maps/Briefing_1.tres b/Resources/Maps/Briefing_1.tres index fd8d06c7..0e15958b 100644 --- a/Resources/Maps/Briefing_1.tres +++ b/Resources/Maps/Briefing_1.tres @@ -16,5 +16,6 @@ MapId = null MapName = &"Briefing" MapDescription = null ScenePath = &"uid://dcn2o6hllas78" +NextMap = null StartData = SubResource("Resource_7e7pr") metadata/_custom_type_script = "uid://quy4d4tgvqfy" diff --git a/Resources/Maps/MapsDatabase.tres b/Resources/Maps/MapsDatabase.tres index 4840ff29..79019b76 100644 --- a/Resources/Maps/MapsDatabase.tres +++ b/Resources/Maps/MapsDatabase.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="MapsDatabase" load_steps=13 format=3 uid="uid://blf2ii0j3fqil"] +[gd_resource type="Resource" script_class="MapsDatabase" load_steps=14 format=3 uid="uid://blf2ii0j3fqil"] [ext_resource type="Resource" uid="uid://dsvcyd0f5br85" path="res://Resources/Maps/Briefing_1.tres" id="1_axa7o"] [ext_resource type="Resource" uid="uid://b4u3cs6ietmow" path="res://Resources/Maps/Tutorial.tres" id="1_jm16h"] @@ -12,8 +12,9 @@ [ext_resource type="Resource" uid="uid://bq2o78engsuyt" path="res://Resources/Maps/3D/IsoMapTest2.tres" id="9_8jebd"] [ext_resource type="Resource" uid="uid://bxju78og0t8ca" path="res://Resources/Maps/3D/IsoMapTest3.tres" id="10_2s8ya"] [ext_resource type="Resource" uid="uid://b32mqmglcdo64" path="res://Resources/Maps/3D/Tutorial_3D.tres" id="11_ejvbj"] +[ext_resource type="Resource" uid="uid://bwg6xki3d8yow" path="res://Resources/Maps/3D/Factory4_Map.tres" id="12_2s8ya"] [resource] script = ExtResource("1_p3u82") -Maps = Array[Object]([ExtResource("1_axa7o"), ExtResource("1_jm16h"), ExtResource("2_2lffu"), ExtResource("4_8yujj"), ExtResource("3_b8vvn"), ExtResource("4_axa7o"), ExtResource("5_8yujj"), ExtResource("6_2lffu"), ExtResource("9_8jebd"), ExtResource("10_2s8ya"), ExtResource("11_ejvbj")]) +Maps = Array[Object]([ExtResource("1_axa7o"), ExtResource("1_jm16h"), ExtResource("2_2lffu"), ExtResource("4_8yujj"), ExtResource("3_b8vvn"), ExtResource("4_axa7o"), ExtResource("5_8yujj"), ExtResource("6_2lffu"), ExtResource("9_8jebd"), ExtResource("10_2s8ya"), ExtResource("11_ejvbj"), ExtResource("12_2s8ya")]) metadata/_custom_type_script = "uid://denacldr388km" diff --git a/Resources/Maps/Tutorial.tres b/Resources/Maps/Tutorial.tres index 0ba2fccc..34c7e336 100644 --- a/Resources/Maps/Tutorial.tres +++ b/Resources/Maps/Tutorial.tres @@ -15,6 +15,7 @@ MapId = null MapName = &"Tutorial" MapDescription = &"A VR simulation for training" ScenePath = &"uid://bpnahwxmjgb6t" +NextMap = null WeaponsAllowed = true StartData = SubResource("Resource_dpitu") metadata/_custom_type_script = "uid://quy4d4tgvqfy"