Private
Public Access
1
0

add pics
All checks were successful
Dynamic Branch Deploy / build-and-deploy (push) Successful in 1m11s

This commit is contained in:
Sebastian Unterschütz
2025-11-25 19:28:08 +01:00
parent 553f4c2944
commit 36a4847381
10 changed files with 248 additions and 140 deletions

View File

@@ -1,12 +1,23 @@
function updateGameLogic() {
if (isCrouching) {
inputLog.push({ t: currentTick - lastSentTick, act: "DUCK" });
}
// 1. Speed Berechnung (Sync mit Server!)
let currentSpeed = BASE_SPEED + (score / 500.0) * 0.5;
if (currentSpeed > 12.0) currentSpeed = 12.0;
// 2. Input & Sprung
if (isCrouching) inputLog.push({ t: currentTick - lastSentTick, act: "DUCK" });
const originalHeight = 50; const crouchHeight = 25;
player.h = isCrouching ? crouchHeight : originalHeight;
let drawY = isCrouching ? player.y + (originalHeight - crouchHeight) : player.y;
// Jump Power Check
let jumpP = JUMP_POWER;
if (bootTicks > 0) {
jumpP = HIGH_JUMP_POWER;
bootTicks--;
}
// Physik
player.vy += GRAVITY;
if (isCrouching && !player.grounded) player.vy += 2.0;
player.y += player.vy;
@@ -14,16 +25,45 @@ function updateGameLogic() {
if (player.y + originalHeight >= GROUND_Y) {
player.y = GROUND_Y - originalHeight; player.vy = 0; player.grounded = true;
} else { player.grounded = false; }
// 3. Obstacles
let nextObstacles = [];
let rightmostX = 0;
let nextObstacles = []; let rightmostX = 0;
for (let obs of obstacles) {
obs.x -= GAME_SPEED;
obs.x -= currentSpeed;
const playerHitbox = { x: player.x, y: drawY, w: player.w, h: player.h };
if (checkCollision(playerHitbox, obs)) {
player.color = "darkred";
if (!isGameOver) { sendChunk(); gameOver("Kollision"); }
// TYPE CHECK
if (obs.def.type === "coin") {
score += 2000;
continue;
}
else if (obs.def.type === "powerup") {
if (obs.def.id === "p_god") godModeLives = 3;
if (obs.def.id === "p_bat") hasBat = true;
if (obs.def.id === "p_boot") bootTicks = 600;
continue;
}
else {
// HINDERNIS
if (hasBat && obs.def.type === "teacher") {
hasBat = false;
continue; // Zerstört!
}
if (godModeLives > 0) {
godModeLives--;
continue; // Überlebt!
}
player.color = "darkred";
if (!isGameOver) { sendChunk(); gameOver("Kollision"); }
}
}
if (obs.x + obs.def.width > -100) {
nextObstacles.push(obs);
if (obs.x + obs.def.width > rightmostX) rightmostX = obs.x + obs.def.width;
@@ -31,23 +71,43 @@ function updateGameLogic() {
}
obstacles = nextObstacles;
// Spawning
// 4. Spawning (Sync mit Go!)
if (rightmostX < GAME_WIDTH - 10 && gameConfig) {
const gap = Math.floor(400 + rng.nextRange(0, 500));
let spawnX = rightmostX + gap; if (spawnX < GAME_WIDTH) spawnX = GAME_WIDTH;
const isBossPhase = (score % 1500) > 1200;
let possibleObs = [];
gameConfig.obstacles.forEach(def => {
if (def.id === "eraser") { if (score >= 500) possibleObs.push(def); } else possibleObs.push(def);
if (isBossPhase) {
if (def.id === "principal" || def.id === "trashcan") possibleObs.push(def);
} else {
if (def.id === "principal") return;
if (def.id === "eraser" && score < 500) return;
possibleObs.push(def);
}
});
const def = rng.pick(possibleObs);
let def = rng.pick(possibleObs);
// Speech Sync
let speech = null;
if (def && def.canTalk) { if (rng.nextFloat() > 0.7) speech = rng.pick(def.speechLines); }
if (def && def.canTalk) {
if (rng.nextFloat() > 0.7) speech = rng.pick(def.speechLines);
}
// Powerup Rarity Sync (Muss exakt wie Go sein: 10% Chance)
if (def && def.type === "powerup") {
if (rng.nextFloat() > 0.1) def = null;
}
if (def) {
const yOffset = def.yOffset || 0;
obstacles.push({ x: spawnX, y: GROUND_Y - def.height - yOffset, def: def, speech: speech });
obstacles.push({
x: spawnX, y: GROUND_Y - def.height - yOffset,
def: def, speech: speech
});
}
}
}