diff --git a/3D/ICCOffice3D.tscn b/3D/ICCOffice3D.tscn index 14a03d83..15d52a12 100644 --- a/3D/ICCOffice3D.tscn +++ b/3D/ICCOffice3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://chcfi75y8wmhy"] +[gd_scene load_steps=14 format=3 uid="uid://chcfi75y8wmhy"] [ext_resource type="Texture2D" uid="uid://s3dylmxk306" path="res://Sprites/SingleTiles/Carpet_Floor.png" id="1_qsr6w"] [ext_resource type="Texture2D" uid="uid://bucmiheu0osiq" path="res://Sprites/SingleTiles/Floor2.png" id="3_d010f"] @@ -6,7 +6,8 @@ [ext_resource type="Texture2D" uid="uid://lnfcp2p5lv86" path="res://Sprites/SingleTiles/Floor2_n.png" id="4_h5tho"] [ext_resource type="PackedScene" uid="uid://birl7xlncrsbl" path="res://3D/Vase/VaseWithPlant.tscn" id="5_50xfc"] [ext_resource type="Texture2D" uid="uid://bpkgbma1u85dp" path="res://Sprites/SingleTiles/Table_Top.png" id="6_gmsgo"] -[ext_resource type="Texture2D" uid="uid://j805em7kmc78" path="res://Sprites/Briefing/High_Rise_Office_Background.png" id="7_688nh"] +[ext_resource type="Texture2D" uid="uid://d3mq57jox55be" path="res://ExternalMaterial/SkyscraperTexture/Sky.png" id="7_qsr6w"] +[ext_resource type="PackedScene" uid="uid://bngw253vljk8b" path="res://3D/Skyscraper/skyscraper.tscn" id="8_qsr6w"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3trh6"] albedo_texture = ExtResource("1_qsr6w") @@ -36,11 +37,18 @@ texture_filter = 0 albedo_texture = ExtResource("6_gmsgo") texture_filter = 0 +[sub_resource type="ORMMaterial3D" id="ORMMaterial3D_qsr6w"] +transparency = 1 +albedo_color = Color(0.265832, 0.239456, 0.864376, 0.364) + [node name="BriefingRoom3d" type="Node3D"] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.99884, 0, -0.0481526, -0.0295648, 0.78932, 0.61327, 0.0380078, 0.613982, -0.788404, 0, 4.85631, -5.31146) +[node name="DirectionalLight3D2" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.961991, -0.144165, 0.231926, -0.0295648, 0.78932, 0.61327, -0.271476, -0.596817, 0.755057, 0, 4.85631, -5.31146) + [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(0.962209, 0, 0.272314, 0, 1, 0, -0.272314, 0, 0.962209, 0.454159, 2, 1.2103) fov = 50.0 @@ -99,10 +107,36 @@ transform = Transform3D(1.38074, 0, 0, 0, 1, 0, 0, 0, 0.676222, 0.0885206, 1.157 material = SubResource("StandardMaterial3D_688nh") [node name="Background" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.482, 5.00773, -126.613) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -5.11515, -14.0386, -126.613) cast_shadow = 0 ignore_occlusion_culling = true pixel_size = 0.8 billboard = 2 texture_filter = 0 -texture = ExtResource("7_688nh") +texture = ExtResource("7_qsr6w") + +[node name="Skyscraper" parent="." instance=ExtResource("8_qsr6w")] +transform = Transform3D(1, 0, 0, 0, 7.34509, 0, 0, 0, 1, 0.288437, 0.777918, -7.62031) + +[node name="Skyscraper2" parent="." instance=ExtResource("8_qsr6w")] +transform = Transform3D(1, 0, 0, 0, 7.34509, 0, 0, 0, 1, -3.22998, -0.390069, -11.5703) + +[node name="Skyscraper3" parent="." instance=ExtResource("8_qsr6w")] +transform = Transform3D(1, 0, 0, 0, 7.34509, 0, 0, 0, 1, 1.71518, 0.576806, -9.88042) + +[node name="Skyscraper4" parent="." instance=ExtResource("8_qsr6w")] +transform = Transform3D(1, 0, 0, 0, 7.34509, 0, 0, 0, 1, -6.5195, 0.777918, -15.523) + +[node name="Skyscraper5" parent="." instance=ExtResource("8_qsr6w")] +transform = Transform3D(1, 0, 0, 0, 7.34509, 0, 0, 0, 1, 1.76754, 0.777918, -20.1093) + +[node name="Skyscraper6" parent="." instance=ExtResource("8_qsr6w")] +transform = Transform3D(0.886009, 0, -0.463667, 0, 7.34509, 0, 0.463667, 0, 0.886009, -3.55557, -0.748036, -20.1185) + +[node name="Skyscraper7" parent="." instance=ExtResource("8_qsr6w")] +transform = Transform3D(1, 0, 0, 0, 7.34509, 0, 0, 0, 1, -2.84565, 0.777918, -26.9985) + +[node name="Window" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0505791, 1.78631, -1.95604) +material_override = SubResource("ORMMaterial3D_qsr6w") +size = Vector3(2.175, 1.401, 0.055) diff --git a/3D/Skyscraper/skyscraper.tscn b/3D/Skyscraper/skyscraper.tscn new file mode 100644 index 00000000..ef54749f --- /dev/null +++ b/3D/Skyscraper/skyscraper.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=3 format=3 uid="uid://bngw253vljk8b"] + +[ext_resource type="Texture2D" uid="uid://tw5qo8em7tvm" path="res://ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png" id="1_y8rey"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pq187"] +albedo_texture = ExtResource("1_y8rey") +uv1_scale = Vector3(2, 2, 1) +uv1_triplanar = true +uv1_world_triplanar = true +texture_filter = 0 + +[node name="Skyscraper" type="CSGBox3D"] +transform = Transform3D(1, 0, 0, 0, 7.34509, 0, 0, 0, 1, 0, 0, 0) +material_override = SubResource("StandardMaterial3D_pq187") diff --git a/Dialogue/Styles/VN.tres b/Dialogue/Styles/VN.tres index d17f9ebd..56e8b117 100644 --- a/Dialogue/Styles/VN.tres +++ b/Dialogue/Styles/VN.tres @@ -39,11 +39,15 @@ overrides = {} script = ExtResource("1_47mos") scene = ExtResource("5_mp7sv") overrides = { +"box_color_custom": "Color(1, 1, 1, 1)", +"box_color_use_global": "false", "box_margin_bottom": "1.0", "box_panel": "\"res://Resources/Styles/PixelStyleBoxRed.tres\"", "box_size": "Vector2(300, 50)", +"name_label_box_modulate": "Color(1, 1, 1, 1)", "name_label_box_offset": "Vector2(0, 8)", "name_label_box_panel": "\"res://Resources/Styles/PixelStyleBoxRed.tres\"", +"name_label_box_use_global_color": "false", "name_label_custom_font_size": "11.0", "next_indicator_size": "Vector2(12, 12)", "text_size": "6.0", diff --git a/ExternalMaterial/SkyscraperTexture/Sky.png b/ExternalMaterial/SkyscraperTexture/Sky.png new file mode 100644 index 00000000..24bfd4ad --- /dev/null +++ b/ExternalMaterial/SkyscraperTexture/Sky.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53f06d330a7f86690e9ab4004485c52f9ae08d62af32961fc28e48d49963c5d0 +size 2854 diff --git a/ExternalMaterial/SkyscraperTexture/Sky.png.import b/ExternalMaterial/SkyscraperTexture/Sky.png.import new file mode 100644 index 00000000..fab04c0e --- /dev/null +++ b/ExternalMaterial/SkyscraperTexture/Sky.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d3mq57jox55be" +path.s3tc="res://.godot/imported/Sky.png-b176448410fb5ed8e50e35bf1b821fcc.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://ExternalMaterial/SkyscraperTexture/Sky.png" +dest_files=["res://.godot/imported/Sky.png-b176448410fb5ed8e50e35bf1b821fcc.s3tc.ctex"] + +[params] + +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=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 diff --git a/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png new file mode 100644 index 00000000..69192428 --- /dev/null +++ b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:550ae894cd34c488fdcde288ef79f88da077597f7f8385a0fe0ccfcc6ae29b55 +size 2013 diff --git a/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png.import b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png.import new file mode 100644 index 00000000..3db75de3 --- /dev/null +++ b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://tw5qo8em7tvm" +path.s3tc="res://.godot/imported/SkyscraperTexture.png-f2f594bcfa2e88c75e7ad982c7f975a7.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://ExternalMaterial/SkyscraperTexture/SkyscraperTexture.png" +dest_files=["res://.godot/imported/SkyscraperTexture.png-f2f594bcfa2e88c75e7ad982c7f975a7.s3tc.ctex"] + +[params] + +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=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 diff --git a/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.pxc b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.pxc new file mode 100644 index 00000000..cd683281 Binary files /dev/null and b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.pxc differ diff --git a/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.pxc1 b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.pxc1 new file mode 100644 index 00000000..c65ff8b2 Binary files /dev/null and b/ExternalMaterial/SkyscraperTexture/SkyscraperTexture.pxc1 differ diff --git a/Resources/Maps/Briefing_1.tres b/Resources/Maps/Briefing_1.tres new file mode 100644 index 00000000..f2909d1a --- /dev/null +++ b/Resources/Maps/Briefing_1.tres @@ -0,0 +1,22 @@ +[gd_resource type="Resource" script_class="MapResource" load_steps=5 format=3 uid="uid://dsvcyd0f5br85"] + +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_7e3mb"] +[ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="1_x864d"] +[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="2_bbif0"] + +[sub_resource type="Resource" id="Resource_7e7pr"] +script = ExtResource("2_bbif0") +EggIndex = 0 +StartingEquipment = Array[ExtResource("1_7e3mb")]([]) +RemoveEquipment = Array[ExtResource("1_7e3mb")]([]) +metadata/_custom_type_script = "uid://mja0rk7n2kln" + +[resource] +script = ExtResource("1_x864d") +LevelId = -1 +MapName = &"Briefing" +MapDescription = null +ScenePath = &"uid://dcn2o6hllas78" +WeaponsAllowed = false +StartData = SubResource("Resource_7e7pr") +metadata/_custom_type_script = "uid://quy4d4tgvqfy" diff --git a/Resources/Weapons/EnemyWeapon.tres b/Resources/Weapons/EnemyWeapon.tres index f4e75c25..fab88ad3 100644 --- a/Resources/Weapons/EnemyWeapon.tres +++ b/Resources/Weapons/EnemyWeapon.tres @@ -12,9 +12,9 @@ BulletCapacity = 4 ReloadTime = 1.0 AutoReload = true InfiniteAmmo = true +ItemKey = null +AmmoKey = null BulletsPerShot = 1 SpreadAngle = 0.0 RandomSpread = 0.0 -ItemKey = null -AmmoKey = null _rotationOffset = 0.0 diff --git a/Resources/Weapons/NuclearGun.tres b/Resources/Weapons/NuclearGun.tres index 477f1fc3..fe74f3b8 100644 --- a/Resources/Weapons/NuclearGun.tres +++ b/Resources/Weapons/NuclearGun.tres @@ -12,9 +12,9 @@ BulletCapacity = 5 ReloadTime = 0.5 AutoReload = true InfiniteAmmo = false +ItemKey = &"NUCLEAR_GUN" +AmmoKey = &"NUCLEAR_AMMO" BulletsPerShot = 1 SpreadAngle = 0.0 RandomSpread = 0.0 -ItemKey = &"NUCLEAR_GUN" -AmmoKey = &"NUCLEAR_AMMO" _rotationOffset = 0.0 diff --git a/Scenes/HUD/DifficultySelection.tscn b/Scenes/HUD/DifficultySelection.tscn index 51f0e18d..33c1413c 100644 --- a/Scenes/HUD/DifficultySelection.tscn +++ b/Scenes/HUD/DifficultySelection.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=11 format=3 uid="uid://7jevaemboajn"] [ext_resource type="Script" uid="uid://bst70cv5631js" path="res://Scripts/UI/DifficultyMenu.cs" id="1_m1stl"] -[ext_resource type="Resource" uid="uid://b4u3cs6ietmow" path="res://Resources/Maps/Tutorial.tres" id="2_dmnj4"] +[ext_resource type="Resource" uid="uid://dsvcyd0f5br85" path="res://Resources/Maps/Briefing_1.tres" id="2_bl7tq"] [ext_resource type="Theme" uid="uid://dnsadvmunm76k" path="res://Resources/Styles/MainMenuButtons.tres" id="3_0vv33"] [ext_resource type="Texture2D" uid="uid://b4fhb0wyc5vw" path="res://Sprites/UI/BackIcon.png" id="4_bl7tq"] [ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="5_bl7tq"] @@ -21,7 +21,7 @@ grow_horizontal = 2 grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_0vv33") script = ExtResource("1_m1stl") -StartMap = ExtResource("2_dmnj4") +StartMap = ExtResource("2_bl7tq") [node name="HBoxContainer" type="HBoxContainer" parent="."] layout_mode = 2 diff --git a/Scenes/Maps/Level1_End_Cutscene.tscn b/Scenes/Maps/Level1_End_Cutscene.tscn index 5051bee2..842ebd9f 100644 --- a/Scenes/Maps/Level1_End_Cutscene.tscn +++ b/Scenes/Maps/Level1_End_Cutscene.tscn @@ -44,6 +44,7 @@ render_target_update_mode = 4 [node name="BriefingRoom3d" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_d3qhx")] [node name="CRT" type="TextureRect" parent="."] +visible = false top_level = true material = SubResource("ShaderMaterial_3eou1") anchors_preset = 15