diff --git a/Assets/Model/Objects/Furnace.glb b/Assets/Model/Objects/Furnace.glb new file mode 100644 index 0000000..a38016a Binary files /dev/null and b/Assets/Model/Objects/Furnace.glb differ diff --git a/Assets/Model/Objects/Furnace.glb.import b/Assets/Model/Objects/Furnace.glb.import new file mode 100644 index 0000000..23dc827 --- /dev/null +++ b/Assets/Model/Objects/Furnace.glb.import @@ -0,0 +1,41 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://2lvluxmfprmv" +path="res://.godot/imported/Furnace.glb-552f8750d1dd10d7510f711c712b8897.scn" + +[deps] + +source_file="res://Assets/Model/Objects/Furnace.glb" +dest_files=["res://.godot/imported/Furnace.glb-552f8750d1dd10d7510f711c712b8897.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/IronOxidated/M_IronOxidated.tres" +}, +"Paint": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres" +} +} +} diff --git a/Assets/Model/Objects/Trashcan.glb b/Assets/Model/Objects/Trashcan.glb new file mode 100644 index 0000000..f4608ee Binary files /dev/null and b/Assets/Model/Objects/Trashcan.glb differ diff --git a/Assets/Model/Objects/Trashcan.glb.import b/Assets/Model/Objects/Trashcan.glb.import new file mode 100644 index 0000000..b01a976 --- /dev/null +++ b/Assets/Model/Objects/Trashcan.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dtur8jn3vpeuv" +path="res://.godot/imported/Trashcan.glb-e56c10fe18c841e89ba098a6906f8072.scn" + +[deps] + +source_file="res://Assets/Model/Objects/Trashcan.glb" +dest_files=["res://.godot/imported/Trashcan.glb-e56c10fe18c841e89ba098a6906f8072.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Metall": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres" +} +} +} diff --git a/Assets/Model/Pipes/PipeDark.glb b/Assets/Model/Pipes/PipeDark.glb new file mode 100644 index 0000000..a677317 Binary files /dev/null and b/Assets/Model/Pipes/PipeDark.glb differ diff --git a/Assets/Model/Pipes/PipeDark.glb.import b/Assets/Model/Pipes/PipeDark.glb.import new file mode 100644 index 0000000..49fdcad --- /dev/null +++ b/Assets/Model/Pipes/PipeDark.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cpjwodk8lb7ed" +path="res://.godot/imported/PipeDark.glb-78dd61a414feed6e5a72476037d59468.scn" + +[deps] + +source_file="res://Assets/Model/Pipes/PipeDark.glb" +dest_files=["res://.godot/imported/PipeDark.glb-78dd61a414feed6e5a72476037d59468.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material.001": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanIronBlack.tres" +} +} +} diff --git a/Assets/Model/Train/TrainWallInterior.glb.import b/Assets/Model/Train/TrainWallInterior.glb.import index d259bab..8d78541 100644 --- a/Assets/Model/Train/TrainWallInterior.glb.import +++ b/Assets/Model/Train/TrainWallInterior.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://08f17h0im640" +uid="uid://p7dpfo0na253" path="res://.godot/imported/TrainWallInterior.glb-0506d2ea33a1bc6d3925adbc56dde8cc.scn" [deps] @@ -20,7 +20,7 @@ nodes/root_scale=1.0 meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true -meshes/light_baking=1 +meshes/light_baking=2 meshes/lightmap_texel_size=0.2 skins/use_named_skins=true animation/import=true diff --git a/Assets/Model/Train/TrainWallInterior.glb.unwrap_cache b/Assets/Model/Train/TrainWallInterior.glb.unwrap_cache new file mode 100644 index 0000000..f846d03 Binary files /dev/null and b/Assets/Model/Train/TrainWallInterior.glb.unwrap_cache differ diff --git a/Assets/Model/TrainExterior/TrainFront.glb b/Assets/Model/TrainExterior/TrainFront.glb new file mode 100644 index 0000000..c0cafa8 Binary files /dev/null and b/Assets/Model/TrainExterior/TrainFront.glb differ diff --git a/Assets/Model/TrainExterior/TrainFront.glb.import b/Assets/Model/TrainExterior/TrainFront.glb.import new file mode 100644 index 0000000..db4ed9a --- /dev/null +++ b/Assets/Model/TrainExterior/TrainFront.glb.import @@ -0,0 +1,41 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://17xxcaf81ri8" +path="res://.godot/imported/TrainFront.glb-83867d3918492169618c5c217a522881.scn" + +[deps] + +source_file="res://Assets/Model/TrainExterior/TrainFront.glb" +dest_files=["res://.godot/imported/TrainFront.glb-83867d3918492169618c5c217a522881.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Copper": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperOxidated/M_Copper.tres" +}, +"CopperNew": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanIronDark.tres" +} +} +} diff --git a/Assets/Model/TrainExterior/TrainLargeWheel.glb b/Assets/Model/TrainExterior/TrainLargeWheel.glb new file mode 100644 index 0000000..c9e7c65 Binary files /dev/null and b/Assets/Model/TrainExterior/TrainLargeWheel.glb differ diff --git a/Assets/Model/TrainExterior/TrainLargeWheel.glb.import b/Assets/Model/TrainExterior/TrainLargeWheel.glb.import new file mode 100644 index 0000000..bcaf504 --- /dev/null +++ b/Assets/Model/TrainExterior/TrainLargeWheel.glb.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c7hnriu67n0rh" +path="res://.godot/imported/TrainLargeWheel.glb-79f294b9cbe7a5346aa41173a9de3cc1.scn" + +[deps] + +source_file="res://Assets/Model/TrainExterior/TrainLargeWheel.glb" +dest_files=["res://.godot/imported/TrainLargeWheel.glb-79f294b9cbe7a5346aa41173a9de3cc1.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Copper": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperOxidated/M_Copper.tres" +}, +"CopperNew": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres" +}, +"Mat3": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanIronDark.tres" +} +} +} diff --git a/Assets/Model/TrainExterior/TrainLowerCover.fbx b/Assets/Model/TrainExterior/TrainLowerCover.fbx new file mode 100644 index 0000000..f9e2266 Binary files /dev/null and b/Assets/Model/TrainExterior/TrainLowerCover.fbx differ diff --git a/Assets/Model/TrainExterior/TrainLowerCover.glb b/Assets/Model/TrainExterior/TrainLowerCover.glb new file mode 100644 index 0000000..8f74ae9 Binary files /dev/null and b/Assets/Model/TrainExterior/TrainLowerCover.glb differ diff --git a/Assets/Model/TrainExterior/TrainLowerCover.glb.import b/Assets/Model/TrainExterior/TrainLowerCover.glb.import new file mode 100644 index 0000000..7622df3 --- /dev/null +++ b/Assets/Model/TrainExterior/TrainLowerCover.glb.import @@ -0,0 +1,41 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bs85ji27qx1p3" +path="res://.godot/imported/TrainLowerCover.glb-8d80bc63f6118ff06fb30f11cad52b85.scn" + +[deps] + +source_file="res://Assets/Model/TrainExterior/TrainLowerCover.glb" +dest_files=["res://.godot/imported/TrainLowerCover.glb-8d80bc63f6118ff06fb30f11cad52b85.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Copper": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperOxidated/M_Copper.tres" +}, +"Mat3": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/Wood/M_Wood.tres" +} +} +} diff --git a/Assets/Model/TrainExterior/TrainLowerWheelCover.glb b/Assets/Model/TrainExterior/TrainLowerWheelCover.glb new file mode 100644 index 0000000..c74df71 Binary files /dev/null and b/Assets/Model/TrainExterior/TrainLowerWheelCover.glb differ diff --git a/Assets/Model/TrainExterior/TrainLowerWheelCover.glb.import b/Assets/Model/TrainExterior/TrainLowerWheelCover.glb.import new file mode 100644 index 0000000..3412241 --- /dev/null +++ b/Assets/Model/TrainExterior/TrainLowerWheelCover.glb.import @@ -0,0 +1,41 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cnu4jnpyb3a5v" +path="res://.godot/imported/TrainLowerWheelCover.glb-d7128cb8e638fda4766ae5d4e9531a05.scn" + +[deps] + +source_file="res://Assets/Model/TrainExterior/TrainLowerWheelCover.glb" +dest_files=["res://.godot/imported/TrainLowerWheelCover.glb-d7128cb8e638fda4766ae5d4e9531a05.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Copper": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperOxidated/M_Copper.tres" +}, +"Mat3": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/Wood/M_Wood.tres" +} +} +} diff --git a/Assets/Model/Weapons/Canon.glb b/Assets/Model/Weapons/Canon.glb index 2a76f43..c7ea338 100644 Binary files a/Assets/Model/Weapons/Canon.glb and b/Assets/Model/Weapons/Canon.glb differ diff --git a/Assets/Textures/CopperNew/CleanIronBlack.tres b/Assets/Textures/CopperNew/CleanIronBlack.tres new file mode 100644 index 0000000..827042f --- /dev/null +++ b/Assets/Textures/CopperNew/CleanIronBlack.tres @@ -0,0 +1,13 @@ +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://lj3v582wxlr2"] + +[ext_resource type="Texture2D" uid="uid://dbjxy01lkuvle" path="res://Assets/Textures/CopperNew/copper_Metallic.png" id="1_dscyf"] +[ext_resource type="Texture2D" uid="uid://bh776vcqbunoi" path="res://Assets/Textures/CopperNew/copper_Normal.png" id="2_phum1"] +[ext_resource type="Texture2D" uid="uid://dwlxmetf7l5gf" path="res://Assets/Textures/CopperNew/copper_Rougness.png" id="3_te4es"] + +[resource] +albedo_color = Color(0.109804, 0.105882, 0.117647, 1) +metallic = 1.0 +metallic_texture = ExtResource("1_dscyf") +roughness_texture = ExtResource("3_te4es") +normal_enabled = true +normal_texture = ExtResource("2_phum1") diff --git a/Assets/Textures/CopperNew/CleanIronDark.tres b/Assets/Textures/CopperNew/CleanIronDark.tres index d2276d3..969f531 100644 --- a/Assets/Textures/CopperNew/CleanIronDark.tres +++ b/Assets/Textures/CopperNew/CleanIronDark.tres @@ -5,7 +5,7 @@ [ext_resource type="Texture2D" uid="uid://dwlxmetf7l5gf" path="res://Assets/Textures/CopperNew/copper_Rougness.png" id="3_hc3no"] [resource] -albedo_color = Color(0.52549, 0.509804, 0.54902, 1) +albedo_color = Color(0.427451, 0.419608, 0.45098, 1) metallic = 1.0 metallic_texture = ExtResource("1_x5t0h") roughness_texture = ExtResource("3_hc3no") diff --git a/Assets/Textures/IronOxidated/Copper_Ao.png b/Assets/Textures/IronOxidated/Copper_Ao.png new file mode 100644 index 0000000..b83090c Binary files /dev/null and b/Assets/Textures/IronOxidated/Copper_Ao.png differ diff --git a/Assets/Textures/IronOxidated/Copper_Ao.png.import b/Assets/Textures/IronOxidated/Copper_Ao.png.import new file mode 100644 index 0000000..419de2f --- /dev/null +++ b/Assets/Textures/IronOxidated/Copper_Ao.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dykvup1k25tqu" +path.s3tc="res://.godot/imported/Copper_Ao.png-326d01ceb46ec1b79b7be87491606cc5.s3tc.ctex" +path.etc2="res://.godot/imported/Copper_Ao.png-326d01ceb46ec1b79b7be87491606cc5.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/IronOxidated/Copper_Ao.png" +dest_files=["res://.godot/imported/Copper_Ao.png-326d01ceb46ec1b79b7be87491606cc5.s3tc.ctex", "res://.godot/imported/Copper_Ao.png-326d01ceb46ec1b79b7be87491606cc5.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Assets/Textures/IronOxidated/Copper_Diffuse.png b/Assets/Textures/IronOxidated/Copper_Diffuse.png new file mode 100644 index 0000000..5821675 Binary files /dev/null and b/Assets/Textures/IronOxidated/Copper_Diffuse.png differ diff --git a/Assets/Textures/IronOxidated/Copper_Diffuse.png.import b/Assets/Textures/IronOxidated/Copper_Diffuse.png.import new file mode 100644 index 0000000..e671f45 --- /dev/null +++ b/Assets/Textures/IronOxidated/Copper_Diffuse.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cnx52u4lagfkk" +path.s3tc="res://.godot/imported/Copper_Diffuse.png-3ee98165ada9420744b34d004ccb30e6.s3tc.ctex" +path.etc2="res://.godot/imported/Copper_Diffuse.png-3ee98165ada9420744b34d004ccb30e6.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/IronOxidated/Copper_Diffuse.png" +dest_files=["res://.godot/imported/Copper_Diffuse.png-3ee98165ada9420744b34d004ccb30e6.s3tc.ctex", "res://.godot/imported/Copper_Diffuse.png-3ee98165ada9420744b34d004ccb30e6.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Assets/Textures/IronOxidated/Copper_Metallic.png b/Assets/Textures/IronOxidated/Copper_Metallic.png new file mode 100644 index 0000000..7045536 Binary files /dev/null and b/Assets/Textures/IronOxidated/Copper_Metallic.png differ diff --git a/Assets/Textures/IronOxidated/Copper_Metallic.png.import b/Assets/Textures/IronOxidated/Copper_Metallic.png.import new file mode 100644 index 0000000..c679454 --- /dev/null +++ b/Assets/Textures/IronOxidated/Copper_Metallic.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://wn0p4sy380id" +path.s3tc="res://.godot/imported/Copper_Metallic.png-4fb904a2160eab47ad1e91089e72b886.s3tc.ctex" +path.etc2="res://.godot/imported/Copper_Metallic.png-4fb904a2160eab47ad1e91089e72b886.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/IronOxidated/Copper_Metallic.png" +dest_files=["res://.godot/imported/Copper_Metallic.png-4fb904a2160eab47ad1e91089e72b886.s3tc.ctex", "res://.godot/imported/Copper_Metallic.png-4fb904a2160eab47ad1e91089e72b886.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Assets/Textures/IronOxidated/Copper_Roughness.png b/Assets/Textures/IronOxidated/Copper_Roughness.png new file mode 100644 index 0000000..d93dcab Binary files /dev/null and b/Assets/Textures/IronOxidated/Copper_Roughness.png differ diff --git a/Assets/Textures/IronOxidated/Copper_Roughness.png.import b/Assets/Textures/IronOxidated/Copper_Roughness.png.import new file mode 100644 index 0000000..1ffa114 --- /dev/null +++ b/Assets/Textures/IronOxidated/Copper_Roughness.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2dy42ay5knhn" +path.s3tc="res://.godot/imported/Copper_Roughness.png-da1f97188b1325ad63a9383270e1bc3e.s3tc.ctex" +path.etc2="res://.godot/imported/Copper_Roughness.png-da1f97188b1325ad63a9383270e1bc3e.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/IronOxidated/Copper_Roughness.png" +dest_files=["res://.godot/imported/Copper_Roughness.png-da1f97188b1325ad63a9383270e1bc3e.s3tc.ctex", "res://.godot/imported/Copper_Roughness.png-da1f97188b1325ad63a9383270e1bc3e.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Assets/Textures/IronOxidated/Copper_output.png b/Assets/Textures/IronOxidated/Copper_output.png new file mode 100644 index 0000000..1a5e60f Binary files /dev/null and b/Assets/Textures/IronOxidated/Copper_output.png differ diff --git a/Assets/Textures/IronOxidated/Copper_output.png.import b/Assets/Textures/IronOxidated/Copper_output.png.import new file mode 100644 index 0000000..dc5f044 --- /dev/null +++ b/Assets/Textures/IronOxidated/Copper_output.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhnnkddb7sh7d" +path.s3tc="res://.godot/imported/Copper_output.png-f6d87d107fa2e1261e45aeac0401d58d.s3tc.ctex" +path.etc2="res://.godot/imported/Copper_output.png-f6d87d107fa2e1261e45aeac0401d58d.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/IronOxidated/Copper_output.png" +dest_files=["res://.godot/imported/Copper_output.png-f6d87d107fa2e1261e45aeac0401d58d.s3tc.ctex", "res://.godot/imported/Copper_output.png-f6d87d107fa2e1261e45aeac0401d58d.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://Assets/Textures/IronOxidated/Copper_output.png" +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/Assets/Textures/IronOxidated/M_IronOxidated.tres b/Assets/Textures/IronOxidated/M_IronOxidated.tres new file mode 100644 index 0000000..cb6decf --- /dev/null +++ b/Assets/Textures/IronOxidated/M_IronOxidated.tres @@ -0,0 +1,17 @@ +[gd_resource type="StandardMaterial3D" load_steps=6 format=3 uid="uid://bdm4mn7mnyqva"] + +[ext_resource type="Texture2D" uid="uid://cnx52u4lagfkk" path="res://Assets/Textures/IronOxidated/Copper_Diffuse.png" id="1_isvjr"] +[ext_resource type="Texture2D" uid="uid://dykvup1k25tqu" path="res://Assets/Textures/IronOxidated/Copper_Ao.png" id="2_ko6rl"] +[ext_resource type="Texture2D" uid="uid://wn0p4sy380id" path="res://Assets/Textures/IronOxidated/Copper_Metallic.png" id="3_1qrxd"] +[ext_resource type="Texture2D" uid="uid://bhnnkddb7sh7d" path="res://Assets/Textures/IronOxidated/Copper_output.png" id="4_cv4nk"] +[ext_resource type="Texture2D" uid="uid://b2dy42ay5knhn" path="res://Assets/Textures/IronOxidated/Copper_Roughness.png" id="5_wow3i"] + +[resource] +albedo_texture = ExtResource("1_isvjr") +metallic = 1.0 +metallic_texture = ExtResource("3_1qrxd") +roughness_texture = ExtResource("5_wow3i") +normal_enabled = true +normal_texture = ExtResource("4_cv4nk") +ao_enabled = true +ao_texture = ExtResource("2_ko6rl") diff --git a/Assets/Textures/Opera_senza_titolo (3).png b/Assets/Textures/Opera_senza_titolo (3).png new file mode 100644 index 0000000..57b2fb9 Binary files /dev/null and b/Assets/Textures/Opera_senza_titolo (3).png differ diff --git a/Assets/Textures/Opera_senza_titolo (3).png.import b/Assets/Textures/Opera_senza_titolo (3).png.import new file mode 100644 index 0000000..6dc69c0 --- /dev/null +++ b/Assets/Textures/Opera_senza_titolo (3).png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5nu7hitxgm2p" +path.s3tc="res://.godot/imported/Opera_senza_titolo (3).png-23e881f022353c47864987e0da03b76c.s3tc.ctex" +path.etc2="res://.godot/imported/Opera_senza_titolo (3).png-23e881f022353c47864987e0da03b76c.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Opera_senza_titolo (3).png" +dest_files=["res://.godot/imported/Opera_senza_titolo (3).png-23e881f022353c47864987e0da03b76c.s3tc.ctex", "res://.godot/imported/Opera_senza_titolo (3).png-23e881f022353c47864987e0da03b76c.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Assets/Textures/Opera_senza_titolo (4).png b/Assets/Textures/Opera_senza_titolo (4).png new file mode 100644 index 0000000..415c3ec Binary files /dev/null and b/Assets/Textures/Opera_senza_titolo (4).png differ diff --git a/Assets/Textures/Opera_senza_titolo (4).png.import b/Assets/Textures/Opera_senza_titolo (4).png.import new file mode 100644 index 0000000..391417f --- /dev/null +++ b/Assets/Textures/Opera_senza_titolo (4).png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cpb1ashccd2ki" +path.s3tc="res://.godot/imported/Opera_senza_titolo (4).png-c8721971d0f1a5880c4dffc63f03ddd9.s3tc.ctex" +path.etc2="res://.godot/imported/Opera_senza_titolo (4).png-c8721971d0f1a5880c4dffc63f03ddd9.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Opera_senza_titolo (4).png" +dest_files=["res://.godot/imported/Opera_senza_titolo (4).png-c8721971d0f1a5880c4dffc63f03ddd9.s3tc.ctex", "res://.godot/imported/Opera_senza_titolo (4).png-c8721971d0f1a5880c4dffc63f03ddd9.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Assets/Textures/Roof.tres b/Assets/Textures/Roof.tres new file mode 100644 index 0000000..02c04dc --- /dev/null +++ b/Assets/Textures/Roof.tres @@ -0,0 +1,3 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://bq68cthwwucoc"] + +[resource] diff --git a/Assets/Textures/Sand/M_Sand.tres b/Assets/Textures/Sand/M_Sand.tres new file mode 100644 index 0000000..650d1c8 --- /dev/null +++ b/Assets/Textures/Sand/M_Sand.tres @@ -0,0 +1,9 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://b27870gqxnuai"] + +[ext_resource type="Texture2D" uid="uid://c2ptxav0ud0kg" path="res://Assets/Textures/Sand/Sand_Diffuse.png" id="1_vwott"] +[ext_resource type="Texture2D" uid="uid://fmqytawg0uli" path="res://Assets/Textures/Sand/Sand_Normal.png" id="2_clsr1"] + +[resource] +albedo_texture = ExtResource("1_vwott") +normal_enabled = true +normal_texture = ExtResource("2_clsr1") diff --git a/Assets/Textures/Sand/Sand_Diffuse.png b/Assets/Textures/Sand/Sand_Diffuse.png new file mode 100644 index 0000000..3d39528 Binary files /dev/null and b/Assets/Textures/Sand/Sand_Diffuse.png differ diff --git a/Assets/Textures/Sand/Sand_Diffuse.png.import b/Assets/Textures/Sand/Sand_Diffuse.png.import new file mode 100644 index 0000000..0e48977 --- /dev/null +++ b/Assets/Textures/Sand/Sand_Diffuse.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c2ptxav0ud0kg" +path.s3tc="res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.s3tc.ctex" +path.etc2="res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Sand/Sand_Diffuse.png" +dest_files=["res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.s3tc.ctex", "res://.godot/imported/Sand_Diffuse.png-fdd04e698dd70afdba9d8f6a5393d016.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +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/Assets/Textures/Sand/Sand_Normal.png b/Assets/Textures/Sand/Sand_Normal.png new file mode 100644 index 0000000..e8c719a Binary files /dev/null and b/Assets/Textures/Sand/Sand_Normal.png differ diff --git a/Assets/Textures/Sand/Sand_Normal.png.import b/Assets/Textures/Sand/Sand_Normal.png.import new file mode 100644 index 0000000..c167e1a --- /dev/null +++ b/Assets/Textures/Sand/Sand_Normal.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://fmqytawg0uli" +path.s3tc="res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.s3tc.ctex" +path.etc2="res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Assets/Textures/Sand/Sand_Normal.png" +dest_files=["res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.s3tc.ctex", "res://.godot/imported/Sand_Normal.png-e45c8125450c4cdc9833015bb7753711.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://Assets/Textures/Sand/Sand_Normal.png" +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/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index 7027c23..35483f4 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3 uid="uid://md2ofbviios3"] +[gd_scene load_steps=32 format=3 uid="uid://md2ofbviios3"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"] [ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"] @@ -23,7 +23,9 @@ [ext_resource type="Texture2D" uid="uid://biyvvql2ufkdf" path="res://Assets/Textures/Opera_senza_titolo (1).png" id="15_dew1j"] [ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="16_q3kvk"] [ext_resource type="AudioStream" uid="uid://b52sd64x20ulv" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_ajifv"] +[ext_resource type="Texture2D" uid="uid://5nu7hitxgm2p" path="res://Assets/Textures/Opera_senza_titolo (3).png" id="18_xnvtr"] [ext_resource type="Texture2D" uid="uid://cet5o7wla1x7t" path="res://Assets/Textures/Opera_senza_titolo.png" id="19_5df2b"] +[ext_resource type="Texture2D" uid="uid://cpb1ashccd2ki" path="res://Assets/Textures/Opera_senza_titolo (4).png" id="19_crlxr"] [sub_resource type="SpriteFrames" id="SpriteFrames_6p0y6"] animations = [{ @@ -115,11 +117,21 @@ speed_scale = 2.0 playing = true [node name="Storage" parent="." instance=ExtResource("4_5jw5g")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, -5.2771) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.41138, 0.0193443, -4.80548) icon = ExtResource("14_503dh") +[node name="Storage4" parent="." instance=ExtResource("4_5jw5g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.41138, 0.0193443, -0.805475) +currentType = 3 +icon = ExtResource("18_xnvtr") + +[node name="Storage5" parent="." instance=ExtResource("4_5jw5g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.41138, 0.0193443, 2.67569) +currentType = 4 +icon = ExtResource("19_crlxr") + [node name="Storage2" parent="." instance=ExtResource("4_5jw5g")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, 0.876562) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.92129, 0.0193453, -12.2529) currentType = 2 icon = ExtResource("19_5df2b") @@ -130,13 +142,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.32927, 1.2303, 0.0486939) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.38381, 1.2303, 5.95106) [node name="Engine" parent="." instance=ExtResource("3_1ix85")] -transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, -3.45639, 1.1688, 9) +transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, -4.44257, 1.1688, 10.8577) [node name="Bin" parent="." instance=ExtResource("16_q3kvk")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.70291, -0.287106, 10.1948) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 4.66916, -0.287106, 10.1948) [node name="Storage3" parent="." instance=ExtResource("4_5jw5g")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.63306, -0.159192, -10.7834) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.08816, -0.159192, -10.9498) currentType = 1 icon = ExtResource("15_dew1j") audioClip = ExtResource("17_ajifv") diff --git a/Nodes/UI.tscn b/Nodes/UI.tscn index 8c3cff6..939d35e 100644 --- a/Nodes/UI.tscn +++ b/Nodes/UI.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://Nodes/UI.gd" id="1_dxr24"] [ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"] [ext_resource type="Texture2D" uid="uid://cxfybbp5idjwg" path="res://o_idle1.png" id="3_segqn"] -[ext_resource type="PackedScene" path="res://menu/stats_player_1.tscn" id="3_yhsvf"] +[ext_resource type="PackedScene" uid="uid://dgr3cta6n1tg3" path="res://menu/stats_player_1.tscn" id="3_yhsvf"] [ext_resource type="PackedScene" path="res://menu/stats_player_2.tscn" id="4_c4m18"] [ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_uiyin"] @@ -31,6 +31,7 @@ script = ExtResource("1_dxr24") [node name="Panel" type="Panel" parent="."] custom_minimum_size = Vector2(15, 0) +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -39,6 +40,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="VSlider" type="VSlider" parent="."] +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -56,6 +58,7 @@ editable = false scrollable = false [node name="VSlider2" type="VSlider" parent="."] +layout_mode = 1 anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 @@ -74,7 +77,7 @@ scrollable = false [node name="GameOver" type="Control" parent="."] visible = false -layout_mode = 3 +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -82,6 +85,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Label" type="Label" parent="GameOver"] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -98,6 +102,7 @@ label_settings = SubResource("LabelSettings_ot0gm") horizontal_alignment = 1 [node name="VBoxContainer" type="VBoxContainer" parent="GameOver"] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -113,17 +118,15 @@ size_flags_horizontal = 4 size_flags_vertical = 4 [node name="Button" type="Button" parent="GameOver/VBoxContainer"] -offset_right = 175.0 -offset_bottom = 31.0 +layout_mode = 2 text = "RESTART" [node name="Button2" type="Button" parent="GameOver/VBoxContainer"] -offset_top = 35.0 -offset_right = 175.0 -offset_bottom = 66.0 +layout_mode = 2 text = "BACK TO MAIN MENU" [node name="BoxContainer" type="BoxContainer" parent="GameOver"] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -138,28 +141,24 @@ grow_vertical = 2 [node name="HBoxContainer" type="HBoxContainer" parent="GameOver/BoxContainer"] custom_minimum_size = Vector2(900, 500) -offset_right = 1004.0 -offset_bottom = 500.0 +layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 [node name="TextureRect" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"] custom_minimum_size = Vector2(500, 0) -offset_right = 500.0 -offset_bottom = 500.0 +layout_mode = 2 texture = ExtResource("3_segqn") ignore_texture_size = true [node name="TextureRect2" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"] custom_minimum_size = Vector2(500, 0) -offset_left = 504.0 -offset_right = 1004.0 -offset_bottom = 500.0 +layout_mode = 2 texture = ExtResource("4_uiyin") ignore_texture_size = true [node name="Control" type="Control" parent="."] -layout_mode = 3 +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -167,6 +166,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")] +layout_mode = 1 anchors_preset = 0 anchor_bottom = 0.0 offset_right = 0.0 @@ -174,6 +174,7 @@ grow_vertical = 1 scale = Vector2(0.6, 0.6) [node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")] +layout_mode = 1 scale = Vector2(0.6, 0.6) [connection signal="pressed" from="GameOver/VBoxContainer/Button" to="." method="_on_button_pressed"] diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 9875d22..138c80d 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"] -[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] +[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"] [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] diff --git a/Nodes/train.tscn b/Nodes/train.tscn index 9d53c04..1b82389 100644 --- a/Nodes/train.tscn +++ b/Nodes/train.tscn @@ -1,19 +1,25 @@ -[gd_scene load_steps=16 format=3 uid="uid://c1mymb38wqdg6"] +[gd_scene load_steps=22 format=3 uid="uid://c1mymb38wqdg6"] -[ext_resource type="PackedScene" uid="uid://vpvpxwfpiao4" path="res://Assets/Model/Train/TrainFloorTile4x4.glb" id="1_ruoy4"] +[ext_resource type="PackedScene" uid="uid://by5dkvik2ti0a" path="res://Assets/Model/Train/TrainFloorTile4x4.glb" id="1_ruoy4"] [ext_resource type="PackedScene" uid="uid://bbt38m8mno0d2" path="res://Assets/Model/Train/TrainWall.glb" id="2_ph0y0"] [ext_resource type="PackedScene" uid="uid://de8860yknve3i" path="res://Assets/Model/Train/TrainPillarFloorAdapter.glb" id="4_ub5ul"] [ext_resource type="PackedScene" uid="uid://dmraqtehsfo45" path="res://Assets/Model/Train/TrainWallArc.glb" id="5_lb36h"] -[ext_resource type="PackedScene" uid="uid://b7lntc0mh3g7q" path="res://Assets/Model/Train/TrainFrameTopBottom.glb" id="6_0bbr0"] -[ext_resource type="PackedScene" uid="uid://50qugnp8dmhk" path="res://Assets/Model/Train/TrainFrameTop.glb" id="7_2ua2q"] +[ext_resource type="PackedScene" uid="uid://cugtbjho4lj44" path="res://Assets/Model/Train/TrainFrameTopBottom.glb" id="6_0bbr0"] +[ext_resource type="PackedScene" uid="uid://db7atd4d3px2c" path="res://Assets/Model/Train/TrainFrameTop.glb" id="7_2ua2q"] [ext_resource type="PackedScene" uid="uid://gihk416gd7tx" path="res://Assets/Model/Train/TrainPillarArcExtention.glb" id="7_87n8g"] [ext_resource type="PackedScene" uid="uid://dfljj7kor8v2j" path="res://Assets/Model/Train/TrainPillarWood.glb" id="7_hd70v"] -[ext_resource type="PackedScene" uid="uid://08f17h0im640" path="res://Assets/Model/Train/TrainWallInterior.glb" id="9_yvbc7"] +[ext_resource type="PackedScene" uid="uid://p7dpfo0na253" path="res://Assets/Model/Train/TrainWallInterior.glb" id="9_yvbc7"] [ext_resource type="PackedScene" uid="uid://df1p6wn43228a" path="res://Assets/Model/Weapons/Canon.glb" id="10_54n3n"] [ext_resource type="PackedScene" uid="uid://b50i4le1br8sf" path="res://Assets/Model/Objects/Lamp.glb" id="11_rhd60"] [ext_resource type="PackedScene" uid="uid://hc684kkimahs" path="res://Assets/Model/Pipes/Pipe.glb" id="12_34qvo"] [ext_resource type="PackedScene" uid="uid://c8lfaa7u7l3dy" path="res://Assets/Model/Pipes/PipeConnector.glb" id="13_m7b0g"] [ext_resource type="PackedScene" uid="uid://r6wpgp3plg3j" path="res://Assets/Model/Pipes/PipeEdge.glb" id="14_vhywa"] +[ext_resource type="PackedScene" uid="uid://17xxcaf81ri8" path="res://Assets/Model/TrainExterior/TrainFront.glb" id="15_vrw80"] +[ext_resource type="PackedScene" uid="uid://bs85ji27qx1p3" path="res://Assets/Model/TrainExterior/TrainLowerCover.glb" id="16_xvkvb"] +[ext_resource type="PackedScene" uid="uid://c7hnriu67n0rh" path="res://Assets/Model/TrainExterior/TrainLargeWheel.glb" id="17_r3wtv"] +[ext_resource type="PackedScene" uid="uid://cnu4jnpyb3a5v" path="res://Assets/Model/TrainExterior/TrainLowerWheelCover.glb" id="18_i68yi"] +[ext_resource type="PackedScene" uid="uid://2lvluxmfprmv" path="res://Assets/Model/Objects/Furnace.glb" id="19_xfwum"] +[ext_resource type="PackedScene" uid="uid://cpjwodk8lb7ed" path="res://Assets/Model/Pipes/PipeDark.glb" id="20_h620b"] [sub_resource type="PlaneMesh" id="PlaneMesh_prxf6"] @@ -30,6 +36,13 @@ transform = Transform3D(8.525, 0, 0, 0, 1, 0, 0, 0, 3.9864, 6, 4.07265, -2) cast_shadow = 3 mesh = SubResource("PlaneMesh_prxf6") +[node name="SpotLight3D" type="SpotLight3D" parent="RoofShadowOccluder"] +transform = Transform3D(-0.00622939, 0.00716891, 0.116917, 0.00147208, 0.998129, -0.0611231, -0.250499, -0.0004462, -0.0133193, 0.767332, -3.17453, -0.645867) +light_color = Color(0.968627, 0.466667, 0.380392, 1) +light_energy = 40.0 +shadow_enabled = true +spot_range = 7.84232 + [node name="Floor" type="Node3D" parent="."] [node name="TrainFloorTile4x4" parent="Floor" instance=ExtResource("1_ruoy4")] @@ -60,6 +73,21 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 0, -4) [node name="Pipe" parent="Pipes" instance=ExtResource("12_34qvo")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.3741, 0, -2) +[node name="PipeEdge" parent="Pipes/Pipe" instance=ExtResource("14_vhywa")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 10.0193, 0, -1.21751) + +[node name="PipeConnector" parent="Pipes/Pipe/PipeEdge" instance=ExtResource("13_m7b0g")] + +[node name="PipeEdge2" parent="Pipes/Pipe" instance=ExtResource("14_vhywa")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 9.70862, 0, -1.21751) + +[node name="PipeConnector" parent="Pipes/Pipe/PipeEdge2" instance=ExtResource("13_m7b0g")] + +[node name="PipeEdge3" parent="Pipes/Pipe" instance=ExtResource("14_vhywa")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 9.37739, 0, -1.21751) + +[node name="PipeConnector" parent="Pipes/Pipe/PipeEdge3" instance=ExtResource("13_m7b0g")] + [node name="Pipe2" parent="Pipes" instance=ExtResource("12_34qvo")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.3741, 1, -2) @@ -76,7 +104,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.3741, 0, -2) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.3741, 4, -2) [node name="Pipe5" parent="Pipes" instance=ExtResource("12_34qvo")] -transform = Transform3D(-4.37114e-08, -10, 0, 1, -4.37114e-07, 0, 0, 0, 1, 13.832, 3.61748, -1.596) +transform = Transform3D(-4.37114e-08, -11.819, 0, 1, -5.16625e-07, 0, 0, 0, 1, 15.6365, 3.61748, -1.596) [node name="PipeEdge" parent="Pipes" instance=ExtResource("14_vhywa")] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 2.83199, 3.61748, -2.596) @@ -142,7 +170,7 @@ transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 8, 3.6 transform = Transform3D(1, 0, 0, 0, 3, 0, 0, 0, 1, 5, -0.372508, -1.77042) [node name="Pipe8" parent="Pipes" instance=ExtResource("12_34qvo")] -transform = Transform3D(-4.37114e-08, 8, 0, -1, -3.49691e-07, 0, 0, 0, 1, 6, 3.62749, -1.77042) +transform = Transform3D(-4.37114e-08, 9.707, 0, -1, -4.24306e-07, 0, 0, 0, 1, 6, 3.62749, -1.77042) [node name="PipeEdge2" parent="Pipes" instance=ExtResource("14_vhywa")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 2.62749, -1.77042) @@ -173,6 +201,12 @@ transform = Transform3D(-1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, -6) [node name="TrainWall7" parent="Walls" instance=ExtResource("2_ph0y0")] transform = Transform3D(1, 0, 0, 0, 1, -8.74228e-08, 0, 8.74228e-08, 1, 10, 0, -6) +[node name="TrainWall15" parent="Walls" instance=ExtResource("2_ph0y0")] +transform = Transform3D(-4.37114e-08, -8.74228e-08, -1, 0, 1, -8.74228e-08, 1, -3.82137e-15, -4.37114e-08, 14, 0, -6) + +[node name="TrainWall16" parent="Walls" instance=ExtResource("2_ph0y0")] +transform = Transform3D(4.37114e-08, 0, -1, 0, 1, 0, -1, 0, -4.37114e-08, 14, 0, 2) + [node name="TrainWall8" parent="Walls" instance=ExtResource("2_ph0y0")] transform = Transform3D(4.37114e-08, 1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 6, 0, -6) @@ -200,6 +234,18 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, -2) [node name="TrainWallInterior3" parent="Walls" instance=ExtResource("9_yvbc7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -2) +[node name="TrainWallInterior4" parent="Walls" instance=ExtResource("9_yvbc7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, -2) + +[node name="TrainWallInterior5" parent="Walls" instance=ExtResource("9_yvbc7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -2) + +[node name="TrainWallInterior4" parent="Walls/TrainWallInterior5" instance=ExtResource("9_yvbc7")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 6, 0, -2) + +[node name="TrainWallInterior5" parent="Walls/TrainWallInterior5" instance=ExtResource("9_yvbc7")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 6, 0, 0) + [node name="TrainPillarFloorAdapter" parent="Walls" instance=ExtResource("4_ub5ul")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, 2) @@ -284,9 +330,24 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -6) [node name="TrainPillarWood12" parent="Walls" instance=ExtResource("7_hd70v")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, -6) +[node name="TrainPillarFloorAdapter15" parent="Walls" instance=ExtResource("4_ub5ul")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 14, -4.76837e-07, 2) + [node name="TrainPillarWood13" parent="Walls" instance=ExtResource("7_hd70v")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 2) +[node name="TrainPillarFloorAdapter16" parent="Walls" instance=ExtResource("4_ub5ul")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 14, -4.76837e-07, -2) + +[node name="TrainPillarWood14" parent="Walls" instance=ExtResource("7_hd70v")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, -2) + +[node name="TrainPillarWood15" parent="Walls" instance=ExtResource("7_hd70v")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 14, 4.06763, -2) + +[node name="TrainPillarWood16" parent="Walls" instance=ExtResource("7_hd70v")] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 14, 4.06763, 2) + [node name="TrainPillarWood" parent="Walls" instance=ExtResource("7_hd70v")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, 2) @@ -318,6 +379,17 @@ light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_size = 0.041 +[node name="Lamp6" parent="Lights" instance=ExtResource("11_rhd60")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 10.0661, 2.0195, -2.0172) + +[node name="OmniLight3D" type="OmniLight3D" parent="Lights/Lamp6"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0267167, 0.280738, 0.159808) +light_color = Color(0.835294, 0.67451, 0.67451, 1) +light_energy = 3.0 +light_indirect_energy = 0.0 +light_volumetric_fog_energy = 0.0 +light_size = 0.041 + [node name="Lamp3" parent="Lights" instance=ExtResource("11_rhd60")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.98784, 1.73746, -5.81179) @@ -361,3 +433,50 @@ light_energy = 3.0 light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_size = 0.041 + +[node name="Exterior" type="Node3D" parent="."] + +[node name="TrainFront" parent="Exterior" instance=ExtResource("15_vrw80")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 21.7349, 0, -2.17573) + +[node name="TrainLargeWheel" parent="." instance=ExtResource("17_r3wtv")] +transform = Transform3D(1.612, 0, 0, 0, 1.612, 0, 0, 0, 1.612, 13.3814, 1.92074, 1.9898) + +[node name="TrainLargeWheel2" parent="." instance=ExtResource("17_r3wtv")] +transform = Transform3D(-1.612, 0, -1.40926e-07, 0, 1.612, 0, 1.40926e-07, 0, -1.612, 13.3814, 1.92074, -6.35131) + +[node name="TrainLowerCover" parent="." instance=ExtResource("16_xvkvb")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, 2) + +[node name="TrainLowerCover6" parent="." instance=ExtResource("16_xvkvb")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 0, 2) + +[node name="TrainLowerWheelCover" parent="." instance=ExtResource("18_i68yi")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.00063) + +[node name="TrainLowerWheelCover2" parent="." instance=ExtResource("18_i68yi")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, -5.99937) + +[node name="TrainLowerCover2" parent="." instance=ExtResource("16_xvkvb")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0, 2.00063) + +[node name="TrainLowerCover3" parent="." instance=ExtResource("16_xvkvb")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 4, 0, -5.99936) + +[node name="TrainLowerCover4" parent="." instance=ExtResource("16_xvkvb")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 8, 0, -5.99936) + +[node name="TrainLowerCover5" parent="." instance=ExtResource("16_xvkvb")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 12, 0, -5.99936) + +[node name="Furnace" parent="." instance=ExtResource("19_xfwum")] +transform = Transform3D(-1.199, 0, -1.0482e-07, 0, 1.199, 0, 1.0482e-07, 0, -1.199, 12.7291, 0.0597833, -4) + +[node name="PipeDark" parent="." instance=ExtResource("20_h620b")] +transform = Transform3D(1.985, 0, 0, 0, -3.88769e-07, -1.985, 0, 8.894, -8.67671e-08, 13.1727, 2.43619, -6.35907) + +[node name="PipeConnector" parent="." instance=ExtResource("13_m7b0g")] +transform = Transform3D(2.345, 0, 0, 0, -1.02503e-07, -2.345, 0, 2.345, -1.02503e-07, 13.2, 2.42231, -4.1276) + +[node name="PipeConnector2" parent="." instance=ExtResource("13_m7b0g")] +transform = Transform3D(2.345, 0, 0, 0, -1.02503e-07, -2.345, 0, 2.345, -1.02503e-07, 13.2, 2.42231, -5.88947) diff --git a/menu/MainMenu.gd b/menu/MainMenu.gd index 9867bb0..6a693fa 100644 --- a/menu/MainMenu.gd +++ b/menu/MainMenu.gd @@ -1,10 +1,12 @@ extends Control +var master_bus # Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time. func _ready(): $VBoxContainer/Start.grab_focus() # Replace with function body. + master_bus = AudioServer.get_bus_index("Master") # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -33,3 +35,12 @@ func _on_full_screen_pressed(): if DisplayServer.window_get_mode() != DisplayServer.WINDOW_MODE_WINDOWED: DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED) + + +func _on_vol_slider_value_changed(value): + AudioServer.set_bus_volume_db(master_bus, value) + + if value == -30: + AudioServer.set_bus_mute(master_bus,true) + else: + AudioServer.set_bus_mute(master_bus, false) diff --git a/menu/VolSlider.gd b/menu/VolSlider.gd new file mode 100644 index 0000000..e69de29 diff --git a/menu/main_menu.tscn b/menu/main_menu.tscn index 085ceaf..700d7e4 100644 --- a/menu/main_menu.tscn +++ b/menu/main_menu.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=4 format=3 uid="uid://bsmsdlf5jiukx"] +[gd_scene load_steps=3 format=3 uid="uid://bsmsdlf5jiukx"] [ext_resource type="Script" path="res://menu/MainMenu.gd" id="1_hyw8p"] -[ext_resource type="Script" path="res://menu/VolSlider.gd" id="2_h85ei"] [ext_resource type="AudioStream" uid="uid://bmawra1dgi812" path="res://Assets/Sounds/_MUSIC_/MenuGameJamLoop.wav" id="3_ktf88"] [node name="MainMenu" type="Control"] @@ -14,6 +13,7 @@ grow_vertical = 2 script = ExtResource("1_hyw8p") [node name="ColorRect" type="ColorRect" parent="."] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -22,6 +22,7 @@ grow_vertical = 2 color = Color(0.513726, 0.403922, 0.27451, 1) [node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -35,42 +36,30 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Start" type="Button" parent="VBoxContainer"] -offset_right = 87.0 -offset_bottom = 31.0 +layout_mode = 2 text = "Start " [node name="Tutorial" type="Button" parent="VBoxContainer"] -offset_top = 35.0 -offset_right = 87.0 -offset_bottom = 66.0 +layout_mode = 2 text = "Tutorial " [node name="Settings" type="Button" parent="VBoxContainer"] -offset_top = 70.0 -offset_right = 87.0 -offset_bottom = 101.0 +layout_mode = 2 text = "Volume:" [node name="VolSlider" type="HSlider" parent="VBoxContainer"] -offset_top = 105.0 -offset_right = 87.0 -offset_bottom = 121.0 +layout_mode = 2 min_value = -30.0 max_value = 0.0 -script = ExtResource("2_h85ei") [node name="Quit" type="Button" parent="VBoxContainer"] -offset_top = 125.0 -offset_right = 87.0 -offset_bottom = 156.0 +layout_mode = 2 text = "Quit" [node name="FullScreen" type="Button" parent="VBoxContainer"] -offset_top = 160.0 -offset_right = 87.0 -offset_bottom = 191.0 +layout_mode = 2 text = "Fullscreen" [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] @@ -80,6 +69,6 @@ autoplay = true [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"] [connection signal="pressed" from="VBoxContainer/Tutorial" to="." method="_on_tutorial_pressed"] [connection signal="pressed" from="VBoxContainer/Settings" to="." method="_on_settings_pressed"] -[connection signal="value_changed" from="VBoxContainer/VolSlider" to="VBoxContainer/VolSlider" method="_on_value_changed"] +[connection signal="value_changed" from="VBoxContainer/VolSlider" to="." method="_on_vol_slider_value_changed"] [connection signal="pressed" from="VBoxContainer/Quit" to="." method="_on_quit_pressed"] [connection signal="pressed" from="VBoxContainer/FullScreen" to="." method="_on_full_screen_pressed"] diff --git a/scripts/Modules/Cannon.gd b/scripts/Modules/Cannon.gd index 367dd64..d5d911d 100644 --- a/scripts/Modules/Cannon.gd +++ b/scripts/Modules/Cannon.gd @@ -22,6 +22,7 @@ func interact(player): if currentStashValue < maxStashValue: currentStashValue += 1 ammoType = 0 + DAMAGE = 5 player.clearInventory() $AudioStreamPlayer2.play() return @@ -37,6 +38,7 @@ func interact(player): if currentStashValue < maxStashValue: currentStashValue += 1 ammoType = 1 + DAMAGE = 8 player.clearInventory() $AudioStreamPlayer2.play() return @@ -45,6 +47,7 @@ func interact(player): if currentStashValue < maxStashValue: currentStashValue += 1 ammoType = 2 + DAMAGE = 12 player.clearInventory() $AudioStreamPlayer2.play() return diff --git a/scripts/Modules/Engine.gd b/scripts/Modules/Engine.gd index f4e0fdd..3691d0a 100644 --- a/scripts/Modules/Engine.gd +++ b/scripts/Modules/Engine.gd @@ -3,7 +3,7 @@ class_name TrainEngine enum STATE {RUNNING, DEAD} -const maxSpeed = 20 +const maxSpeed = 40 const refuelRate = 1.0 @onready var train = get_parent() as Train