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

Resurrect Wetsuit and diving gear rework #68296

Merged
merged 33 commits into from
Sep 27, 2023

Conversation

GuardianDll
Copy link
Member

Summary

Balance "Wetsuit and diving gear rework by randomtyper"

Purpose of change

#66614 got staleclosed, which is bad. Trying to necromance it

Describe the solution

See #66614, but it seems the PR is already in pretty good shape

Describe alternatives you've considered

bring randomtyper to finish the PR

Testing

Fixing bugs now

randomtyper and others added 30 commits July 23, 2023 20:30
* Make neoprene closer to rubber (as it is a sort of rubber)

* Whoops...

* Linings for neoprene (wetsuits), environmental buffs, material adjustments

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Thanks to dictionary

* Duplicate removal

* Another duplicate

* Make diving socks vehave like NORMAL layer boots, compatibility with boots fix

* Updated night vision/IR goggles to not break in water

* Documented TOUGH_FEET clothing flag

* Technical shorts, XL/XS varieties and more thickness varieties!

* Quickfix

* Another fix

* Fix

* Technical shorts pockets now provide some protection too.

* Update dictionary.txt

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update storage.json

* Update custom_storage.json

* Light Kevlar wetsuit, Kevlar wetsuits retouch

* Nylon thickness adjustment, encumbrance and pocket changes

* Misc adjustments to Kevlar wetsuits

* Custom diving boots initial addition

* Update custom_bodysuits.json

* Update swimming.json

* Initial implementation of survivor diving gloves

* Update custom_bodysuits.json

* Kevlar hoods initial implementation

* Whoops

* Diving leg rig

* Encumbrance for technical shorts bungees

* Whoops

* Update custom_bodysuits.json

* Waterproof camera case

* Update boots.json

* Update flags.json

* Fins for boots

* Update flags.json

* Custom swim fins

* Fix

* Fix

* Another fix

* Fix

* Update dictionary.txt

* Namings

* Glove namings

* Boot namings

* Naming convention change

* Update custom_headgear.json

* Update custom_bodysuits.json

* Update custom_boots.json

* Namings, wordings, and other stuff.

* Update custom_gloves.json

* Update materials.json

* Solving coverage weirdness

* Solving material weirdness

* Moving fins to swimming.json

* Arrival of fins to swimming.json, small tweak

* Custom fin attachment tweak

* Update flags.json

* Head straps for stuff

* Update flags.json

* Update custom_headgear.json

* Diving flashlights

* Flags, more flags

* Wrist mount for a flashlight

* Update dictionary.txt

* Update tool_armor.json

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix

* Fixes

* Update data/json/items/tool/lighting.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update tool_armor.json

* Fix

* Update dictionary.txt

* Add IR goggles to hunting shop loot tables

* Fix

* Fix

* Now swim goggles provide eye protection.

* Survivor wetsuit adjustments and new recipes

* Remove redundant commas

* New wetsuit gloves recipes and their varieties

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update containers.json

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…into neoprene-tweaks

# Conflicts:
#	data/json/recipes/armor/storage.json
#	doc/JSON_FLAGS.md
@GuardianDll
Copy link
Member Author

GuardianDll commented Sep 24, 2023

can someone explain to me where is "too many alternatives" in this recipe (h20survivor_jumpsuit)? i don't understand where i should tweak it to fix
image

Not really sure where i should move with such issues

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map [Markdown] Markdown issues and PRs Items: Containers Things that hold other things Items: Armor / Clothing Armor and clothing Game: Balance Balancing of (existing) in-game features. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Sep 24, 2023
@GuardianDll GuardianDll force-pushed the neoprene-tweaks-undead branch from 7188761 to 635e1fd Compare September 25, 2023 20:42
@GuardianDll GuardianDll marked this pull request as ready for review September 25, 2023 20:58
…lacing not waterproof clasps with hand made waterproof one
@GuardianDll GuardianDll force-pushed the neoprene-tweaks-undead branch from 635e1fd to 23f4726 Compare September 25, 2023 20:59
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 26, 2023
@Maleclypse Maleclypse merged commit e5c0a46 into CleverRaven:master Sep 27, 2023
20 of 23 checks passed
@GuardianDll GuardianDll deleted the neoprene-tweaks-undead branch September 29, 2023 13:03
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 <Documentation> Design documents, internal info, guides and help. Game: Balance Balancing of (existing) in-game features. Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants