~starkingdoms/starkingdoms

21d6e79529e27fcd3a247c2769d5a3adff1bfa73 — ghostly_zsh 8 months ago b2a99d1
chassis
M crates/client/src/networking/mod.rs => crates/client/src/networking/mod.rs +2 -2
@@ 24,7 24,7 @@ fn texture_name(part_type: PartType, attached: bool) -> String {
        match part_type {
            Placeholder => panic!("AHHHH PLACEHOLDER PANIC"),
            Hearty => "hearty.svg",
            Cargo => "cargo_on.svg",
            Chassis => "chassis.svg",
            Hub => "hub_on.svg",
            LandingThruster => "landingthruster_on.svg",
            LandingThrusterSuspension => "landingleg.svg",


@@ 34,7 34,7 @@ fn texture_name(part_type: PartType, attached: bool) -> String {
        match part_type {
            Placeholder => panic!("AHHHH PLACEHOLDER PANIC"),
            Hearty => "hearty.svg",
            Cargo => "cargo_off.svg",
            Chassis => "chassis.svg",
            Hub => "hub_off.svg",
            LandingThruster => "landingthruster_off.svg",
            LandingThrusterSuspension => "landingleg.svg",

M crates/common/src/lib.rs => crates/common/src/lib.rs +1 -1
@@ 46,7 46,7 @@ pub enum PartType {
    #[default]
    Placeholder,
    Hearty,
    Cargo,
    Chassis,
    Hub,
    LandingThruster,
    LandingThrusterSuspension,

M crates/server/parts.toml => crates/server/parts.toml +1 -1
@@ 10,7 10,7 @@ energy_capacity = 1000
thruster_force = 5
thruster_energy = 2

[part.Cargo]
[part.Chassis]
mass = 0.5
energy_capacity = 0
thruster_force = 0

M crates/server/src/module/mod.rs => crates/server/src/module/mod.rs +4 -4
@@ 44,7 44,7 @@ pub fn module_spawn(
        transform.translation += Vec3::new(6000.0, 0.0, 0.0);
        let flags = PartFlags { attached: false };
        let mut entity = commands.spawn(PartBundle {
            part_type: c_PartType::Cargo.into(),
            part_type: c_PartType::Chassis.into(),
            transform: TransformBundle::from(transform),
            flags,
            ..default()


@@ 57,14 57,14 @@ pub fn module_spawn(
            })
            .insert(AdditionalMassProperties::MassProperties(MassProperties {
                local_center_of_mass: vec2(0.0, 0.0),
                mass: part!(c_PartType::Cargo.into()).mass,
                mass: part!(c_PartType::Chassis.into()).mass,
                principal_inertia: 7.5,
            }));

        let packet = Packet::SpawnPart {
            id: entity.id().index(),
            part: Part {
                part_type: c_PartType::Cargo.into(),
                part_type: c_PartType::Chassis.into(),
                transform: proto_transform!(transform),
                flags: proto_part_flags!(flags),
            },


@@ 479,7 479,7 @@ fn convert_modules_recursive(
            module_transform,
            part_flags,
        ) = attached_query.get_mut(*child).unwrap();
        if *part_type == c_PartType::Cargo.into() {
        if *part_type == c_PartType::Chassis.into() {
            match planet_type.0 {
                c_PlanetType::Mars => {
                    *part_type = c_PartType::Hub.into();

M crates/server/src/module/save.rs => crates/server/src/module/save.rs +2 -2
@@ 150,7 150,7 @@ pub fn load_savefile(
            module
                .with_children(|children| {
                    children
                        .spawn(if part_type.0 == c_PartType::Cargo {
                        .spawn(if part_type.0 == c_PartType::Chassis {
                            Collider::cuboid(0.375, 0.46875)
                        } else if part_type.0 == c_PartType::Hub {
                            Collider::cuboid(0.5, 0.5)


@@ 161,7 161,7 @@ pub fn load_savefile(
                        })
                        .insert(TransformBundle::from(Transform::from_xyz(
                            0.,
                            if part_type.0 == c_PartType::Cargo {
                            if part_type.0 == c_PartType::Chassis {
                                0.03125
                            } else if part_type.0 == c_PartType::Hub {
                                0.

M crates/server/src/player/player_mouse_input.rs => crates/server/src/player/player_mouse_input.rs +2 -2
@@ 139,7 139,7 @@ pub fn mouse_picking(
        let x = rel_x * angle.cos() - rel_y * angle.sin();
        let y = rel_x * angle.sin() + rel_y * angle.cos();
        let mut bound = [-0.5, 0.5, -0.5, 0.5]; // left, right, top, bottom
        if let c_PartType::Cargo = part_type.0 {
        if let c_PartType::Chassis = part_type.0 {
            bound = [-0.375, 0.375, -0.5, 0.4375];
        }



@@ 164,7 164,7 @@ pub fn mouse_picking(
        let x = rel_x * angle.cos() - rel_y * angle.sin();
        let y = rel_x * angle.sin() + rel_y * angle.cos();
        let mut bound = [-0.5, 0.5, -0.5, 0.5]; // left, right, top, bottom
        if let c_PartType::Cargo = part_type.0 {
        if let c_PartType::Chassis = part_type.0 {
            bound = [-0.375, 0.375, -0.5, 0.4375];
        }