diff --git a/.gitignore b/.gitignore index 9e2b23a..2cb4a3c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ # files generated by running servers steam_appid.txt /data +/assets/robocraft/config.dump.json diff --git a/assets/robocraft/config.json b/assets/robocraft/config.json index e4c9254..acd49a7 100644 --- a/assets/robocraft/config.json +++ b/assets/robocraft/config.json @@ -1966,10 +1966,10 @@ "requires": [] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2013,10 +2013,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2060,10 +2060,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2107,10 +2107,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2154,10 +2154,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2201,10 +2201,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2248,10 +2248,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2295,10 +2295,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2342,10 +2342,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2389,10 +2389,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2500,10 +2500,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2547,10 +2547,10 @@ ] }, "movement": { - "steering_speed_light": 235, - "steering_speed_heavy": 150, - "steering_force_multiplier_light": 7.5, - "steering_force_multiplier_heavy": 3, + "steering_speed_light": 100, + "steering_speed_heavy": 100, + "steering_force_multiplier_light": 1, + "steering_force_multiplier_heavy": 1, "lateral_acceleration_light": 20, "lateral_acceleration_heavy": 10, "time_to_max_acceleration_light": 0.8, @@ -2594,13 +2594,13 @@ ] }, "movement": { - "max_turn_rate_moving_light": 55, + "max_turn_rate_moving_light": 80, "max_turn_rate_moving_heavy": 40, - "max_turn_rate_stopped_light": 1250, + "max_turn_rate_stopped_light": 500, "max_turn_rate_stopped_heavy": 900, - "turn_acceleration_light": 750, + "turn_acceleration_light": 1500, "turn_acceleration_heavy": 500, - "lateral_acceleration_light": 7.5, + "lateral_acceleration_light": 30, "lateral_acceleration_heavy": 5, "speed_boost": 0.0125, "movement_enum_variant": "TankTrack" @@ -2645,13 +2645,13 @@ ] }, "movement": { - "max_turn_rate_moving_light": 55, + "max_turn_rate_moving_light": 80, "max_turn_rate_moving_heavy": 40, - "max_turn_rate_stopped_light": 1250, + "max_turn_rate_stopped_light": 500, "max_turn_rate_stopped_heavy": 900, - "turn_acceleration_light": 750, + "turn_acceleration_light": 1500, "turn_acceleration_heavy": 500, - "lateral_acceleration_light": 7.5, + "lateral_acceleration_light": 30, "lateral_acceleration_heavy": 5, "speed_boost": 0.025, "movement_enum_variant": "TankTrack" @@ -2696,13 +2696,13 @@ ] }, "movement": { - "max_turn_rate_moving_light": 55, + "max_turn_rate_moving_light": 80, "max_turn_rate_moving_heavy": 40, - "max_turn_rate_stopped_light": 1250, + "max_turn_rate_stopped_light": 500, "max_turn_rate_stopped_heavy": 900, - "turn_acceleration_light": 750, + "turn_acceleration_light": 1500, "turn_acceleration_heavy": 500, - "lateral_acceleration_light": 7.5, + "lateral_acceleration_light": 30, "lateral_acceleration_heavy": 5, "speed_boost": 0.0375, "movement_enum_variant": "TankTrack" @@ -2747,13 +2747,13 @@ ] }, "movement": { - "max_turn_rate_moving_light": 55, + "max_turn_rate_moving_light": 80, "max_turn_rate_moving_heavy": 40, - "max_turn_rate_stopped_light": 1250, + "max_turn_rate_stopped_light": 500, "max_turn_rate_stopped_heavy": 900, - "turn_acceleration_light": 750, + "turn_acceleration_light": 1500, "turn_acceleration_heavy": 500, - "lateral_acceleration_light": 7.5, + "lateral_acceleration_light": 30, "lateral_acceleration_heavy": 5, "speed_boost": 0.0475, "movement_enum_variant": "TankTrack" @@ -2798,13 +2798,13 @@ ] }, "movement": { - "max_turn_rate_moving_light": 55, + "max_turn_rate_moving_light": 80, "max_turn_rate_moving_heavy": 40, "max_turn_rate_stopped_light": 1250, "max_turn_rate_stopped_heavy": 900, "turn_acceleration_light": 750, "turn_acceleration_heavy": 500, - "lateral_acceleration_light": 7.5, + "lateral_acceleration_light": 30, "lateral_acceleration_heavy": 5, "speed_boost": 0.1, "movement_enum_variant": "TankTrack" @@ -2847,12 +2847,12 @@ "time_grounded_after_jump_heavy": 0, "jump_height_light": 16, "jump_height_heavy": 7, - "turn_acceleration_light": 11, + "turn_acceleration_light": 18, "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 11, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 1, - "long_jump_speed_scale_heavy": 0.1, + "long_jump_speed_scale_light": 1.6, + "long_jump_speed_scale_heavy": 1, "max_lateral_force_light": 20, "max_lateral_force_heavy": 12.5, "max_damping_force_light": 30, @@ -2898,12 +2898,12 @@ "time_grounded_after_jump_heavy": 0, "jump_height_light": 16, "jump_height_heavy": 7, - "turn_acceleration_light": 11, + "turn_acceleration_light": 18, "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 11, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 1, - "long_jump_speed_scale_heavy": 0.1, + "long_jump_speed_scale_light": 1.6, + "long_jump_speed_scale_heavy": 1, "max_lateral_force_light": 20, "max_lateral_force_heavy": 12.5, "max_damping_force_light": 30, @@ -2949,12 +2949,12 @@ "time_grounded_after_jump_heavy": 0, "jump_height_light": 16, "jump_height_heavy": 7, - "turn_acceleration_light": 11, + "turn_acceleration_light": 18, "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 11, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 1, - "long_jump_speed_scale_heavy": 0.1, + "long_jump_speed_scale_light": 1.6, + "long_jump_speed_scale_heavy": 1, "max_lateral_force_light": 20, "max_lateral_force_heavy": 12.5, "max_damping_force_light": 30, @@ -3000,12 +3000,12 @@ "time_grounded_after_jump_heavy": 0, "jump_height_light": 16, "jump_height_heavy": 7, - "turn_acceleration_light": 11, + "turn_acceleration_light": 18, "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 11, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 1, - "long_jump_speed_scale_heavy": 0.1, + "long_jump_speed_scale_light": 1.6, + "long_jump_speed_scale_heavy": 1, "max_lateral_force_light": 20, "max_lateral_force_heavy": 12.5, "max_damping_force_light": 30, @@ -3051,12 +3051,12 @@ "time_grounded_after_jump_heavy": 0, "jump_height_light": 16, "jump_height_heavy": 7, - "turn_acceleration_light": 11, + "turn_acceleration_light": 18, "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 11, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 1, - "long_jump_speed_scale_heavy": 0.1, + "long_jump_speed_scale_light": 1.6, + "long_jump_speed_scale_heavy": 1, "max_lateral_force_light": 20, "max_lateral_force_heavy": 12.5, "max_damping_force_light": 30, @@ -3102,12 +3102,12 @@ "time_grounded_after_jump_heavy": 0, "jump_height_light": 16, "jump_height_heavy": 7, - "turn_acceleration_light": 11, + "turn_acceleration_light": 18, "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 11, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 1, - "long_jump_speed_scale_heavy": 0.1, + "long_jump_speed_scale_light": 1.6, + "long_jump_speed_scale_heavy": 1, "max_lateral_force_light": 20, "max_lateral_force_heavy": 12.5, "max_damping_force_light": 30, @@ -3157,7 +3157,7 @@ "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 25, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 2, + "long_jump_speed_scale_light": 2.3, "long_jump_speed_scale_heavy": 1, "max_lateral_force_light": 50, "max_lateral_force_heavy": 20, @@ -3204,15 +3204,15 @@ "time_grounded_after_jump_heavy": 0, "jump_height_light": 12, "jump_height_heavy": 9, - "turn_acceleration_light": 25, + "turn_acceleration_light": 50, "turn_acceleration_heavy": 10, "legacy_turn_acceleration_light": 25, "legacy_turn_acceleration_heavy": 10, - "long_jump_speed_scale_light": 2, + "long_jump_speed_scale_light": 2.65, "long_jump_speed_scale_heavy": 1, - "max_lateral_force_light": 50, + "max_lateral_force_light": 100, "max_lateral_force_heavy": 20, - "max_damping_force_light": 50, + "max_damping_force_light": 100, "max_damping_force_heavy": 30, "speed_boost": 0.05, "movement_enum_variant": "SprinterLeg" @@ -3585,17 +3585,17 @@ }, "movement": { "max_hover_height_light": 3.5, - "max_hover_height_heavy": 3, - "acceleration_light": 60, - "acceleration_heavy": 30, + "max_hover_height_heavy": 1.5, + "acceleration_light": 55, + "acceleration_heavy": 15, "height_change_speed_light": 8, - "height_change_speed_heavy": 6, + "height_change_speed_heavy": 3, "turn_torque_light": 15, - "turn_torque_heavy": 10, + "turn_torque_heavy": 5, "max_angular_velocity_light": 6, - "max_angular_velocity_heavy": 3, + "max_angular_velocity_heavy": 1.5, "lateral_damping_light": 1, - "lateral_damping_heavy": 0.34, + "lateral_damping_heavy": 0.17, "speed_boost": 0.005, "max_carry_mass": 140.0, "movement_enum_variant": "Hover" @@ -3642,17 +3642,17 @@ }, "movement": { "max_hover_height_light": 3.5, - "max_hover_height_heavy": 3, - "acceleration_light": 60, - "acceleration_heavy": 30, + "max_hover_height_heavy": 1.5, + "acceleration_light": 55, + "acceleration_heavy": 15, "height_change_speed_light": 8, - "height_change_speed_heavy": 6, + "height_change_speed_heavy": 3, "turn_torque_light": 15, - "turn_torque_heavy": 10, + "turn_torque_heavy": 5, "max_angular_velocity_light": 6, - "max_angular_velocity_heavy": 3, + "max_angular_velocity_heavy": 1.5, "lateral_damping_light": 1, - "lateral_damping_heavy": 0.34, + "lateral_damping_heavy": 0.17, "speed_boost": 0.01, "max_carry_mass": 192.5, "movement_enum_variant": "Hover" @@ -3699,17 +3699,17 @@ }, "movement": { "max_hover_height_light": 3.5, - "max_hover_height_heavy": 3, - "acceleration_light": 60, - "acceleration_heavy": 30, + "max_hover_height_heavy": 1.5, + "acceleration_light": 55, + "acceleration_heavy": 15, "height_change_speed_light": 8, - "height_change_speed_heavy": 6, + "height_change_speed_heavy": 3, "turn_torque_light": 15, - "turn_torque_heavy": 10, + "turn_torque_heavy": 5, "max_angular_velocity_light": 6, - "max_angular_velocity_heavy": 3, + "max_angular_velocity_heavy": 1.5, "lateral_damping_light": 1, - "lateral_damping_heavy": 0.34, + "lateral_damping_heavy": 0.17, "speed_boost": 0.015, "max_carry_mass": 245.0, "movement_enum_variant": "Hover" @@ -3756,17 +3756,17 @@ }, "movement": { "max_hover_height_light": 3.5, - "max_hover_height_heavy": 3, - "acceleration_light": 60, - "acceleration_heavy": 30, + "max_hover_height_heavy": 1.5, + "acceleration_light": 55, + "acceleration_heavy": 15, "height_change_speed_light": 8, - "height_change_speed_heavy": 6, + "height_change_speed_heavy": 3, "turn_torque_light": 15, - "turn_torque_heavy": 10, + "turn_torque_heavy": 5, "max_angular_velocity_light": 6, - "max_angular_velocity_heavy": 3, + "max_angular_velocity_heavy": 1.5, "lateral_damping_light": 1, - "lateral_damping_heavy": 0.34, + "lateral_damping_heavy": 0.17, "speed_boost": 0.02, "max_carry_mass": 297.5, "movement_enum_variant": "Hover" @@ -3813,17 +3813,17 @@ }, "movement": { "max_hover_height_light": 3.5, - "max_hover_height_heavy": 3, - "acceleration_light": 60, - "acceleration_heavy": 30, + "max_hover_height_heavy": 1.5, + "acceleration_light": 55, + "acceleration_heavy": 15, "height_change_speed_light": 8, - "height_change_speed_heavy": 6, + "height_change_speed_heavy": 3, "turn_torque_light": 15, - "turn_torque_heavy": 10, + "turn_torque_heavy": 5, "max_angular_velocity_light": 6, - "max_angular_velocity_heavy": 3, + "max_angular_velocity_heavy": 1.5, "lateral_damping_light": 1, - "lateral_damping_heavy": 0.34, + "lateral_damping_heavy": 0.17, "speed_boost": 0.025, "max_carry_mass": 350.0, "movement_enum_variant": "Hover" @@ -3870,17 +3870,17 @@ }, "movement": { "max_hover_height_light": 3.5, - "max_hover_height_heavy": 3, - "acceleration_light": 60, - "acceleration_heavy": 30, + "max_hover_height_heavy": 1.5, + "acceleration_light": 55, + "acceleration_heavy": 15, "height_change_speed_light": 8, - "height_change_speed_heavy": 6, + "height_change_speed_heavy": 3, "turn_torque_light": 15, - "turn_torque_heavy": 10, + "turn_torque_heavy": 5, "max_angular_velocity_light": 6, - "max_angular_velocity_heavy": 3, + "max_angular_velocity_heavy": 1.5, "lateral_damping_light": 1, - "lateral_damping_heavy": 0.34, + "lateral_damping_heavy": 0.17, "speed_boost": 0.05, "max_carry_mass": 1000.0, "movement_enum_variant": "Hover" @@ -3925,7 +3925,7 @@ }, "movement": { "acceleration_delay_light": 0, - "acceleration_delay_heavy": 1.2, + "acceleration_delay_heavy": 5, "speed_boost": 0.005, "movement_enum_variant": "Thruster" } @@ -3969,8 +3969,8 @@ }, "movement": { "acceleration_delay_light": 0, - "acceleration_delay_heavy": 1, - "speed_boost": 0.0065, + "acceleration_delay_heavy": 4, + "speed_boost": 0.008, "movement_enum_variant": "Thruster" } }, @@ -4013,8 +4013,8 @@ }, "movement": { "acceleration_delay_light": 0, - "acceleration_delay_heavy": 0.8, - "speed_boost": 0.0175, + "acceleration_delay_heavy": 3, + "speed_boost": 0.02, "movement_enum_variant": "Thruster" } }, @@ -4057,8 +4057,8 @@ }, "movement": { "acceleration_delay_light": 0, - "acceleration_delay_heavy": 0.6, - "speed_boost": 0.0225, + "acceleration_delay_heavy": 2, + "speed_boost": 0.0275, "movement_enum_variant": "Thruster" } }, @@ -4101,8 +4101,8 @@ }, "movement": { "acceleration_delay_light": 0, - "acceleration_delay_heavy": 0.4, - "speed_boost": 0.03, + "acceleration_delay_heavy": 1, + "speed_boost": 0.035, "movement_enum_variant": "Thruster" } }, @@ -4171,9 +4171,9 @@ ] }, "movement": { - "acceleration_delay_light": 3, - "acceleration_delay_heavy": 12.5, - "speed_boost": 0.05, + "acceleration_delay_light": 0, + "acceleration_delay_heavy": 7, + "speed_boost": 0.04, "movement_enum_variant": "Propeller" } }, @@ -4210,9 +4210,9 @@ ] }, "movement": { - "acceleration_delay_light": 2, - "acceleration_delay_heavy": 10, - "speed_boost": 0.11, + "acceleration_delay_light": 0, + "acceleration_delay_heavy": 6, + "speed_boost": 0.08, "movement_enum_variant": "Propeller" } }, @@ -4256,16 +4256,16 @@ "movement": { "speed_boost": 0.01, "max_carry_mass": 300, - "height_acceleration_light": 35, - "height_acceleration_heavy": 15, - "strafe_acceleration_light": 35, - "strafe_acceleration_heavy": 15, - "turn_acceleration_light": 165, - "turn_acceleration_heavy": 40, - "height_max_change_speed_light": 35, - "height_max_change_speed_heavy": 15, - "level_acceleration_light": 275, - "level_acceleration_heavy": 90, + "height_acceleration_light": 48.3, + "height_acceleration_heavy": 4.05, + "strafe_acceleration_light": 48.3, + "strafe_acceleration_heavy": 4.05, + "turn_acceleration_light": 227.7, + "turn_acceleration_heavy": 10.8, + "height_max_change_speed_light": 48.3, + "height_max_change_speed_heavy": 4.05, + "level_acceleration_light": 379.5, + "level_acceleration_heavy": 24.3, "movement_enum_variant": "Rotor" } }, @@ -4308,17 +4308,17 @@ }, "movement": { "speed_boost": 0.03, - "max_carry_mass": 900, - "height_acceleration_light": 35, - "height_acceleration_heavy": 15, - "strafe_acceleration_light": 35, - "strafe_acceleration_heavy": 15, - "turn_acceleration_light": 165, - "turn_acceleration_heavy": 40, - "height_max_change_speed_light": 35, - "height_max_change_speed_heavy": 15, - "level_acceleration_light": 275, - "level_acceleration_heavy": 90, + "max_carry_mass": 500, + "height_acceleration_light": 55.3443, + "height_acceleration_heavy": 4.05, + "strafe_acceleration_light": 55.3443, + "strafe_acceleration_heavy": 4.05, + "turn_acceleration_light": 260.909, + "turn_acceleration_heavy": 10.8, + "height_max_change_speed_light": 55.3443, + "height_max_change_speed_heavy": 4.05, + "level_acceleration_light": 434.841, + "level_acceleration_heavy": 24.3, "movement_enum_variant": "Rotor" } }, @@ -4361,17 +4361,17 @@ }, "movement": { "speed_boost": 0.06, - "max_carry_mass": 1800, - "height_acceleration_light": 35, - "height_acceleration_heavy": 15, - "strafe_acceleration_light": 35, - "strafe_acceleration_heavy": 15, - "turn_acceleration_light": 165, - "turn_acceleration_heavy": 40, - "height_max_change_speed_light": 35, - "height_max_change_speed_heavy": 15, - "level_acceleration_light": 275, - "level_acceleration_heavy": 90, + "max_carry_mass": 700, + "height_acceleration_light": 62.79, + "height_acceleration_heavy": 4.05, + "strafe_acceleration_light": 62.79, + "strafe_acceleration_heavy": 4.05, + "turn_acceleration_light": 296.01, + "turn_acceleration_heavy": 10.8, + "height_max_change_speed_light": 62.79, + "height_max_change_speed_heavy": 4.05, + "level_acceleration_light": 493.35, + "level_acceleration_heavy": 24.3, "movement_enum_variant": "Rotor" } }, @@ -4414,18 +4414,18 @@ ] }, "movement": { - "barrel_speed_light": 1.75, - "barrel_speed_heavy": 1.5, - "bank_speed_light": 40, - "bank_speed_heavy": 25, - "elevation_speed_light": 1.75, - "elevation_speed_heavy": 1.5, - "rudder_speed_light": 0.5, - "rudder_speed_heavy": 0.35, - "thrust_light": 40, - "thrust_heavy": 25, - "vtol_velocity_light": 95, - "vtol_velocity_heavy": 50, + "barrel_speed_light": 2.4063, + "barrel_speed_heavy": 0.15, + "bank_speed_light": 55, + "bank_speed_heavy": 2.5, + "elevation_speed_light": 2.4063, + "elevation_speed_heavy": 1, + "rudder_speed_light": 0.6875, + "rudder_speed_heavy": 0.035, + "thrust_light": 55, + "thrust_heavy": 2.5, + "vtol_velocity_light": 130.625, + "vtol_velocity_heavy": 20, "speed_boost": 0.005, "max_carry_mass": 220, "movement_enum_variant": "Wing" @@ -4470,18 +4470,18 @@ ] }, "movement": { - "barrel_speed_light": 1.75, - "barrel_speed_heavy": 1.5, - "bank_speed_light": 40, - "bank_speed_heavy": 25, - "elevation_speed_light": 1.75, - "elevation_speed_heavy": 1.5, - "rudder_speed_light": 0.5, - "rudder_speed_heavy": 0.35, - "thrust_light": 40, - "thrust_heavy": 25, - "vtol_velocity_light": 95, - "vtol_velocity_heavy": 50, + "barrel_speed_light": 2.4063, + "barrel_speed_heavy": 0.15, + "bank_speed_light": 55, + "bank_speed_heavy": 2.5, + "elevation_speed_light": 2.4063, + "elevation_speed_heavy": 1, + "rudder_speed_light": 0.6875, + "rudder_speed_heavy": 0.035, + "thrust_light": 55, + "thrust_heavy": 2.5, + "vtol_velocity_light": 130.625, + "vtol_velocity_heavy": 20, "speed_boost": 0.01, "max_carry_mass": 350, "movement_enum_variant": "Wing" @@ -4526,18 +4526,18 @@ ] }, "movement": { - "barrel_speed_light": 1.75, - "barrel_speed_heavy": 1.5, - "bank_speed_light": 40, - "bank_speed_heavy": 25, - "elevation_speed_light": 1.75, - "elevation_speed_heavy": 1.5, - "rudder_speed_light": 0.5, - "rudder_speed_heavy": 0.35, - "thrust_light": 40, - "thrust_heavy": 25, - "vtol_velocity_light": 95, - "vtol_velocity_heavy": 50, + "barrel_speed_light": 2.4063, + "barrel_speed_heavy": 0.15, + "bank_speed_light": 55, + "bank_speed_heavy": 2.5, + "elevation_speed_light": 2.4063, + "elevation_speed_heavy": 1, + "rudder_speed_light": 0.6875, + "rudder_speed_heavy": 0.035, + "thrust_light": 55, + "thrust_heavy": 2.5, + "vtol_velocity_light": 130.625, + "vtol_velocity_heavy": 20, "speed_boost": 0.015, "max_carry_mass": 450, "movement_enum_variant": "Wing" @@ -4619,18 +4619,18 @@ ] }, "movement": { - "barrel_speed_light": 1.75, - "barrel_speed_heavy": 1.5, - "bank_speed_light": 40, - "bank_speed_heavy": 25, - "elevation_speed_light": 1.75, - "elevation_speed_heavy": 1.5, - "rudder_speed_light": 0.5, - "rudder_speed_heavy": 0.35, - "thrust_light": 40, - "thrust_heavy": 25, - "vtol_velocity_light": 95, - "vtol_velocity_heavy": 50, + "barrel_speed_light": 2.4063, + "barrel_speed_heavy": 0.15, + "bank_speed_light": 55, + "bank_speed_heavy": 2.5, + "elevation_speed_light": 2.4063, + "elevation_speed_heavy": 1, + "rudder_speed_light": 0.6875, + "rudder_speed_heavy": 0.035, + "thrust_light": 55, + "thrust_heavy": 2.5, + "vtol_velocity_light": 130.625, + "vtol_velocity_heavy": 20, "speed_boost": 0.02, "max_carry_mass": 600, "movement_enum_variant": "Wing" @@ -4707,19 +4707,19 @@ ] }, "movement": { - "barrel_speed_light": 1.5, - "barrel_speed_heavy": 1, - "bank_speed_light": 35, - "bank_speed_heavy": 20, - "elevation_speed_light": 2, + "barrel_speed_light": 2.0625, + "barrel_speed_heavy": 2.0625, + "bank_speed_light": 48.125, + "bank_speed_heavy": 2, + "elevation_speed_light": 2.75, "elevation_speed_heavy": 1, - "rudder_speed_light": 2, - "rudder_speed_heavy": 1, - "thrust_light": 35, - "thrust_heavy": 20, - "vtol_velocity_light": 90, - "vtol_velocity_heavy": 45, - "speed_boost": 0.004, + "rudder_speed_light": 2.75, + "rudder_speed_heavy": 2.75, + "thrust_light": 48.125, + "thrust_heavy": 2, + "vtol_velocity_light": 123.75, + "vtol_velocity_heavy": 18, + "speed_boost": 0.003, "max_carry_mass": 40, "movement_enum_variant": "Rudder" } @@ -4763,19 +4763,19 @@ ] }, "movement": { - "barrel_speed_light": 1.5, - "barrel_speed_heavy": 1, - "bank_speed_light": 35, - "bank_speed_heavy": 20, - "elevation_speed_light": 2, + "barrel_speed_light": 2.0625, + "barrel_speed_heavy": 0.1, + "bank_speed_light": 48.125, + "bank_speed_heavy": 2, + "elevation_speed_light": 2.75, "elevation_speed_heavy": 1, - "rudder_speed_light": 2, + "rudder_speed_light": 2.75, "rudder_speed_heavy": 1, - "thrust_light": 35, - "thrust_heavy": 20, - "vtol_velocity_light": 90, - "vtol_velocity_heavy": 45, - "speed_boost": 0.006, + "thrust_light": 48.125, + "thrust_heavy": 2, + "vtol_velocity_light": 123.75, + "vtol_velocity_heavy": 18, + "speed_boost": 0.007, "max_carry_mass": 140, "movement_enum_variant": "Rudder" } @@ -4819,19 +4819,19 @@ ] }, "movement": { - "barrel_speed_light": 1.5, - "barrel_speed_heavy": 1, - "bank_speed_light": 35, - "bank_speed_heavy": 20, - "elevation_speed_light": 2, + "barrel_speed_light": 2.0625, + "barrel_speed_heavy": 0.1, + "bank_speed_light": 48.125, + "bank_speed_heavy": 2, + "elevation_speed_light": 2.75, "elevation_speed_heavy": 1, - "rudder_speed_light": 2, + "rudder_speed_light": 2.75, "rudder_speed_heavy": 1, - "thrust_light": 35, - "thrust_heavy": 20, - "vtol_velocity_light": 90, - "vtol_velocity_heavy": 45, - "speed_boost": 0.008, + "thrust_light": 48.125, + "thrust_heavy": 2, + "vtol_velocity_light": 123.75, + "vtol_velocity_heavy": 18, + "speed_boost": 0.011, "max_carry_mass": 180, "movement_enum_variant": "Rudder" } @@ -4912,19 +4912,19 @@ ] }, "movement": { - "barrel_speed_light": 1.5, - "barrel_speed_heavy": 1, - "bank_speed_light": 35, - "bank_speed_heavy": 20, - "elevation_speed_light": 2, + "barrel_speed_light": 2.0625, + "barrel_speed_heavy": 0.1, + "bank_speed_light": 48.125, + "bank_speed_heavy": 2, + "elevation_speed_light": 2.75, "elevation_speed_heavy": 1, - "rudder_speed_light": 2, + "rudder_speed_light": 2.75, "rudder_speed_heavy": 1, - "thrust_light": 35, - "thrust_heavy": 20, - "vtol_velocity_light": 90, - "vtol_velocity_heavy": 45, - "speed_boost": 0.01, + "thrust_light": 48.125, + "thrust_heavy": 2, + "vtol_velocity_light": 123.75, + "vtol_velocity_heavy": 18, + "speed_boost": 0.014, "max_carry_mass": 220, "movement_enum_variant": "Rudder" } @@ -14319,8 +14319,8 @@ }, "movement": { "Hover": { - "horizontal_top_speed": 190, - "max_vertical_velocity": 190, + "horizontal_top_speed": 170, + "vertical_top_speed": 170, "height_tolerance": 0.1, "force_y_offset": 0.5, "turning_scale": 0.1, @@ -14328,13 +14328,13 @@ "hover_damping": 5, "angular_damping": 10, "light_machine_mass": 1, - "heavy_machine_mass": 4000, + "heavy_machine_mass": 2600, "deceleration_multiplier": 3, "movement_enum_variant": "Hover" }, "MechLeg": { - "horizontal_top_speed": 170, - "max_vertical_velocity": 170, + "horizontal_top_speed": 150, + "vertical_top_speed": 150, "min_required_items": 2, "min_items_modifier": 0.7, "deceleration_multiplier": 3, @@ -14343,75 +14343,75 @@ "movement_enum_variant": "MechLeg" }, "Rotor": { - "horizontal_top_speed": 180, - "max_vertical_velocity": 180, + "horizontal_top_speed": 160, + "vertical_top_speed": 160, "light_machine_mass": 1, - "heavy_machine_mass": 1500, + "heavy_machine_mass": 2800, "max_turn_rate": 8000, "movement_enum_variant": "Rotor" }, "TankTrack": { - "horizontal_top_speed": 180, - "max_vertical_velocity": 180, + "horizontal_top_speed": 160, + "vertical_top_speed": 160, "light_machine_mass": 1, "heavy_machine_mass": 100000, "movement_enum_variant": "TankTrack" }, "Thruster": { - "horizontal_top_speed": 230, - "max_vertical_velocity": 230, + "horizontal_top_speed": 250, + "vertical_top_speed": 250, "light_machine_mass": 1, - "heavy_machine_mass": 2200, + "heavy_machine_mass": 4000, "movement_enum_variant": "Thruster" }, "Propeller": { - "horizontal_top_speed": 140, - "max_vertical_velocity": 140, + "horizontal_top_speed": 250, + "vertical_top_speed": 250, "light_machine_mass": 1, - "heavy_machine_mass": 3000, + "heavy_machine_mass": 4000, "movement_enum_variant": "Propeller" }, "Wheel": { - "horizontal_top_speed": 220, - "max_vertical_velocity": 220, + "horizontal_top_speed": 200, + "vertical_top_speed": 200, "light_machine_mass": 1, "heavy_machine_mass": 50000, "movement_enum_variant": "Wheel" }, "Wing": { - "horizontal_top_speed": 230, - "max_vertical_velocity": 230, + "horizontal_top_speed": 210, + "vertical_top_speed": 210, "light_machine_mass": 1, - "heavy_machine_mass": 8000, + "heavy_machine_mass": 1800, "movement_enum_variant": "Wing" }, "Rudder": { - "horizontal_top_speed": 230, - "max_vertical_velocity": 230, + "horizontal_top_speed": 250, + "vertical_top_speed": 250, "light_machine_mass": 1, - "heavy_machine_mass": 3000, + "heavy_machine_mass": 800, "movement_enum_variant": "Rudder" }, "InsectLeg": { - "horizontal_top_speed": 200, - "max_vertical_velocity": 200, + "horizontal_top_speed": 180, + "vertical_top_speed": 180, "light_machine_mass": 1, - "heavy_machine_mass": 15000, + "heavy_machine_mass": 10000, "movement_enum_variant": "InsectLeg" }, "Ski": { - "horizontal_top_speed": 400, - "max_vertical_velocity": 400, + "horizontal_top_speed": 380, + "vertical_top_speed": 380, "movement_enum_variant": "Ski" }, "SprinterLeg": { - "horizontal_top_speed": 180, - "max_vertical_velocity": 180, + "horizontal_top_speed": 160, + "vertical_top_speed": 160, "min_required_items": 2, "min_items_modifier": 0.6, "deceleration_multiplier": 3, "light_machine_mass": 1, - "heavy_machine_mass": 20000, + "heavy_machine_mass": 2650, "movement_enum_variant": "SprinterLeg" } }, @@ -14539,4 +14539,4 @@ } ] } -} +} \ No newline at end of file diff --git a/rc_core/src/data/movement_list.rs b/rc_core/src/data/movement_list.rs index e01877d..1329c79 100644 --- a/rc_core/src/data/movement_list.rs +++ b/rc_core/src/data/movement_list.rs @@ -81,7 +81,6 @@ pub struct HoverCategoryData { pub force_y_offset: f32, pub turning_scale: f32, pub small_angle_turning_scale: f32, - pub max_vertical_velocity: f32, pub hover_damping: f32, pub angular_damping: f32, pub deceleration_multiplier: f32, @@ -94,7 +93,6 @@ impl HoverCategoryData { (Typed::Str("forceYOffset".into()), Typed::Float(self.force_y_offset)), (Typed::Str("turningScale".into()), Typed::Float(self.turning_scale)), (Typed::Str("smallAngleTurningScale".into()), Typed::Float(self.small_angle_turning_scale)), - (Typed::Str("verticalTopSpeed".into()), Typed::Float(self.max_vertical_velocity)), (Typed::Str("hoverDamping".into()), Typed::Float(self.hover_damping)), (Typed::Str("angularDamping".into()), Typed::Float(self.angular_damping)), (Typed::Str("decelerationMultiplier".into()), Typed::Float(self.deceleration_multiplier)), diff --git a/rc_core/src/persist/config/cubes_json.rs b/rc_core/src/persist/config/cubes_json.rs index 6cadc63..a0f5e54 100644 --- a/rc_core/src/persist/config/cubes_json.rs +++ b/rc_core/src/persist/config/cubes_json.rs @@ -25,6 +25,13 @@ impl CubeConfig { let file = std::fs::File::open(root.as_ref().join(CUBE_CONFIG_FILENAME))?; let buffered = std::io::BufReader::new(file); let result = serde_json::from_reader(buffered)?; + #[cfg(debug_assertions)] + { + let filename = root.as_ref().join(format!("{}.dump.json", CUBE_CONFIG_FILENAME.trim_end_matches(".json"))); + let file = std::fs::File::create(filename)?; + let buffered = std::io::BufWriter::new(file); + serde_json::to_writer_pretty(buffered, &result)?; + } Ok(result) } } diff --git a/rc_core/src/persist/movement.rs b/rc_core/src/persist/movement.rs index c13a8b2..b42fbad 100644 --- a/rc_core/src/persist/movement.rs +++ b/rc_core/src/persist/movement.rs @@ -74,7 +74,6 @@ pub struct HoverCategoryData { pub force_y_offset: f32, pub turning_scale: f32, pub small_angle_turning_scale: f32, - pub max_vertical_velocity: f32, pub hover_damping: f32, pub angular_damping: f32, pub deceleration_multiplier: f32, @@ -87,7 +86,6 @@ impl std::convert::Into for Hover force_y_offset: self.force_y_offset, turning_scale: self.turning_scale, small_angle_turning_scale: self.small_angle_turning_scale, - max_vertical_velocity: self.max_vertical_velocity, hover_damping: self.hover_damping, angular_damping: self.angular_damping, deceleration_multiplier: self.deceleration_multiplier, diff --git a/utils/cube_gen.py b/utils/cube_gen.py index 892291d..51b112a 100755 --- a/utils/cube_gen.py +++ b/utils/cube_gen.py @@ -322,7 +322,7 @@ def is_variant_guess(name: str, sprite: str) -> bool: return False FIELD_NAME_EXCEPTIONS = { - "verticalTopSpeed": "max_vertical_velocity", + #"verticalTopSpeed": "vertical_top_speed", } def rename_field(original: str) -> str: