diff --git a/enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn b/enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn index 00ac4ffa..0faa8317 100644 --- a/enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn +++ b/enemies/red_robot/parts/part_disappear_effect/part_disappear.tscn @@ -42,6 +42,7 @@ height = 0.4 _data = [ Vector2( 0, 0 ), 0.0, 0.37234, 0, 0, Vector2( 0.462338, 0.981818 ), 5.18966, -5.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] [node name="PartDisappearPuff" type="CPUParticles"] +portal_mode = 2 material_override = SubResource( 1 ) emitting = false lifetime = 1.5 @@ -63,6 +64,7 @@ color_ramp = SubResource( 4 ) script = ExtResource( 3 ) [node name="MiniBlasts" type="CPUParticles" parent="."] +portal_mode = 2 material_override = SubResource( 5 ) emitting = false amount = 16 diff --git a/enemies/red_robot/parts/part_head.tscn b/enemies/red_robot/parts/part_head.tscn new file mode 100644 index 00000000..e27f5849 --- /dev/null +++ b/enemies/red_robot/parts/part_head.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://enemies/red_robot/parts/part_head.glb" type="PackedScene" id=1] + +[node name="part_head" instance=ExtResource( 1 )] + +[node name="EvilRoboHead" parent="." index="0"] +portal_mode = 2 diff --git a/enemies/red_robot/parts/part_shield.tscn b/enemies/red_robot/parts/part_shield.tscn new file mode 100644 index 00000000..56e76485 --- /dev/null +++ b/enemies/red_robot/parts/part_shield.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://enemies/red_robot/parts/part_shield.glb" type="PackedScene" id=1] + +[node name="part_shield" instance=ExtResource( 1 )] + +[node name="EvilRoboShield" parent="." index="0"] +portal_mode = 2 diff --git a/enemies/red_robot/red_robot.tscn b/enemies/red_robot/red_robot.tscn index acbd7bff..a884132d 100644 --- a/enemies/red_robot/red_robot.tscn +++ b/enemies/red_robot/red_robot.tscn @@ -2,6 +2,7 @@ [ext_resource path="res://enemies/red_robot/red_robot.gd" type="Script" id=1] [ext_resource path="res://enemies/red_robot/model/red_robot.dae" type="PackedScene" id=2] +[ext_resource path="res://enemies/red_robot/parts/part_head.tscn" type="PackedScene" id=3] [ext_resource path="res://enemies/red_robot/laser/LaserMaterial.tres" type="Material" id=4] [ext_resource path="res://enemies/red_robot/laser/EmberTrailCutoff.tres" type="Material" id=5] [ext_resource path="res://enemies/red_robot/laser/EmbersColorOverLife.tres" type="Gradient" id=6] @@ -9,8 +10,7 @@ [ext_resource path="res://enemies/red_robot/parts/sparks_effect/SparkMaterial.tres" type="Material" id=8] [ext_resource path="res://enemies/red_robot/audio/charge.wav" type="AudioStream" id=9] [ext_resource path="res://enemies/red_robot/audio/shoot.wav" type="AudioStream" id=10] -[ext_resource path="res://enemies/red_robot/parts/part_head.glb" type="PackedScene" id=11] -[ext_resource path="res://enemies/red_robot/parts/part_shield.glb" type="PackedScene" id=12] +[ext_resource path="res://enemies/red_robot/parts/part_shield.tscn" type="PackedScene" id=13] [ext_resource path="res://enemies/red_robot/audio/explosion.wav" type="AudioStream" id=17] [ext_resource path="res://enemies/red_robot/audio/hit.wav" type="AudioStream" id=18] [ext_resource path="res://enemies/red_robot/audio/walk.wav" type="AudioStream" id=19] @@ -116,7 +116,7 @@ uniform_name = "Displacement" [sub_resource type="VisualShader" id=22] code = "shader_type spatial; -render_mode specular_schlick_ggx; +render_mode specular_schlick_ggx, async_visible; uniform sampler2D noise; uniform float Displacement; @@ -400,7 +400,7 @@ nodes/hit3/position = Vector2( 980, 240 ) nodes/output/position = Vector2( 1180, 200 ) nodes/state/node = SubResource( 51 ) nodes/state/position = Vector2( 60, 100 ) -node_connections = [ "state", 0, "Animation", "state", 1, "Animation 3", "state", 2, "Animation 2", "state", 3, "Animation 4", "output", 0, "hit3", "aiming", 0, "state", "aiming", 1, "aim", "hit1", 0, "aiming", "hit1", 1, "Animation 5", "hit2", 0, "hit1", "hit2", 1, "Animation 6", "hit3", 0, "hit2", "hit3", 1, "Animation 7" ] +node_connections = [ "state", 0, "Animation", "state", 1, "Animation 3", "state", 2, "Animation 2", "state", 3, "Animation 4", "output", 0, "hit3", "hit1", 0, "aiming", "hit1", 1, "Animation 5", "aiming", 0, "state", "aiming", 1, "aim", "hit3", 0, "hit2", "hit3", 1, "Animation 7", "hit2", 0, "hit1", "hit2", 1, "Animation 6" ] [sub_resource type="SphereShape" id=53] radius = 1.11815 @@ -770,24 +770,39 @@ script = ExtResource( 1 ) [node name="Skeleton" parent="RedRobotModel/Armature" index="0"] bones/14/bound_children = [ NodePath("RayFrom") ] +[node name="EvilRoboBody" parent="RedRobotModel/Armature/Skeleton" index="0"] +portal_mode = 2 + +[node name="EvilRoboBody001" parent="RedRobotModel/Armature/Skeleton" index="1"] +portal_mode = 2 + +[node name="EvilRoboShield-L" parent="RedRobotModel/Armature/Skeleton" index="2"] +portal_mode = 2 + +[node name="EvilRoboShield-R" parent="RedRobotModel/Armature/Skeleton" index="3"] +portal_mode = 2 + [node name="RayFrom" type="BoneAttachment" parent="RedRobotModel/Armature/Skeleton" index="4"] transform = Transform( -0.997439, -0.070985, -0.00878045, -0.0710157, 0.99747, 0.00323016, 0.00852894, 0.00384544, -0.999956, -0.149183, 1.9902, 0.191941 ) bone_name = "CannonAnimRecoil" [node name="Circle" type="MeshInstance" parent="RedRobotModel/Armature/Skeleton/RayFrom"] transform = Transform( 1, 0, 1.73472e-18, 0, -8.88178e-16, -1, 0, 1, 0, 0, 0, -1 ) +portal_mode = 2 mesh = SubResource( 2 ) skeleton = NodePath("") material/0 = ExtResource( 4 ) [node name="RayMesh" type="MeshInstance" parent="RedRobotModel/Armature/Skeleton/RayFrom"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.25 ) +portal_mode = 2 mesh = SubResource( 4 ) skeleton = NodePath("") material/0 = ExtResource( 4 ) [node name="BuildupParticles" type="CPUParticles" parent="RedRobotModel/Armature/Skeleton/RayFrom"] transform = Transform( 1, 3.70164e-10, 5.82077e-11, 3.66526e-10, 1, 9.31323e-10, 0, 1.86265e-09, 1, -1.39698e-09, 0, -1.47648 ) +portal_mode = 2 material_override = ExtResource( 7 ) emitting = false amount = 64 @@ -810,6 +825,7 @@ hue_variation_random = 0.87 [node name="LaserEmber" type="CPUParticles" parent="RedRobotModel/Armature/Skeleton/RayFrom"] transform = Transform( 1, 7.30506e-09, 4.65661e-10, 0, 1, 0, 0, 3.72529e-09, 1, -7.45058e-09, 0.0332088, -10.283 ) +portal_mode = 2 emitting = false amount = 200 lifetime = 2.0 @@ -835,6 +851,7 @@ anim_offset_random = 1.0 [node name="LaserCenter" type="CPUParticles" parent="RedRobotModel/Armature/Skeleton/RayFrom"] transform = Transform( 1, 3.72893e-10, 1.74623e-10, 3.66526e-10, 1, 4.65661e-09, 0, 5.58794e-09, 1, -8.3819e-09, 0, -1.47136 ) +portal_mode = 2 material_override = SubResource( 25 ) emitting = false amount = 1 @@ -846,6 +863,7 @@ scale_amount_curve = SubResource( 27 ) [node name="Smoke" type="CPUParticles" parent="RedRobotModel/Armature/Skeleton/RayFrom"] transform = Transform( 1, 1.16415e-10, -4.0518e-10, 3.66526e-10, -4.19095e-08, -1, 0, 1, -4.65661e-08, -6.51926e-09, -1.43051e-06, -1.34189 ) +portal_mode = 2 material_override = SubResource( 31 ) emitting = false amount = 3 @@ -948,8 +966,6 @@ scale_amount_random = 0.09 scale_amount_curve = SubResource( 57 ) color_ramp = SubResource( 58 ) -[node name="Model" parent="Death/PartShield1" instance=ExtResource( 12 )] - [node name="Col1" type="CollisionShape" parent="Death/PartShield1"] transform = Transform( 1, 0, 0, 0, 0.908425, 0.418048, 0, -0.418048, 0.908425, -0.0167698, 0.5788, -0.122978 ) shape = SubResource( 59 ) @@ -960,6 +976,8 @@ transform = Transform( 1, 0, 0, 0, 0.994888, 0.100984, 0, -0.100984, 0.994888, 0 shape = SubResource( 60 ) disabled = true +[node name="Model" parent="Death/PartShield1" instance=ExtResource( 13 )] + [node name="PartShield2" type="RigidBody" parent="Death"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75083, 1.02975, 0.162546 ) collision_layer = 3 @@ -992,8 +1010,6 @@ scale_amount_random = 0.09 scale_amount_curve = SubResource( 57 ) color_ramp = SubResource( 58 ) -[node name="Model" parent="Death/PartShield2" instance=ExtResource( 12 )] - [node name="Col1" type="CollisionShape" parent="Death/PartShield2"] transform = Transform( 1, 0, 0, 0, 0.908425, 0.418048, 0, -0.418048, 0.908425, -0.0150018, 0.599786, -0.170673 ) shape = SubResource( 62 ) @@ -1004,6 +1020,8 @@ transform = Transform( 1, 0, 0, 0, 0.999275, -0.038063, 0, 0.038063, 0.999275, 0 shape = SubResource( 63 ) disabled = true +[node name="Model" parent="Death/PartShield2" instance=ExtResource( 13 )] + [node name="PartHead" type="RigidBody" parent="Death"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0374503, 1.02975, 0.162546 ) collision_layer = 3 @@ -1037,8 +1055,6 @@ scale_amount_random = 0.09 scale_amount_curve = SubResource( 57 ) color_ramp = SubResource( 58 ) -[node name="Model" parent="Death/PartHead" instance=ExtResource( 11 )] - [node name="Col1" type="CollisionShape" parent="Death/PartHead"] shape = SubResource( 65 ) disabled = true @@ -1048,6 +1064,8 @@ transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.0753 shape = SubResource( 66 ) disabled = true +[node name="Model" parent="Death/PartHead" instance=ExtResource( 3 )] + [node name="Explosion" type="AnimationPlayer" parent="Death"] anims/kaboom = SubResource( 67 ) diff --git a/level/forklift/flying_forklift.tscn b/level/forklift/flying_forklift.tscn index 7bd2863b..f78f13ca 100644 --- a/level/forklift/flying_forklift.tscn +++ b/level/forklift/flying_forklift.tscn @@ -34,15 +34,42 @@ script = ExtResource( 3 ) [node name="RedFlyingForklift" parent="FlyingForkliftModel" index="0"] visible = false +portal_mode = 2 + +[node name="prop_cargobox3023" parent="FlyingForkliftModel/RedFlyingForklift" index="0"] +portal_mode = 2 + +[node name="prop_cargobox5a020" parent="FlyingForkliftModel/RedFlyingForklift" index="1"] +portal_mode = 2 [node name="YellowFlyingForklift" parent="FlyingForkliftModel" index="1"] visible = false +portal_mode = 2 + +[node name="prop_cargobox3lid020" parent="FlyingForkliftModel/YellowFlyingForklift" index="0"] +portal_mode = 2 + +[node name="prop_cargobox4019" parent="FlyingForkliftModel/YellowFlyingForklift" index="1"] +portal_mode = 2 + +[node name="prop_cargobox5a000" parent="FlyingForkliftModel/YellowFlyingForklift" index="2"] +portal_mode = 2 + +[node name="BlueFlyingForklift" parent="FlyingForkliftModel" index="2"] +portal_mode = 2 + +[node name="prop_cargobox3000" parent="FlyingForkliftModel/BlueFlyingForklift" index="0"] +portal_mode = 2 + +[node name="prop_cargobox5b000" parent="FlyingForkliftModel/BlueFlyingForklift" index="1"] +portal_mode = 2 [node name="Collider" type="CollisionShape" parent="."] shape = SubResource( 1 ) [node name="Particles1" type="CPUParticles" parent="."] transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.471727, -0.377269, -3.29514 ) +portal_mode = 2 amount = 16 lifetime = 0.5 fixed_fps = 60 @@ -58,6 +85,7 @@ color_ramp = SubResource( 4 ) [node name="Particles2" type="CPUParticles" parent="."] transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -0.501376, -0.377269, -3.29514 ) +portal_mode = 2 amount = 16 lifetime = 0.5 fixed_fps = 60 @@ -73,6 +101,7 @@ color_ramp = SubResource( 4 ) [node name="Particles3" type="CPUParticles" parent="."] transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 1.42691, -0.514244, -2.88934 ) +portal_mode = 2 amount = 16 lifetime = 0.5 fixed_fps = 60 @@ -88,6 +117,7 @@ color_ramp = SubResource( 4 ) [node name="Particles4" type="CPUParticles" parent="."] transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -1.33273, -0.514244, -2.88934 ) +portal_mode = 2 amount = 16 lifetime = 0.5 fixed_fps = 60 @@ -103,6 +133,7 @@ color_ramp = SubResource( 4 ) [node name="SpotLight" type="SpotLight" parent="."] transform = Transform( 1, 0, 0, 0, -0.819152, 0.573576, 0, -0.573576, -0.819152, 0, 0.181815, 4.10661 ) +portal_mode = 2 light_bake_mode = 0 shadow_enabled = true spot_range = 7.70138 diff --git a/level/geometry/scenes/core.tscn b/level/geometry/scenes/core.tscn index d20ff841..a3e19e7b 100644 --- a/level/geometry/scenes/core.tscn +++ b/level/geometry/scenes/core.tscn @@ -211,6 +211,7 @@ mesh = ExtResource( 7 ) [node name="CPUParticles" type="CPUParticles" parent="Plasma"] physics_interpolation_mode = 1 +portal_mode = 1 material_override = SubResource( 20 ) amount = 3 preprocess = 5.29 @@ -236,6 +237,7 @@ color_ramp = SubResource( 22 ) [node name="CPUParticles2" type="CPUParticles" parent="Plasma"] physics_interpolation_mode = 1 +portal_mode = 1 material_override = SubResource( 23 ) amount = 5 mesh = ExtResource( 12 ) @@ -251,6 +253,7 @@ color_ramp = SubResource( 25 ) [node name="CPUParticles3" type="CPUParticles" parent="Plasma"] physics_interpolation_mode = 1 +portal_mode = 1 material_override = SubResource( 23 ) amount = 7 explosiveness = 0.14 diff --git a/level/level.gd b/level/level.gd index 1a55b567..b056715f 100644 --- a/level/level.gd +++ b/level/level.gd @@ -8,6 +8,8 @@ signal replace_main_scene # Useless, but needed as there is no clean way to chec onready var world_environment = $WorldEnvironment func _ready(): + $RoomManager.rooms_convert() + if Settings.gi_quality == Settings.GIQuality.HIGH: ProjectSettings["rendering/quality/voxel_cone_tracing/high_quality"] = true elif Settings.gi_quality == Settings.GIQuality.LOW: @@ -67,3 +69,11 @@ func _input(event): if event.is_action_pressed("quit"): Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) emit_signal("quit") + + if event.is_action_pressed("ui_portals"): + if $RoomManager.rooms_get_active(): + $RoomManager.rooms_set_active(false) + print("portals off") + else: + $RoomManager.rooms_set_active(true) + print("portals on") diff --git a/level/level.tscn b/level/level.tscn index e638d446..81787cb3 100644 --- a/level/level.tscn +++ b/level/level.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=37 format=2] [ext_resource path="res://level/level.gd" type="Script" id=1] -[ext_resource path="res://level/geometry/scenes/props.tscn" type="PackedScene" id=2] -[ext_resource path="res://level/geometry/giprobe_data.res" type="GIProbeData" id=5] -[ext_resource path="res://player/player.tscn" type="PackedScene" id=6] -[ext_resource path="res://enemies/red_robot/red_robot.tscn" type="PackedScene" id=7] +[ext_resource path="res://level/geometry/giprobe_data.res" type="GIProbeData" id=2] +[ext_resource path="res://level/geometry/environment.tres" type="Environment" id=3] +[ext_resource path="res://level/forklift/flying_forklift.tscn" type="PackedScene" id=4] +[ext_resource path="res://enemies/red_robot/red_robot.tscn" type="PackedScene" id=5] +[ext_resource path="res://level/geometry/scenes/structure.tscn" type="PackedScene" id=6] +[ext_resource path="res://level/geometry/scenes/core.tscn" type="PackedScene" id=7] [ext_resource path="res://level/level_music.ogg" type="AudioStream" id=8] [ext_resource path="res://level/debug.gd" type="Script" id=9] -[ext_resource path="res://level/forklift/flying_forklift.tscn" type="PackedScene" id=12] -[ext_resource path="res://level/geometry/scenes/lights.tscn" type="PackedScene" id=13] -[ext_resource path="res://level/geometry/scenes/core.tscn" type="PackedScene" id=14] -[ext_resource path="res://level/geometry/scenes/structure.tscn" type="PackedScene" id=15] -[ext_resource path="res://level/geometry/environment.tres" type="Environment" id=16] +[ext_resource path="res://player/player.tscn" type="PackedScene" id=10] +[ext_resource path="res://level/geometry/scenes/lights.tscn" type="PackedScene" id=11] +[ext_resource path="res://level/geometry/scenes/props.tscn" type="PackedScene" id=12] [sub_resource type="CapsuleShape" id=1] radius = 39.7506 @@ -103,31 +103,52 @@ polygon_points = PoolVector2Array( 26.3687, -60.868, -21.2648, 34.8682, 17.8021, [node name="Level" type="Spatial"] script = ExtResource( 1 ) -[node name="Core" parent="." instance=ExtResource( 14 )] +[node name="RoomManager" type="RoomManager" parent="."] +roomlist = NodePath("../RoomList") +show_margins = false -[node name="Structure" parent="." instance=ExtResource( 15 )] +[node name="RoomList" type="Spatial" parent="."] -[node name="Props" parent="." instance=ExtResource( 2 )] +[node name="Lights" parent="RoomList" instance=ExtResource( 11 )] -[node name="Lights" parent="." instance=ExtResource( 13 )] +[node name="Room_Structure" type="Room" parent="RoomList"] +points = PoolVector3Array( 105.313, -44.2188, -111.056, 105.313, -44.2188, 115.054, 105.313, 47.0312, -111.056, 105.313, 47.0312, 115.054, -115.713, -44.2188, -111.056, -115.713, -44.2188, 115.054, -115.713, 47.0312, -111.056, -115.713, 47.0312, 115.054 ) + +[node name="Structure" parent="RoomList/Room_Structure" instance=ExtResource( 6 )] + +[node name="Props" parent="RoomList/Room_Structure" instance=ExtResource( 12 )] + +[node name="RoomGroup_Core" type="RoomGroup" parent="RoomList"] +roomgroup_priority = 1 + +[node name="Room_Core" type="Room" parent="RoomList/RoomGroup_Core"] +points = PoolVector3Array( 42.7086, -31.1906, -42.1428, 42.7086, 20.3199, -42.1428, -41.2881, -31.1906, -42.1428, -41.2881, 20.3199, -42.1428, 42.7086, -31.1906, 5.68789, 42.7086, 20.3199, 5.68789, -41.2881, -31.1906, 41.2592, 31.1507, -31.1906, 41.2592, -41.2881, 20.3199, 41.2592, 31.1507, 20.3199, 41.2592 ) + +[node name="Core" parent="RoomList/RoomGroup_Core/Room_Core" instance=ExtResource( 7 )] + +[node name="Portal" type="Portal" parent="RoomList/RoomGroup_Core/Room_Core"] +transform = Transform( -0.309017, 0, -0.951056, 0, 1, 0, 0.951056, 0, -0.309017, 40.424, -4.63176, 12.7192 ) +points = PoolVector2Array( 3.01481, -1.4125, 2.82033, 1.86893, -2.53423, 2.07699, -2.62032, -1.4285 ) [node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = ExtResource( 16 ) +environment = ExtResource( 3 ) [node name="GIProbe" type="GIProbe" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.09263, 1.28266, 2.88598 ) +portal_mode = 3 subdiv = 2 extents = Vector3( 113.946, 48.8048, 117.028 ) energy = 2.2 propagation = 1.0 interior = true -data = ExtResource( 5 ) +data = ExtResource( 2 ) [node name="ReflectionProbes" type="Spatial" parent="."] visible = false [node name="ReflectionProbe1" type="ReflectionProbe" parent="ReflectionProbes"] transform = Transform( 0.494055, 0, -0.869431, 0, 1, 0, 0.869431, 0, 0.494055, 28.1433, -18.8082, 71.0693 ) +portal_mode = 3 extents = Vector3( 37.3556, 50, 83.0437 ) box_projection = true interior_enable = true @@ -136,6 +157,7 @@ interior_ambient_contrib = 0.33 [node name="ReflectionProbe2" type="ReflectionProbe" parent="ReflectionProbes"] transform = Transform( 0.999799, 0, -0.0200534, 0, 1, 0, 0.0200534, 0, 0.999799, 73.9972, 0, -12.2086 ) +portal_mode = 3 extents = Vector3( 35.8169, 50, 64.5769 ) box_projection = true interior_enable = true @@ -144,24 +166,25 @@ interior_ambient_contrib = 0.45 [node name="ReflectionProbe3" type="ReflectionProbe" parent="ReflectionProbes"] transform = Transform( 0.999799, 0, -0.0200534, 0, 1, 0, 0.0200534, 0, 0.999799, -0.392717, -7.57649, 0.0575469 ) +portal_mode = 3 extents = Vector3( 38.9134, 50, 37.1232 ) interior_enable = true interior_ambient_color = Color( 0.2, 0.129412, 0.0470588, 1 ) interior_ambient_contrib = 0.3 -[node name="Player" parent="." instance=ExtResource( 6 )] +[node name="Player" parent="." instance=ExtResource( 10 )] transform = Transform( -0.575826, 0, -0.817573, 0, 1, 0, 0.817573, 0, -0.575826, 64.8183, -1.0765, 78.7639 ) -[node name="RedRobot1" parent="." instance=ExtResource( 7 )] +[node name="RedRobot1" parent="." instance=ExtResource( 5 )] transform = Transform( 0.843905, 0, -0.536493, 0, 1, 0, 0.536493, 0, 0.843905, 71.5907, -6.05686, 46.2736 ) -[node name="RedRobot2" parent="." instance=ExtResource( 7 )] +[node name="RedRobot2" parent="." instance=ExtResource( 5 )] transform = Transform( 0.338334, 0, 0.941027, 0, 1, 0, -0.941027, 0, 0.338334, 53.2126, -6.05686, 15.9321 ) -[node name="RedRobot3" parent="." instance=ExtResource( 7 )] +[node name="RedRobot3" parent="." instance=ExtResource( 5 )] transform = Transform( -0.164432, 0, 0.986389, 0, 1, 0, -0.986389, 0, -0.164432, -2.96096, -11.6923, 20.2343 ) -[node name="RedRobot4" parent="." instance=ExtResource( 7 )] +[node name="RedRobot4" parent="." instance=ExtResource( 5 )] transform = Transform( -0.164432, 0, 0.986389, 0, 1, 0, -0.986389, 0, -0.164432, -9.15526, -11.6923, -16.9238 ) [node name="Music" type="AudioStreamPlayer" parent="."] @@ -189,10 +212,10 @@ shape = SubResource( 1 ) [node name="FlyingForklifts" type="Spatial" parent="."] -[node name="FlyingForklift1" parent="FlyingForklifts" instance=ExtResource( 12 )] +[node name="FlyingForklift1" parent="FlyingForklifts" instance=ExtResource( 4 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 67.8049, 2.27771, 0 ) -[node name="FlyingForklift2" parent="FlyingForklifts" instance=ExtResource( 12 )] +[node name="FlyingForklift2" parent="FlyingForklifts" instance=ExtResource( 4 )] transform = Transform( -1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -68.2496, 2.27771, 0 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="FlyingForklifts"] @@ -214,6 +237,7 @@ __meta__ = { } [node name="Occluders" type="Spatial" parent="."] +visible = false [node name="StartWall" type="Occluder" parent="Occluders"] transform = Transform( 0.137929, 0, 0.990442, 0, 1, 0, -0.990442, 0, 0.137929, -6.13814, 0, 82.9737 ) diff --git a/player/bullet/bullet.tscn b/player/bullet/bullet.tscn index 0a602c8f..62791bb0 100644 --- a/player/bullet/bullet.tscn +++ b/player/bullet/bullet.tscn @@ -453,9 +453,9 @@ transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 ) visible = false cast_shadow = 0 mesh = SubResource( 1 ) -material/0 = null [node name="OmniLight" type="OmniLight" parent="."] +portal_mode = 3 light_color = Color( 0, 1, 0.952941, 1 ) light_energy = 0.778846 light_bake_mode = 0 @@ -477,6 +477,7 @@ unit_size = 20.0 [node name="Blast" type="Spatial" parent="."] [node name="BlastParticle" type="Particles" parent="Blast"] +portal_mode = 3 material_override = ExtResource( 4 ) emitting = false amount = 1 @@ -486,6 +487,7 @@ process_material = SubResource( 8 ) draw_pass_1 = ExtResource( 2 ) [node name="LightBlast" type="Particles" parent="Blast"] +portal_mode = 3 material_override = ExtResource( 5 ) emitting = false amount = 1 @@ -495,6 +497,7 @@ process_material = SubResource( 13 ) draw_pass_1 = SubResource( 14 ) [node name="BlastSparks" type="Particles" parent="Blast"] +portal_mode = 3 material_override = SubResource( 16 ) emitting = false amount = 10 @@ -505,6 +508,7 @@ process_material = SubResource( 21 ) draw_pass_1 = SubResource( 22 ) [node name="Smoke" type="Particles" parent="Blast"] +portal_mode = 3 material_override = SubResource( 23 ) emitting = false amount = 5 @@ -515,6 +519,7 @@ process_material = SubResource( 30 ) draw_pass_1 = SubResource( 31 ) [node name="LightParticle" type="Particles" parent="Blast"] +portal_mode = 3 material_override = SubResource( 32 ) emitting = false amount = 3 @@ -525,6 +530,7 @@ process_material = SubResource( 37 ) draw_pass_1 = SubResource( 38 ) [node name="InnerBlastLight" type="Particles" parent="Blast"] +portal_mode = 3 material_override = ExtResource( 9 ) emitting = false amount = 1 @@ -537,12 +543,12 @@ draw_pass_1 = SubResource( 42 ) visible = false material_override = ExtResource( 4 ) mesh = ExtResource( 2 ) -material/0 = null [node name="BulletBody" type="Spatial" parent="."] [node name="MainBody" type="Particles" parent="BulletBody"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00988865, 0, 0 ) +portal_mode = 3 amount = 100 lifetime = 0.1 local_coords = false @@ -550,6 +556,7 @@ process_material = SubResource( 47 ) draw_pass_1 = SubResource( 49 ) [node name="Trail" type="Particles" parent="BulletBody"] +portal_mode = 3 material_override = ExtResource( 9 ) amount = 10 local_coords = false diff --git a/player/player.tscn b/player/player.tscn index 05f9938c..074c2e6b 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -197,7 +197,7 @@ nodes/strafe/node = SubResource( 24 ) nodes/strafe/position = Vector2( -400, -120 ) nodes/walk/node = SubResource( 29 ) nodes/walk/position = Vector2( -400, 40 ) -node_connections = [ "state", 0, "strafe", "state", 1, "walk", "state", 2, "jumpup", "state", 3, "jumpdown", "output", 0, "eye_blend", "aim", 0, "aimdown", "aim", 1, "land", "aim", 2, "aimup", "eye_blend", 0, "aim", "eye_blend", 1, "eyes", "land", 0, "state", "land", 1, "hardland" ] +node_connections = [ "state", 0, "strafe", "state", 1, "walk", "state", 2, "jumpup", "state", 3, "jumpdown", "output", 0, "eye_blend", "eye_blend", 0, "aim", "eye_blend", 1, "eyes", "land", 0, "state", "land", 1, "hardland", "aim", 0, "aimdown", "aim", 1, "land", "aim", 2, "aimup" ] [sub_resource type="CapsuleShape" id=31] radius = 0.5 @@ -270,8 +270,20 @@ script = ExtResource( 1 ) [node name="Robot_Skeleton" parent="PlayerModel" index="0"] transform = Transform( 0.803991, 0, 0, 0, 0.803991, 0, 0, 0, 0.803991, 0, 0, 0 ) -[node name="Skeleton" parent="PlayerModel/Robot_Skeleton" index="0"] -bones/55/bound_children = [ NodePath("GunBone") ] +[node name="00Robot_Body008" parent="PlayerModel/Robot_Skeleton/Skeleton" index="0"] +portal_mode = 3 + +[node name="00Robot_Cannons002" parent="PlayerModel/Robot_Skeleton/Skeleton" index="1"] +portal_mode = 3 + +[node name="Robot_Arms" parent="PlayerModel/Robot_Skeleton/Skeleton" index="2"] +portal_mode = 3 + +[node name="Robot_Arms001" parent="PlayerModel/Robot_Skeleton/Skeleton" index="3"] +portal_mode = 3 + +[node name="Robot_Body" parent="PlayerModel/Robot_Skeleton/Skeleton" index="4"] +portal_mode = 3 [node name="GunBone" type="BoneAttachment" parent="PlayerModel/Robot_Skeleton/Skeleton" index="5"] transform = Transform( 0.92223, -0.384448, -0.0436694, -0.0209561, 0.0630829, -0.997796, 0.386401, 0.920989, 0.0501149, -0.207099, 1.39771, 0.464718 ) @@ -282,6 +294,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.4, 0 ) [node name="ShootParticle" type="Particles" parent="PlayerModel/Robot_Skeleton/Skeleton/GunBone/ShootFrom"] transform = Transform( 1, 2.04891e-08, 0, 3.21306e-08, 1, 5.58794e-09, 0, 0, 1, 0, 0, 0 ) +portal_mode = 3 material_override = ExtResource( 9 ) emitting = false amount = 10 @@ -294,6 +307,7 @@ draw_pass_1 = SubResource( 2 ) [node name="MuzzleFlash" type="Particles" parent="PlayerModel/Robot_Skeleton/Skeleton/GunBone/ShootFrom"] transform = Transform( 1, 0, -2.00234e-08, 1.21072e-08, -4.37722e-08, -1, -2.98023e-08, 1, -4.74975e-08, 0, 0, 0 ) +portal_mode = 3 material_override = SubResource( 3 ) emitting = false amount = 1 diff --git a/project.godot b/project.godot index e5d99266..74739db5 100644 --- a/project.godot +++ b/project.godot @@ -29,11 +29,14 @@ config/icon="res://icon.png" Settings="*res://menu/settings.gd" +[debug] + +settings/stdout/print_fps=true + [display] -window/size/width=1920 -window/size/height=1080 window/size/fullscreen=true +window/vsync/use_vsync=false window/stretch/mode="2d" window/stretch/aspect="expand" @@ -204,6 +207,11 @@ toggle_debug={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777246,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } +ui_portals={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":80,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} [layer_names]