Skip to content

Commit 21b1c7c

Browse files
committed
tried making bomb enemy springs
1 parent 55b3864 commit 21b1c7c

1 file changed

Lines changed: 23 additions & 22 deletions

File tree

game/game.js

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32756,7 +32756,7 @@ var version = "v1.14.0";
3275632756
let edge = null,
3275732757
newDirection = a.direction,
3275832758
y = false;
32759-
for (const { object: e, index: a } of [...n, ...springs]) {
32759+
for (const { object: e, index: a } of n) {
3276032760
if ("enemy" === e.type && a === i) continue;
3276132761
let n = e;
3276232762
if ("switchPlatform" === e.type && 0 !== e.rotation) {
@@ -32800,6 +32800,15 @@ var version = "v1.14.0";
3280032800
) &&
3280132801
((edge = be.getObjectTopY(e, t.x, t.y) + t.height / 2), (newY = edge),
3280232802
n.kind == "walkerHelmet" && !t.isCompatible && (y = true)),
32803+
!n.canJumpThrough &&
32804+
be.rectTouchesRect2(
32805+
newX,
32806+
newY + t.height * (3 / 8),
32807+
t.width / 2,
32808+
t.height / 4,
32809+
n,
32810+
) &&
32811+
((newY = be.getObjectTopY(e, t.x, t.y) - t.height / 2), (a.speedY = 0)),
3280332812
(n.canJumpThrough && !t.isCompatible) ||
3280432813
(be.rectTouchesRect2(
3280532814
newX - t.width / 4,
@@ -32821,20 +32830,22 @@ var version = "v1.14.0";
3282132830
);
3282232831
}
3282332832
for (const spring of springs) {
32824-
/*be.rectTouchesRect2(
32833+
be.rectTouchesRect2(
3282532834
newX,
3282632835
newY,
3282732836
t.width,
3282832837
t.height,
3282932838
spring
3283032839
) && (
32831-
a.speedY = -(spring.direction > 0
32832-
? Math.max(1.5 * G.initGrad(jumpHeight, 1), -Math.abs((a.speedY)))
32833-
: -Math.min(1 * G.initGrad(jumpHeight, 1), a.speedY)) *
32834-
spring.direction,
32835-
h *= df * a.speedY,
32836-
newY = spring.y + (spring.height / 2) * spring.direction + 15 * spring.direction
32837-
)*/
32840+
(a.speedY = -(spring.direction > 0
32841+
? Math.max(l * 3, Math.abs((a.speedY)) * 1.25)
32842+
: Math.min(l, Math.abs(a.speedY))) *
32843+
spring.direction),
32844+
(h = 0),
32845+
(newY = spring.y + (spring.height / 2) * spring.direction + 16 * spring.direction),
32846+
(a.offsetY = newY - o[r[i]].y),
32847+
(edge = null)
32848+
)
3283832849
}
3283932850
if (edge !== null) {
3284032851
if (a.speedY > 1) {
@@ -42868,16 +42879,6 @@ var version = "v1.14.0";
4286842879
e.onPress());
4286942880
},
4287042881
sprites: (t) => [
42871-
conditional(
42872-
() => t,
42873-
() => [
42874-
y({
42875-
fileName: `images/themes/${e.theme}/menu-button-pressed.png`,
42876-
width: 50,
42877-
height: 28,
42878-
}),
42879-
],
42880-
() => [
4288142882
e.theme === "infinite"
4288242883
? p(
4288342884
{
@@ -42894,9 +42895,9 @@ var version = "v1.14.0";
4289442895
fileName: `images/themes/${e.theme}/menu-button.png`,
4289542896
width: 50,
4289642897
height: 28,
42897-
}),
42898-
],
42899-
),
42898+
}, (a) => {
42899+
a.opacity = t ? 0.5 : 1
42900+
})
4290042901
],
4290142902
}),
4290242903
]

0 commit comments

Comments
 (0)