Airdrop glitch fix

This fixes most of the issues with airdrops. There are still rare cases when they will go on top of each other but its much less common now.
HasangerGames · Jun 30, 2024 · 355ca49 · 355ca49
1 parent 84691c4
commit 355ca49
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/server/src/game.ts b/server/src/game.ts
@@ -1026,12 +1026,22 @@ export class Game implements GameData {
             for (const airdrop of this.airdrops) {
                 thisHitbox = crateHitbox.transform(position);
                 const thatHitbox = (airdrop.type.spawnHitbox ?? airdrop.type.hitbox).transform(airdrop.position);
+                const unchangedHitbox = thisHitbox.clone();
 
                 if (thisHitbox.collidesWith(thatHitbox)) {
                     collided = true;
                     thisHitbox.resolveCollision(thatHitbox);
+
+                    position = thisHitbox.getCenter();
+
+                    if (unchangedHitbox.toRectangle().min.x == thisHitbox.toRectangle().min.x && unchangedHitbox.toRectangle().min.y == thisHitbox.toRectangle().min.y) {
+                        const crateLength = airdrop.type.spawnHitbox!.toRectangle().max.x - airdrop.type.spawnHitbox!.toRectangle().min.x;
+                        const random = Math.floor(Math.random() * 2);
+
+                        if (random == 0) position.x = position.x + crateLength;
+                        else position.x = position.x - crateLength;
+                    }
                 }
-                position = thisHitbox.getCenter();
                 if (collided) break;
             }
 

diff --git a/server/src/objects/parachute.ts b/server/src/objects/parachute.ts
@@ -70,24 +70,6 @@ export class Parachute extends BaseGameObject<ObjectCategory.Parachute> {
                                 amount: Infinity,
                                 source: crate
                             });
-                            // Hacky hacky solution probably not the smartest solution atm but fuck it we ball :shrug:
-                            if (object.definition.idString == "airdrop_crate_locked" && object != crate) {
-                                let xDif = crate.position.x - object.position.x;
-                                if (xDif <= 0) {
-                                    xDif = xDif + 10;
-                                } else {
-                                    xDif = xDif - 10;
-                                }
-                                let yDif = crate.position.y - object.position.y;
-                                if (yDif <= 0) {
-                                    yDif = yDif + 10;
-                                } else {
-                                    yDif = yDif - 10;
-                                }
-                                const position = Vec.create(xDif, yDif);
-                                crate.hitbox = object.hitbox.transform(position);
-                                crate.position = crate.hitbox.getCenter();
-                            }
                             break;
                         }
                         case object instanceof Building && object.scopeHitbox?.collidesWith(crate.hitbox): {