-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Adjust heavyduty lights #77667
Merged
Night-Pryanik
merged 5 commits into
CleverRaven:master
from
ampersand55:adjust_heavyduty_lights
Nov 11, 2024
Merged
Adjust heavyduty lights #77667
Night-Pryanik
merged 5 commits into
CleverRaven:master
from
ampersand55:adjust_heavyduty_lights
Nov 11, 2024
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
github-actions
bot
added
[JSON]
Changes (can be) made in JSON
Items: Armor / Clothing
Armor and clothing
Game: Balance
Balancing of (existing) in-game features.
json-styled
JSON lint passed, label assigned by github actions
astyled
astyled PR, label is assigned by github actions
labels
Nov 8, 2024
github-actions
bot
added
the
Code: Tests
Measurement, self-control, statistics, balancing.
label
Nov 8, 2024
Test told me to place the heavy-duty flashlight in expected_dps_data, so I did. The heavy-duty flashlight just barely passes the weapon threshhold of >5 dps.
|
Co-authored-by: Anton Burmistrov <[email protected]>
github-actions
bot
added
the
BasicBuildPassed
This PR builds correctly, label assigned by github actions
label
Nov 8, 2024
I assume the overmap test fail is unrelated to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
astyled
astyled PR, label is assigned by github actions
BasicBuildPassed
This PR builds correctly, label assigned by github actions
Code: Tests
Measurement, self-control, statistics, balancing.
Game: Balance
Balancing of (existing) in-game features.
Items: Armor / Clothing
Armor and clothing
[JSON]
Changes (can be) made in JSON
json-styled
JSON lint passed, label assigned by github actions
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.
Summary
Balance "Buff heavy-duty flashlight and adjust heavy-duty headlamp to match heavy-duty flashlight"
Purpose of change
Continuation of #77461 but with heavy duty versions.
The heavy-duty headlamp is from a recipe that uses heavy-duty flashlight, and it can be reversed into a heavy-duty flashlight, therefore we should expect them both to function the same way. However, in the transformation to a headlight we lose weight, volume and makes it take light-batteries instead of built-in batteries.
Also buff heavy-duty flashlight to be more distinct from flashlight based on emergency response flashlights.
The current heavy-duty flashlight is based on this item:
https://www.amazon.com/dp/B00Y8AHZYC
Which is hard to imagine strapping to your head as a headlamp. It also doesn't fit its item description where it's made from heavy-duty aluminum.
Describe the solution
As with the regular headlight in #77461, I'm going to assume an efficiency of 150 lumen / W and look at the batteries and advertised burn time, and then calculate lightness and power draw value from there as the advertised brightness/lumen values varies so widely from brand to brand.
My assumptions is that we want this:
I propose we base the heavy-duty flashlight on a flashlight designed for hazardous environments for use by e.g. firefighters and the mining/petroleum industry. They are usually marketed with certifications such as ATEX and/or NFPA.
Most of these share the following specs:
This is based on Nightstick xpp-5564rxa and xpp-5462rx. A headlight and flashlight from the same company with similar specs.
Assuming a
MEDIUM_BATTERY
corresponds to 3xAAA batteries and AA batteries have twice the energy density of AAA batteries. I'm going to set an internal battery with twice the storage capacity of regular flashlight (112 kJ).From this and advertised burn time of 7 hours I will set its adjusted nominal lumen value to 650:
https://www.wolframalpha.com/input?i=112+kJ+%2F+7+hours+*+150+lumen+%2F+watt+in+lumen
Comparison between regular flashlight/headlight and old/new heavy-duty flashlight/headlight:
LIGHT_300
LIGHT_500
LIGHT_650
Describe alternatives you've considered
Making the heavy-duty flashlight be a floodlight like this model:
https://www.nightstick.com/collections/fire/products/xpr-5581rx
But then it would be harder to use as a melee weapon and to convert to a headlamp.
Testing
It loads and seems to work as expected in game.
Additional context