Skip to content

Commit ec8e94b

Browse files
committed
fix oopsie and make force stronger
1 parent 3db1198 commit ec8e94b

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

common/src/main/kotlin/org/valkyrienskies/clockwork/content/contraptions/propeller/blades/BladeControllerBlockEntity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BladeControllerBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state:
3636
var blades: NonNullList<ItemStack> = NonNullList.withSize(8, ItemStack.EMPTY)
3737

3838
var bladeAngle: Double = 0.0
39-
var bladeLength: Int = 5
39+
var bladeLength: Int = 1
4040

4141
var clientBladeAngle = LerpedFloat.angular()
4242
.chase(bladeAngle, 0.5, LerpedFloat.Chaser.EXP)

common/src/main/kotlin/org/valkyrienskies/clockwork/content/forces/PropellerController.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,9 @@ class PropellerController(
5050
// Propeller Thrust
5151
for (physData in appliers.values) {
5252
if(physData.active) {
53-
val (force, torque) = if (physData.brass) {
54-
computeForce(
55-
physShip.transform, physData, (physShip).velocity, physShip.omega, physShip
56-
)
57-
} else {
58-
computeBladeForce(physShip, physData)
59-
}
53+
val (force, torque) = if (physData.brass) computeForce(physShip.transform, physData, (physShip).velocity, physShip.omega, physShip)
54+
else computeBladeForce(physShip, physData)
55+
6056
if (force.isFinite && torque.isFinite) {
6157
if (physData.brass) {
6258
physShip.applyInvariantForce(force)
@@ -228,7 +224,7 @@ class PropellerController(
228224
val force = worldAxis.mul(dThrust, Vector3d())
229225
val torque = rotatedDist.cross(force, Vector3d())
230226

231-
netForce.add(force.mul(10.0))
227+
netForce.add(force.mul(50.0))
232228
netTorque.add(torque)
233229
}
234230

0 commit comments

Comments
 (0)