thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-02-23 14:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix pinball wizard startpad

Browse source
This commit is contained in:
RandomityGuy 2021-07-06 16:07:13 +05:30
parent 4077022eed
commit c48f9e3a73
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
marblegame.hl
View file

Binary file not shown.

17
src/Marble.hx
View file

@ -343,6 +343,7 @@ class Marble extends GameObject {
// }
var desiredYVelocity = this._maxRollVelocity * mv.y;
var desiredXVelocity = this._maxRollVelocity * mv.x;
if (desiredYVelocity != 0 || desiredXVelocity != 0) {
if (currentYVelocity > desiredYVelocity && desiredYVelocity > 0) {
desiredYVelocity = currentYVelocity;
@ -869,12 +870,22 @@ class Marble extends GameObject {
var pos = this.getAbsPos().getPosition();
if (mode == Start) {
var startPadNormal = this.startPad.getAbsPos().up();
this.velocity = startPadNormal.multiply(this.velocity.dot(startPadNormal));
var upVec = this.level.currentUp;
var startpadNormal = startPad.getAbsPos().up();
this.velocity = upVec.multiply(this.velocity.dot(upVec));
// Apply contact forces in startPad up direction if upVec is not startpad up, fixes the weird startpad shit in pinball wizard
if (upVec.dot(startpadNormal) < 0.95) {
for (contact in contacts) {
var normF = contact.normal.multiply(contact.normalForce);
var startpadF = startpadNormal.multiply(normF.dot(startpadNormal));
var upF = upVec.multiply(normF.dot(upVec));
this.velocity = this.velocity.add(startpadF.multiply(timeStep / 4));
}
}
}
if (mode == Finish) {
this.velocity = this.velocity.multiply(0.9);
this.velocity = this.velocity.multiply(0.7);
}
var newPos = pos.add(this.velocity.multiply(timeStep));