Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Freeplace entity/crowbar melee damage #2002

Merged
merged 12 commits into from
Mar 12, 2024
Merged

Freeplace entity/crowbar melee damage #2002

merged 12 commits into from
Mar 12, 2024

Conversation

Nikolassparrow
Copy link
Contributor

@Nikolassparrow Nikolassparrow commented Mar 4, 2024

https://www.youtube.com/watch?v=gCDJL4-oxnw (2:48)

So in 2016, wood planks had an additional chance to spawn inside wooden crates on top of the selected item (so 2 items). Currently on H1EMU, wood planks are apart of the loot tables so that was updated to be removed and into it's own area to generate on top of the base item from the crate (currently 60% chance of wood plank if player breaks w/ crowbar and 20% - same chance as the loot spawn table)

Also in #1665 and in H1Z1 2016, crowbars did significant damage to "metal objects" and were the primary way to remove freeplaced entities in the world. Currently I set it to 8 melee hits on objects with parents and 4 melee hits on objects without parents (so world placed essentially). I also added a 2x decay multiplier to world freeplaced entities so they'll decay in 7 ticks so ~7 days.

I moved the logic for bee box retaliation to its own function to provide some clarity for OnMeleeHit inside of LootableConstructionEntity too.

…ntities (8 for entities with parents, 4 for freeplace world entities), remove wood planks from crate spawns and add ability to generate upon destruction
@github-actions github-actions bot added the client-2016 About the 2016 client label Mar 4, 2024
@Nikolassparrow Nikolassparrow changed the title Faster decay free place Freeplace entity/crowbar melee damage Mar 4, 2024
@Nikolassparrow
Copy link
Contributor Author

Nikolassparrow commented Mar 4, 2024

Just realized while i was taking a shit that users could destroy world proped furnaces, so added a check for that. Gonna also work on OnProjectileHit soon also

@Nikolassparrow
Copy link
Contributor Author

Added OnProjectileHit, 13 308 shots for freeplaced objects and 26 shots for objects with parents. Values could be adjusted I wasn't sure what was a good amount, I was taking in to count that large groups could all shoot the same LootableConstructionEntity and destroy it quickly if it was too low

@QuentinGruber QuentinGruber added this to the v0.35.0 milestone Mar 8, 2024
Copy link
Owner

sorry the latest merge created merge conflicts

@Nikolassparrow
Copy link
Contributor Author

sorry the latest merge created merge conflicts

All good 👍 I kinda expected this to happen which is why I didn't do an enum before hand 😅 Accidentally deleted the wrong thing gotta fix that rq lol

@QuentinGruber
Copy link
Owner

sorry the latest merge created merge conflicts

All good 👍 I kinda expected this to happen which is why I didn't do an enum before hand 😅 Accidentally deleted the wrong thing gotta fix that rq lol

aha kk

@Nikolassparrow
Copy link
Contributor Author

sorry the latest merge created merge conflicts

All good 👍 I kinda expected this to happen which is why I didn't do an enum before hand 😅 Accidentally deleted the wrong thing gotta fix that rq lol

aha kk

Should be good now 👍

@QuentinGruber QuentinGruber merged commit 38349b6 into dev Mar 12, 2024
17 checks passed
@Nikolassparrow Nikolassparrow deleted the fasterDecayFreePlace branch March 12, 2024 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client-2016 About the 2016 client
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants