diff --git a/Models/Cyberamics/Cyber Helen.glb b/Models/Cyberamics/Cyber Helen.glb index c58dd1f..64f9a16 100644 Binary files a/Models/Cyberamics/Cyber Helen.glb and b/Models/Cyberamics/Cyber Helen.glb differ diff --git a/Models/Cyberamics/Cyber Helen_eyes.png b/Models/Cyberamics/Cyber Helen_eyes.png index 6b69d6d..3b8ee46 100644 Binary files a/Models/Cyberamics/Cyber Helen_eyes.png and b/Models/Cyberamics/Cyber Helen_eyes.png differ diff --git a/Models/Cyberamics/Cyber Helen_eyes.png.import b/Models/Cyberamics/Cyber Helen_eyes.png.import index 7f8cc01..b2cf938 100644 --- a/Models/Cyberamics/Cyber Helen_eyes.png.import +++ b/Models/Cyberamics/Cyber Helen_eyes.png.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "f3d293a05f8484be8751f38e0651eb91" +"md5": "078738967b35746cb1cd2f17a5bef364" } [deps] diff --git a/Models/Cyberamics/Cyber Helen_shoes.png b/Models/Cyberamics/Cyber Helen_shoes.png new file mode 100644 index 0000000..0b47cc0 Binary files /dev/null and b/Models/Cyberamics/Cyber Helen_shoes.png differ diff --git a/Models/Cyberamics/Cyber Helen_shoes.png.import b/Models/Cyberamics/Cyber Helen_shoes.png.import new file mode 100644 index 0000000..be73caf --- /dev/null +++ b/Models/Cyberamics/Cyber Helen_shoes.png.import @@ -0,0 +1,39 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://drq2k76cun0yu" +path.s3tc="res://.godot/imported/Cyber Helen_shoes.png-3e5d76518bb1741e5d1632ddd8f286e8.s3tc.ctex" +path.etc2="res://.godot/imported/Cyber Helen_shoes.png-3e5d76518bb1741e5d1632ddd8f286e8.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} +generator_parameters={ +"md5": "239e23627ba253afcd70dc24f1087fb1" +} + +[deps] + +source_file="res://Models/Cyberamics/Cyber Helen_shoes.png" +dest_files=["res://.godot/imported/Cyber Helen_shoes.png-3e5d76518bb1741e5d1632ddd8f286e8.s3tc.ctex", "res://.godot/imported/Cyber Helen_shoes.png-3e5d76518bb1741e5d1632ddd8f286e8.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/GUI/EditorScreen.tscn b/Scenes/GUI/EditorScreen.tscn index dd782ce..656ba11 100644 --- a/Scenes/GUI/EditorScreen.tscn +++ b/Scenes/GUI/EditorScreen.tscn @@ -199,19 +199,21 @@ offset_top = 4.0 offset_right = 260.0 offset_bottom = 36.0 selected = 1 -item_count = 5 +item_count = 6 popup/item_0/text = "Official Stages" popup/item_0/id = 4 popup/item_0/separator = true popup/item_1/text = "Balcony Stage" popup/item_1/id = 0 -popup/item_2/text = "Custom Stages" -popup/item_2/id = 3 -popup/item_2/separator = true -popup/item_3/text = "Helen House" -popup/item_3/id = 1 -popup/item_4/text = "Chuck E's Corner" -popup/item_4/id = 2 +popup/item_2/text = "2-Stage" +popup/item_2/id = 5 +popup/item_3/text = "Custom Stages" +popup/item_3/id = 3 +popup/item_3/separator = true +popup/item_4/text = "Helen House" +popup/item_4/id = 1 +popup/item_5/text = "Chuck E's Corner" +popup/item_5/id = 2 [node name="MenuButton" type="MenuButton" parent="MenuBar"] layout_mode = 0 diff --git a/Scenes/Stages/2Stage.tscn b/Scenes/Stages/2Stage.tscn new file mode 100644 index 0000000..232fec8 --- /dev/null +++ b/Scenes/Stages/2Stage.tscn @@ -0,0 +1,37 @@ +[gd_scene load_steps=3 format=3 uid="uid://dqksmv472xs24"] + +[ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="2_lubev"] +[ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Cyberamics/Cyber Helen.glb" id="16_rmsrl"] + +[node name="2Stage" type="Node3D"] + +[node name="Helen" parent="." instance=ExtResource("16_rmsrl")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.3, 0) +script = ExtResource("2_lubev") + +[node name="Angle 1" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 5.75, 12) +current = true +fov = 60.0 + +[node name="Room Lights" type="Node3D" parent="."] + +[node name="OmniLight3D" type="OmniLight3D" parent="Room Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 4.5, 3) +light_color = Color(1, 0.960784, 0.85098, 1) + +[node name="OmniLight3D2" type="OmniLight3D" parent="Room Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 4.5, 3) +light_color = Color(1, 0.960784, 0.85098, 1) + +[node name="OmniLight3D3" type="OmniLight3D" parent="Room Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.5, 3) +light_color = Color(1, 0.960784, 0.85098, 1) + +[node name="OmniLight3D4" type="OmniLight3D" parent="Room Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 4.5, 3) +light_color = Color(1, 0.960784, 0.85098, 1) + +[node name="OmniLight3D5" type="OmniLight3D" parent="Room Lights"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 4.5, 3) +light_color = Color(1, 0.960784, 0.85098, 1) diff --git a/Scripts/EditorScreen.gd b/Scripts/EditorScreen.gd index f051c24..e9648f3 100644 --- a/Scripts/EditorScreen.gd +++ b/Scripts/EditorScreen.gd @@ -452,6 +452,99 @@ var stages_info = { }, }, + "Helen Mask": + { + "Modern": + { + "Helen/Helen/Skeleton3D/Modern Head": true, + "Helen/Helen/Skeleton3D/Modern Mask": true, + "Helen/Helen/Skeleton3D/Road Stage Jaw": false, + "Helen/Helen/Skeleton3D/Road Stage Beak": false, + "Helen/Helen/Skeleton3D/Modern Jaw": true, + "Helen/Helen/Skeleton3D/Modern Beak": true, + }, + "Road Stage": + { + "Helen/Helen/Skeleton3D/Modern Head": true, + "Helen/Helen/Skeleton3D/Modern Mask": true, + "Helen/Helen/Skeleton3D/Road Stage Jaw": true, + "Helen/Helen/Skeleton3D/Road Stage Beak": true, + "Helen/Helen/Skeleton3D/Modern Jaw": false, + "Helen/Helen/Skeleton3D/Modern Beak": false, + }, + }, + } + }, + "2-Stage": + { + "bits": 8, + "scene": "res://Scenes/Stages/2Stage.tscn", + "scene_ref_base": "SubViewport/2Stage/", + "camera_count": 1, + + "ust_type": "Cyberamics", + + "bit_mapping": + { + 9: { "bot": "Helen", "movement": "Mouth", "flow_in": 7.5, "flow_out": 6.0 }, + 10: { "bot": "Helen", "movement": "Head Left", "flow_in": 0.8, "flow_out": 1.0 }, + 11: { "bot": "Helen", "movement": "Head Right", "flow_in": 1.0, "flow_out": 1.0 }, + 12: { "bot": "Helen", "movement": "Head Up", "flow_in": 2.0, "flow_out": 1.0 }, + 13: { "bot": "Helen", "movement": "Eyes Left", "flow_in": 4.0, "flow_out": 3.0 }, + 14: { "bot": "Helen", "movement": "Eyes Right", "flow_in": 4.0, "flow_out": 3.0 }, + 15: { "bot": "Helen", "movement": "Eyelids", "flow_in": 7.5, "flow_out": 5.0 }, + 16: { "bot": "Helen", "movement": "Right Arm", "flow_in": 2.0, "flow_out": 1.0 }, + }, + + "cosmetics": + { + + "Helen Eyelids": + { + "Blue": + { + "Helen/Helen/Skeleton3D/Blue Eyelids": true, + "Helen/Helen/Skeleton3D/Pink Eyelids": false, + }, + "Pink": + { + "Helen/Helen/Skeleton3D/Blue Eyelids": false, + "Helen/Helen/Skeleton3D/Pink Eyelids": true, + }, + }, + + "Helen Dress": + { + "Full Body CU": + { + "Helen/Helen/Skeleton3D/Half Body Skirt": false, + "Helen/Helen/Skeleton3D/Skirt": true, + "Helen/Helen/Skeleton3D/Black Shirt": true, + "Helen/Helen/Skeleton3D/Collar": true, + }, + "Half Body CU": + { + "Helen/Helen/Skeleton3D/Half Body Skirt": true, + "Helen/Helen/Skeleton3D/Skirt": false, + "Helen/Helen/Skeleton3D/Black Shirt": true, + "Helen/Helen/Skeleton3D/Collar": true, + }, + }, + + "Helen Hair": + { + "Large CU": + { + "Helen/Helen/Skeleton3D/BWHair Large": true, + "Helen/Helen/Skeleton3D/BWHair": false, + }, + "Normal CU": + { + "Helen/Helen/Skeleton3D/BWHair Large": false, + "Helen/Helen/Skeleton3D/BWHair": true, + }, + }, + "Helen Mask": { "Modern":