diff --git a/Models/Animatronics/3-Stage/MunchJr.glb b/Models/Animatronics/3-Stage/MunchJr.glb new file mode 100644 index 0000000..07c8de3 Binary files /dev/null and b/Models/Animatronics/3-Stage/MunchJr.glb differ diff --git a/Models/Animatronics/3-Stage/MunchJr.glb.import b/Models/Animatronics/3-Stage/MunchJr.glb.import new file mode 100644 index 0000000..e1cd4b0 --- /dev/null +++ b/Models/Animatronics/3-Stage/MunchJr.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bcmu0x8t8aq8" +path="res://.godot/imported/MunchJr.glb-86805a608cd7ac08ca5a5fc502fb1cd7.scn" + +[deps] + +source_file="res://Models/Animatronics/3-Stage/MunchJr.glb" +dest_files=["res://.godot/imported/MunchJr.glb-86805a608cd7ac08ca5a5fc502fb1cd7.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/Models/Animatronics/3-Stage/MunchJr_purple fur.png b/Models/Animatronics/3-Stage/MunchJr_purple fur.png new file mode 100644 index 0000000..541e7a8 Binary files /dev/null and b/Models/Animatronics/3-Stage/MunchJr_purple fur.png differ diff --git a/Models/Animatronics/3-Stage/MunchJr_purple fur.png.import b/Models/Animatronics/3-Stage/MunchJr_purple fur.png.import new file mode 100644 index 0000000..75aba53 --- /dev/null +++ b/Models/Animatronics/3-Stage/MunchJr_purple fur.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4lljto5v4tk2" +path.s3tc="res://.godot/imported/MunchJr_purple fur.png-77c5cc27ba1c1b471c1d6494558eeb66.s3tc.ctex" +path.etc2="res://.godot/imported/MunchJr_purple fur.png-77c5cc27ba1c1b471c1d6494558eeb66.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "a2861484b8db99b72b90acf5b9377b50" +} + +[deps] + +source_file="res://Models/Animatronics/3-Stage/MunchJr_purple fur.png" +dest_files=["res://.godot/imported/MunchJr_purple fur.png-77c5cc27ba1c1b471c1d6494558eeb66.s3tc.ctex", "res://.godot/imported/MunchJr_purple fur.png-77c5cc27ba1c1b471c1d6494558eeb66.etc2.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/Models/Animatronics/3-Stage/MunchJr_yellow fur.png b/Models/Animatronics/3-Stage/MunchJr_yellow fur.png new file mode 100644 index 0000000..5977e60 Binary files /dev/null and b/Models/Animatronics/3-Stage/MunchJr_yellow fur.png differ diff --git a/Models/Animatronics/3-Stage/MunchJr_yellow fur.png.import b/Models/Animatronics/3-Stage/MunchJr_yellow fur.png.import new file mode 100644 index 0000000..2b83660 --- /dev/null +++ b/Models/Animatronics/3-Stage/MunchJr_yellow fur.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dgheg2evte5eu" +path.s3tc="res://.godot/imported/MunchJr_yellow fur.png-c3ef0c52daf9e9982cd1bd118674f00f.s3tc.ctex" +path.etc2="res://.godot/imported/MunchJr_yellow fur.png-c3ef0c52daf9e9982cd1bd118674f00f.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "b0017718c6fe7afd0bd069baab26dd64" +} + +[deps] + +source_file="res://Models/Animatronics/3-Stage/MunchJr_yellow fur.png" +dest_files=["res://.godot/imported/MunchJr_yellow fur.png-c3ef0c52daf9e9982cd1bd118674f00f.s3tc.ctex", "res://.godot/imported/MunchJr_yellow fur.png-c3ef0c52daf9e9982cd1bd118674f00f.etc2.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/Scenes/EditorStages/3Stage.tscn b/Scenes/EditorStages/3Stage.tscn index 51bbbef..783758a 100644 --- a/Scenes/EditorStages/3Stage.tscn +++ b/Scenes/EditorStages/3Stage.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=22 format=3 uid="uid://c4n7jns8vmcg4"] +[gd_scene load_steps=23 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://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="5_3bb7b"] [ext_resource type="PackedScene" uid="uid://bccho13aa6akj" path="res://Models/Animatronics/3-Stage/3stBuilding.glb" id="6_5tgym"] +[ext_resource type="PackedScene" uid="uid://bcmu0x8t8aq8" path="res://Models/Animatronics/3-Stage/MunchJr.glb" id="6_nekvw"] [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"] [ext_resource type="PackedScene" uid="uid://f0fkcs7erhop" path="res://Models/Animatronics/3-Stage/3stHelen.glb" id="7_bsgrf"] @@ -42,6 +43,10 @@ script = ExtResource("7_5tgym") transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 1.06) script = ExtResource("7_5tgym") +[node name="Munch Jr" parent="." instance=ExtResource("6_nekvw")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.1, 0.8, 0.1) +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 ea0c3f7..4a36591 100644 --- a/Scripts/Configs/Stages.gd +++ b/Scripts/Configs/Stages.gd @@ -1227,6 +1227,7 @@ var CEI3Stage = { 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 }, 122: { "bot": "Wink", "movement": "Eye", "flow_in": 1.5, "flow_out": 1.5 }, + 123: { "bot": "Munch Jr", "movement": "Up", "flow_in": 1.0, "flow_out": 1.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" },