diff --git a/assets/models/crate.glb b/assets/models/crate.glb new file mode 100644 index 0000000..052642c Binary files /dev/null and b/assets/models/crate.glb differ diff --git a/assets/models/hollow_asteroid.glb b/assets/models/hollow_asteroid.glb new file mode 100644 index 0000000..b05fba3 Binary files /dev/null and b/assets/models/hollow_asteroid.glb differ diff --git a/src/blender/hollow_asteroid.blend b/src/blender/hollow_asteroid.blend new file mode 100644 index 0000000..c05a3d2 Binary files /dev/null and b/src/blender/hollow_asteroid.blend differ diff --git a/src/chats/serenity.yaml b/src/chats/serenity.yaml index 28cd583..8ceec74 100644 --- a/src/chats/serenity.yaml +++ b/src/chats/serenity.yaml @@ -285,6 +285,24 @@ --- +- chat: Ash +- Oh, hello! +- Look, I'm very busy right now constructing this place. +- We can talk more once this is done. +- See you around. + + +--- + + +- chat: River +- Welcome to our little oasis! +- This will be great once it's finished. + + +--- + + - chat: generic_questions_serenity - Where are we?: - Inside Jupiter's rings, obviously. diff --git a/src/data/defs.txt b/src/data/defs.txt index 945a55b..15cb65c 100644 --- a/src/data/defs.txt +++ b/src/data/defs.txt @@ -252,6 +252,53 @@ actor 5000 0 -3000 moonlet scale 500 angularmomentum 0 0.015 0 +actor 3200 -300 -2000 hollow_asteroid + name "Inconspicuous Asteroid" + id cultasteroid + collider mesh + relativeto player + density 10000000000 + scale 40 + pointofinterest yes + angularmomentum 0 0.015 0 + actor 0 0 0 suitv2 + relativeto cultasteroid + name "Ash" + chatid Ash + alive yes + collider handcrafted + thrust 1.2 1 1 20 1.5 + wants maxrotation 0 + wants maxvelocity 0 + angularmomentum 0 0 0 + pronoun they + actor -8 8 0 suitv2 + relativeto cultasteroid + name "River" + chatid River + alive yes + collider handcrafted + thrust 1.2 1 1 20 1.5 + wants maxrotation 0 + wants maxvelocity 0 + angularmomentum 0 0 0 + rotationy 0.3 + rotationx 1.5 + pronoun she + actor 6 11 4 lightorb + relativeto cultasteroid + name "Light Orb" + scale 0.25 + light FF8F4A 2000000 + actor -6 4 8 lightorb + relativeto cultasteroid + name "Light Orb" + scale 0.25 + light FF8F4A 2000000 + actor -10 -14 0 crate + relativeto cultasteroid + name "Supply Crate" + actor -8200 -4400 -8100 asteroid_lum relativeto player name Lum diff --git a/src/skeleton.rs b/src/skeleton.rs index c6d8113..08d58ba 100644 --- a/src/skeleton.rs +++ b/src/skeleton.rs @@ -29,11 +29,13 @@ pub fn asset_name_to_path(name: &str) -> &'static str { "asteroid1" => "models/asteroid.glb#Scene0", "asteroid2" => "models/asteroid2.glb#Scene0", "asteroid_lum" => "models/asteroid_lum.glb#Scene0", + "hollow_asteroid" => "models/hollow_asteroid.glb#Scene0", "moonlet" => "models/moonlet.glb#Scene0", "monolith" => "models/monolith_neon.glb#Scene0", "lightorb" => "models/lightorb.glb#Scene0", "orb_busstop" => "models/orb_busstop.glb#Scene0", "orb_busstop_dim" => "models/orb_busstop_dim.glb#Scene0", + "crate" => "models/crate.glb#Scene0", "MeteorAceGT" => "models/MeteorAceGT.glb#Scene0", "satellite" => "models/satellite.glb#Scene0", "pizzeria" => "models/pizzeria2.glb#Scene0",