diff --git a/Models/Animatronics/Cyberamics/Cyber Helen.glb b/Models/Animatronics/Cyberamics/Cyber Helen.glb index ee4d271..cb2726b 100644 Binary files a/Models/Animatronics/Cyberamics/Cyber Helen.glb and b/Models/Animatronics/Cyberamics/Cyber Helen.glb differ diff --git a/Scripts/Configs/Cosmetics.gd b/Scripts/Configs/Cosmetics.gd index 76cffee..e602fa1 100644 --- a/Scripts/Configs/Cosmetics.gd +++ b/Scripts/Configs/Cosmetics.gd @@ -497,27 +497,69 @@ var CyberHelen = { "Helen Dress": { - "PTT": + "PTT Half Body": { - "Helen/Helen/Skeleton3D/PTT Shirt": true, + "Helen/Helen/Skeleton3D/PTT Half Body Dress": true, + "Helen/Helen/Skeleton3D/PTT Standing Dress": false, + "Helen/Helen/Skeleton3D/PTT Sitting Dress": false, "Helen/Helen/Skeleton3D/Half Body Skirt": false, - "Helen/Helen/Skeleton3D/Skirt": false, + "Helen/Helen/Skeleton3D/Full Body Skirt": false, + "Helen/Helen/Skeleton3D/Sitting Skirt": false, "Helen/Helen/Skeleton3D/Black Shirt": false, "Helen/Helen/Skeleton3D/Collar": false, }, - "Road Stage": + "PTT Sitting": { - "Helen/Helen/Skeleton3D/PTT Shirt": false, + "Helen/Helen/Skeleton3D/PTT Half Body Dress": false, + "Helen/Helen/Skeleton3D/PTT Standing Dress": false, + "Helen/Helen/Skeleton3D/PTT Sitting Dress": true, + "Helen/Helen/Skeleton3D/Half Body Skirt": false, + "Helen/Helen/Skeleton3D/Full Body Skirt": false, + "Helen/Helen/Skeleton3D/Sitting Skirt": false, + "Helen/Helen/Skeleton3D/Black Shirt": false, + "Helen/Helen/Skeleton3D/Collar": false, + }, + "PTT Full Body": + { + "Helen/Helen/Skeleton3D/PTT Half Body Dress": false, + "Helen/Helen/Skeleton3D/PTT Standing Dress": true, + "Helen/Helen/Skeleton3D/PTT Sitting Dress": false, + "Helen/Helen/Skeleton3D/Half Body Skirt": false, + "Helen/Helen/Skeleton3D/Full Body Skirt": false, + "Helen/Helen/Skeleton3D/Sitting Skirt": false, + "Helen/Helen/Skeleton3D/Black Shirt": false, + "Helen/Helen/Skeleton3D/Collar": false, + }, + "Modern Half Body": + { + "Helen/Helen/Skeleton3D/PTT Half Body Dress": false, + "Helen/Helen/Skeleton3D/PTT Standing Dress": false, + "Helen/Helen/Skeleton3D/PTT Sitting Dress": false, "Helen/Helen/Skeleton3D/Half Body Skirt": true, - "Helen/Helen/Skeleton3D/Skirt": false, + "Helen/Helen/Skeleton3D/Full Body Skirt": false, + "Helen/Helen/Skeleton3D/Sitting Skirt": false, "Helen/Helen/Skeleton3D/Black Shirt": true, "Helen/Helen/Skeleton3D/Collar": true, }, - "Modern": + "Modern Full Body": { - "Helen/Helen/Skeleton3D/PTT Shirt": false, + "Helen/Helen/Skeleton3D/PTT Half Body Dress": false, + "Helen/Helen/Skeleton3D/PTT Standing Dress": false, + "Helen/Helen/Skeleton3D/PTT Sitting Dress": false, "Helen/Helen/Skeleton3D/Half Body Skirt": false, - "Helen/Helen/Skeleton3D/Skirt": true, + "Helen/Helen/Skeleton3D/Full Body Skirt": true, + "Helen/Helen/Skeleton3D/Sitting Skirt": false, + "Helen/Helen/Skeleton3D/Black Shirt": true, + "Helen/Helen/Skeleton3D/Collar": true, + }, + "Modern Sitting": + { + "Helen/Helen/Skeleton3D/PTT Half Body Dress": false, + "Helen/Helen/Skeleton3D/PTT Standing Dress": false, + "Helen/Helen/Skeleton3D/PTT Sitting Dress": false, + "Helen/Helen/Skeleton3D/Half Body Skirt": false, + "Helen/Helen/Skeleton3D/Full Body Skirt": false, + "Helen/Helen/Skeleton3D/Sitting Skirt": true, "Helen/Helen/Skeleton3D/Black Shirt": true, "Helen/Helen/Skeleton3D/Collar": true, }, @@ -565,6 +607,7 @@ var CyberHelen = { "Helen/Helen/Skeleton3D/PTT Mask Crest": true, "Helen/Helen/Skeleton3D/PTT Red Mouth Parts": true, "Helen/Helen/Skeleton3D/PTT Eyeshadow": true, + "Helen/Helen/Skeleton3D/Neck Fluff": true, "Helen/Helen/Skeleton3D/Modern Head": false, "Helen/Helen/Skeleton3D/Modern Mask": false, "Helen/Helen/Skeleton3D/Road Stage Jaw": false, @@ -580,6 +623,7 @@ var CyberHelen = { "Helen/Helen/Skeleton3D/PTT Mask Crest": false, "Helen/Helen/Skeleton3D/PTT Red Mouth Parts": false, "Helen/Helen/Skeleton3D/PTT Eyeshadow": false, + "Helen/Helen/Skeleton3D/Neck Fluff": false, "Helen/Helen/Skeleton3D/Modern Head": true, "Helen/Helen/Skeleton3D/Modern Mask": true, "Helen/Helen/Skeleton3D/Road Stage Jaw": true, @@ -595,6 +639,7 @@ var CyberHelen = { "Helen/Helen/Skeleton3D/PTT Mask Crest": false, "Helen/Helen/Skeleton3D/PTT Red Mouth Parts": false, "Helen/Helen/Skeleton3D/PTT Eyeshadow": false, + "Helen/Helen/Skeleton3D/Neck Fluff": false, "Helen/Helen/Skeleton3D/Modern Head": true, "Helen/Helen/Skeleton3D/Modern Mask": true, "Helen/Helen/Skeleton3D/Road Stage Jaw": false, @@ -609,16 +654,56 @@ var CyberHelen = { "None": { "Helen/Helen/Skeleton3D/Stand": true, - "Helen/Helen/Skeleton3D/Legs": false, - "Helen/Helen/Skeleton3D/Shoes": false, + "Helen/Helen/Skeleton3D/Modern Standing Legs": false, + "Helen/Helen/Skeleton3D/Modern Sitting Legs": false, + "Helen/Helen/Skeleton3D/PTT Standing Legs": false, + "Helen/Helen/Skeleton3D/PTT Sitting Legs": false, + }, + "PTT Sitting": + { + "Helen/Helen/Skeleton3D/Stand": false, + "Helen/Helen/Skeleton3D/Modern Standing Legs": false, + "Helen/Helen/Skeleton3D/Modern Sitting Legs": false, + "Helen/Helen/Skeleton3D/PTT Standing Legs": false, + "Helen/Helen/Skeleton3D/PTT Sitting Legs": true, + }, + "PTT Standing": + { + "Helen/Helen/Skeleton3D/Stand": false, + "Helen/Helen/Skeleton3D/Modern Standing Legs": false, + "Helen/Helen/Skeleton3D/Modern Sitting Legs": false, + "Helen/Helen/Skeleton3D/PTT Standing Legs": true, + "Helen/Helen/Skeleton3D/PTT Sitting Legs": false, }, "Modern Standing": { "Helen/Helen/Skeleton3D/Stand": false, - "Helen/Helen/Skeleton3D/Legs": true, - "Helen/Helen/Skeleton3D/Shoes": true, + "Helen/Helen/Skeleton3D/Modern Standing Legs": true, + "Helen/Helen/Skeleton3D/Modern Sitting Legs": false, + "Helen/Helen/Skeleton3D/PTT Standing Legs": false, + "Helen/Helen/Skeleton3D/PTT Sitting Legs": false, + }, + "Modern Sitting": + { + "Helen/Helen/Skeleton3D/Stand": false, + "Helen/Helen/Skeleton3D/Modern Standing Legs": false, + "Helen/Helen/Skeleton3D/Modern Sitting Legs": true, + "Helen/Helen/Skeleton3D/PTT Standing Legs": false, + "Helen/Helen/Skeleton3D/PTT Sitting Legs": false, } }, + + "Helen Swing": + { + "Off": + { + "Helen/Helen/Skeleton3D/Swing": false, + }, + "On": + { + "Helen/Helen/Skeleton3D/Swing": true, + }, + }, } var CyberMunch = { diff --git a/Scripts/Configs/Stages.gd b/Scripts/Configs/Stages.gd index b23a16c..a849c7b 100644 --- a/Scripts/Configs/Stages.gd +++ b/Scripts/Configs/Stages.gd @@ -160,7 +160,7 @@ var BalconyStage = { Cosmetics.CyberJasper, Cosmetics.CyberPasqually ], - "cosmetic_defaults": [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] + "cosmetic_defaults": [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] } var CStage = { @@ -249,7 +249,7 @@ var CStage = { Cosmetics.CyberJasper, Cosmetics.CyberPasqually ], - "cosmetic_defaults": [ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] + "cosmetic_defaults": [ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] } var ProtoRoadStage = { @@ -334,7 +334,7 @@ var ProtoRoadStage = { Cosmetics.CyberJasper, Cosmetics.CyberPasqually ], - "cosmetic_defaults": [ 1, 2, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 3, 2, 0, 1, 0, 0, 0, 0, 2 ] + "cosmetic_defaults": [ 1, 2, 0, 0, 1, 0, 0, 3, 1, 1, 0, 0, 0, 0, 0, 0, 3, 2, 0, 1, 0, 0, 0, 0, 2 ] } var Cyber3Stage = { @@ -427,7 +427,7 @@ var Cyber3Stage = { Cosmetics.CyberPasqually, Cosmetics.Valence ], - "cosmetic_defaults": [ 4, 4, 1, 1, 1, 2, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0 ] + "cosmetic_defaults": [ 4, 4, 1, 1, 1, 2, 1, 4, 2, 2, 3, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0 ] } var Cyber1Stage = { @@ -525,7 +525,7 @@ var Cyber1Stage = { Cosmetics.Valence, Cosmetics.Cyber1StageSpecial ], - "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0, 0 ] + "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 4, 2, 2, 3, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0, 0 ] } var MiniUnit1Stage = { @@ -616,7 +616,7 @@ var MiniUnit1Stage = { Cosmetics.CyberJasper, Cosmetics.CyberPasqually, ], - "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3 ] + "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 4, 2, 2, 3, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3 ] } var Cyber2Stage = { @@ -716,7 +716,7 @@ var Cyber2Stage = { Cosmetics.Valence, Cosmetics.Cyber2StageSpecial ], - "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0 ] + "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 4, 2, 2, 3, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0 ] } var Cyber12Stage = { @@ -813,7 +813,7 @@ var Cyber12Stage = { Cosmetics.Valence, Cosmetics.Cyber12StageSpecial ], - "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0 ] + "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 4, 2, 2, 3, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0 ] } var Turntable1Stage = { @@ -913,7 +913,7 @@ var Turntable1Stage = { Cosmetics.Valence, Cosmetics.Cyber1StageSpecial ], - "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 2, 2, 2, 1, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0, 0 ] + "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 1, 4, 2, 2, 3, 0, 2, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 3, 0, 0, 0 ] } var RoadStage = { @@ -1003,7 +1003,7 @@ var RoadStage = { Cosmetics.CyberPasqually, Cosmetics.Valence ], - "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 0, 1, 2, 2, 0, 1, 0, 0, 0, 2, 2, 1, 1, 1, 0, 0, 0, 2, 2 ] + "cosmetic_defaults": [ 1, 2, 1, 1, 1, 0, 0, 3, 2, 2, 0, 0, 1, 0, 0, 0, 2, 2, 1, 1, 1, 0, 0, 0, 2, 2 ] } var RockerStage = { @@ -1087,7 +1087,7 @@ var RockerStage = { Cosmetics.CyberJasper, Cosmetics.CyberPasqually ], - "cosmetic_defaults": [ 0, 1, 0, 0, 1, 0, 0, 2, 2, 2, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1 ] + "cosmetic_defaults": [ 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1 ] } var stages_info = {