Fixed airdrop glitch #341
Merged
Fixed airdrop glitch #341
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Now when an airdrop has landed it will check if its colliding with other airdrops and move.
The airdrop now checks if its colliding with any other airdrops and fixes its position.
kenos1
suggested changes
Jun 19, 2024
server/src/objects/parachute.ts
Outdated
| @@ -70,6 +72,25 @@ export class Parachute extends BaseGameObject<ObjectCategory.Parachute> { | |||
| amount: Infinity, | |||
| source: crate | |||
| }); | |||
| if (object.definition.idString == "airdrop_crate_locked" && object != crate){ | |||
| var xDif = crate.position.x - object.position.x | |||
server/src/objects/parachute.ts
Outdated
| @@ -70,6 +72,25 @@ export class Parachute extends BaseGameObject<ObjectCategory.Parachute> { | |||
| amount: Infinity, | |||
| source: crate | |||
| }); | |||
| if (object.definition.idString == "airdrop_crate_locked" && object != crate){ | |||
| var xDif = crate.position.x - object.position.x | |||
There was a problem hiding this comment.
you don't need xDif and yDif as we have a vector subtraction function
server/src/objects/parachute.ts
Outdated
| @@ -70,6 +72,25 @@ export class Parachute extends BaseGameObject<ObjectCategory.Parachute> { | |||
| amount: Infinity, | |||
| source: crate | |||
| }); | |||
| if (object.definition.idString == "airdrop_crate_locked" && object != crate){ | |||
| var xDif = crate.position.x - object.position.x | |||
| if (xDif <= 0){ | |||
There was a problem hiding this comment.
please run pnpm lint to fix inconsistent spacing
server/src/objects/parachute.ts
Outdated
| @@ -70,6 +72,25 @@ export class Parachute extends BaseGameObject<ObjectCategory.Parachute> { | |||
| amount: Infinity, | |||
| source: crate | |||
| }); | |||
| if (object.definition.idString == "airdrop_crate_locked" && object != crate){ | |||
There was a problem hiding this comment.
checking for idStrings is bad but this may be the only option so add a comment saying it is a hack
server/src/objects/parachute.ts
Outdated
| } | ||
| var position = Vec.create(xDif, yDif); | ||
| crate.hitbox = object.hitbox.transform(position); | ||
| crate.position = crate.hitbox.getCenter() |
There was a problem hiding this comment.
inconsistent semicolons, run pnpm lint
Err0r430
approved these changes
Jun 19, 2024
|
Added |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The airdrops don't overlap anymore.