diff --git a/Models/Animatronics/3-Stage/3stMoon.glb b/Models/Animatronics/3-Stage/3stMoon.glb new file mode 100644 index 0000000..45ae92e Binary files /dev/null and b/Models/Animatronics/3-Stage/3stMoon.glb differ diff --git a/Models/Animatronics/3-Stage/3stMoon.glb.import b/Models/Animatronics/3-Stage/3stMoon.glb.import new file mode 100644 index 0000000..f88fae6 --- /dev/null +++ b/Models/Animatronics/3-Stage/3stMoon.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://rabrhou7jcft" +path="res://.godot/imported/3stMoon.glb-3dbd0540e9b97e116e30133d89d54d2e.scn" + +[deps] + +source_file="res://Models/Animatronics/3-Stage/3stMoon.glb" +dest_files=["res://.godot/imported/3stMoon.glb-3dbd0540e9b97e116e30133d89d54d2e.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Scenes/EditorStages/3Stage.tscn b/Scenes/EditorStages/3Stage.tscn index b2af13d..9fa6a02 100644 --- a/Scenes/EditorStages/3Stage.tscn +++ b/Scenes/EditorStages/3Stage.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=20 format=3 uid="uid://c4n7jns8vmcg4"] +[gd_scene load_steps=21 format=3 uid="uid://c4n7jns8vmcg4"] [ext_resource type="PackedScene" uid="uid://cy35b87ip330v" path="res://Models/Stages/3-Stage/3Stage.glb" id="2_nhspc"] +[ext_resource type="PackedScene" uid="uid://rabrhou7jcft" path="res://Models/Animatronics/3-Stage/3stMoon.glb" id="4_xg3a1"] [ext_resource type="PackedScene" uid="uid://bccho13aa6akj" path="res://Models/Animatronics/3-Stage/3stBuilding.glb" id="6_5tgym"] [ext_resource type="PackedScene" uid="uid://ur5ypsdlndde" path="res://Models/GenericRooms/3-Stage/3StageGenericRoom.glb" id="7_0bfh6"] [ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="7_5tgym"] @@ -32,6 +33,10 @@ script = ExtResource("7_5tgym") transform = Transform3D(0.984808, 0, 0.173648, 0, 1, 0, -0.173648, 0, 0.984808, -2.3, 0.8, -1.7) script = ExtResource("7_5tgym") +[node name="Moon" parent="." instance=ExtResource("4_xg3a1")] +transform = Transform3D(0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808, 2.3, 0.8, -1.7) +script = ExtResource("7_5tgym") + [node name="3StageGenericRoom" parent="." instance=ExtResource("7_0bfh6")] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 6.4) diff --git a/Scripts/Configs/Stages.gd b/Scripts/Configs/Stages.gd index c042240..373380a 100644 --- a/Scripts/Configs/Stages.gd +++ b/Scripts/Configs/Stages.gd @@ -1186,7 +1186,7 @@ var StatenIsland1Stage = { } var CEI3Stage = { - "bits": 64, + "bits": 66, "scene": "res://Scenes/EditorStages/3Stage.tscn", "scene_ref_base": "SubViewport/3Stage/", "camera_count": 4, @@ -1217,6 +1217,8 @@ var CEI3Stage = { 41: { "bot": "Helen", "movement": "Body Lean", "flow_in": 1.0, "flow_out": 0.8 }, 118: { "bot": "Building", "movement": "Up", "flow_in": 0.5, "flow_out": 0.5 }, 119: { "bot": "Building", "movement": "Mouth", "flow_in": 3.0, "flow_out": 3.0 }, + 120: { "bot": "Moon", "movement": "Up", "flow_in": 0.5, "flow_out": 0.5 }, + 121: { "bot": "Moon", "movement": "Mouth", "flow_in": 3.0, "flow_out": 3.0 }, 124: { "bot": "Spots", "movement": "Chuck", "flow_in": "None", "flow_out": "None" }, 125: { "bot": "Spots", "movement": "Helen", "flow_in": "None", "flow_out": "None" }, 126: { "bot": "Spots", "movement": "Munch", "flow_in": "None", "flow_out": "None" },