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

Aftershock Exoskeletons #53254

Merged
merged 190 commits into from
Feb 1, 2022
Merged

Aftershock Exoskeletons #53254

merged 190 commits into from
Feb 1, 2022

Conversation

Drew4484
Copy link
Contributor

@Drew4484 Drew4484 commented Dec 7, 2021

Adds modular power armor exoskeletons. A variety of armor plating types as well as offensive, defensive, and utility modules are available.

Summary

Content "Update the modern day exoskeletons for Aftershock"

Purpose of change

Update the modern day exoskeletons used in #52322 for Aftershock. Changes will include:

  • Battery consumption in line with other Aftershock armor
  • Optional utility, offensive, and defensive modules
  • Optional work suits be worn in various climates

Describe the solution

Repurpose existing utility exoskeletons, add new capabilities.

Describe alternatives you've considered

None

Testing

Spawn exoskeleton, functions via UPS power, accepts power supply backpack units. First pass of armor plating (plastic, steel, vacuum carbide) has been tested, all types except steel break as ablative armor and must be replaced or reforged. Steel can be repaired. Modules activate and function properly.

Additional context

@Zireael07
Copy link
Contributor

Please make the PR title more descriptive... just "Draft" isn't helpful. (Edit button in top right of page)

@Drew4484 Drew4484 changed the title Draft Aftershock Exoskeletons Dec 7, 2021
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Dec 7, 2021
@Fris0uman
Copy link
Contributor

Your summary line should be Content "Update the modern day exoskeletons for Aftershock"

@wapcaplet wapcaplet added [JSON] Changes (can be) made in JSON Mods: Aftershock Anything to do with the Aftershock mod <Enhancement / Feature> New features, or enhancements on existing labels Dec 7, 2021
data/mods/Aftershock/items/tools.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/armor/exoskeletons.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/tools.json Outdated Show resolved Hide resolved
@wapcaplet wapcaplet added the Items: Armor / Clothing Armor and clothing label Dec 10, 2021
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Dec 11, 2021
@John-Candlebury
Copy link
Member

John-Candlebury commented Dec 11, 2021

So just without actually playtesting this or delving deep into the json definitions:

-There's a .lnk and .font file that you probably committed by mistake, should remove those.
-You also need to add flag definitions to the flag.h file, much as you did with flag.cpp to get the DDA to compile successfully. Also Im not actually sure you need to declare them in the code if you dont plan to use them there.

I'll test the rest in a bit.

@John-Candlebury
Copy link
Member

Theres something strange going on with encumbrance when any of the frame items are equiped with plates.
After succesively powering and unpowering the suit for a few times without taking it off, the suit gains a lot of encumbrance when activated, and has none when inactive.

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Dec 13, 2021
Copy link
Contributor

@Mom-Bun Mom-Bun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for taking a bit to get to this! but this is what I noticed in it, put down my thoughts, and a description for the book possibly if that is alright!

Most of the items in this are very generic so the descriptions didn't need that much for lore-wise I don't think, but I felt like I could fit something in with the manual!

data/mods/Aftershock/items/books.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/books.json Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

This is an automated message. Please kindly disregard if you think this is inaccurate.

Automatic spell checking encountered unrecognized words in the following text:

  • A hardpoint for storing a rifle. Activate to holster/draw a gun.
  • A large storage pack, mountable on a hardpoint.
  • A medium storage pouch, mountable on a hardpoint.
  • A set of pouches that attach to a hardpoint.
  • A small storage pouch, mountable on a hardpoint.
  • Designed to attach to an exoskeleton's back, this is an internal combustion engine generator with an integrated UPS. This unit is large and occupies the rear hardpoints.
  • The remains of a accuum-cast carbide arm plate after taking a strong impact. No longer provides functional protection, just weight.
  • This is a large rechargable auxiliary power unit that attaches to an exoskeleton hardpoint.
  • This is a light that can be secured to an exoskeleton hardpoint. It has two levels of brightness.
  • This is a small rechargable auxiliary power unit that attaches to an exoskeleton hardpoint.
  • This is meant for an exoskeleton PSU hardpoint.
  • This module increases the exoskeleton's weight bearing at the cost of increased power cosumption.
  • This module increases the exoskeleton's weight bearing at the cost of increased power cosumption. It is turned on and continually drawing power. Use it to turn it off.
  • This module significantly increases the exoskeleton's weight bearing at the cost of increased power cosumption.
  • This module significantly increases the exoskeleton's weight bearing at the cost of increased power cosumption. It is turned on and continually drawing power. Use it to turn it off.
  • exoskeleton ICE power supplys
  • exoskeleton auxiliary batterys
  • exoskeleton maintenance gantrys
  • exoskeleton scabbards
  • exoskeleton small auxiliary batterys
  • exoskeleton undersuit
  • exoskeleton undersuits
  • large storage pouchs
  • shattered accuum-cast carbide arm plate
  • shattered accuum-cast carbide arm plates

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 28, 2021
@github-actions
Copy link
Contributor

This is an automated message. Please kindly disregard if you think this is inaccurate.

Automatic spell checking encountered unrecognized words in the following text:

  • A hardpoint for storing a rifle. Activate to holster/draw a gun.
  • A large storage pack, mountable on a hardpoint.
  • A medium storage pouch, mountable on a hardpoint.
  • A set of pouches that attach to a hardpoint.
  • A small storage pouch, mountable on a hardpoint.
  • Designed to attach to an exoskeleton's back, this is an internal combustion engine generator with an integrated UPS. This unit is large and occupies the rear hardpoints.
  • This is a large rechargable auxiliary power unit that attaches to an exoskeleton hardpoint.
  • This is a light that can be secured to an exoskeleton hardpoint. It has two levels of brightness.
  • This is a small rechargable auxiliary power unit that attaches to an exoskeleton hardpoint.
  • This is meant for an exoskeleton PSU hardpoint.
  • exoskeleton maintenance gantrys
  • exoskeleton undersuit
  • exoskeleton undersuits

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 28, 2021
@John-Candlebury
Copy link
Member

Im temporarily back from holidays.
Whats the status for this one? Still want to add stuff or is it ready for final testing?

Drew4484 and others added 25 commits January 31, 2022 23:44
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Feb 1, 2022
@kevingranade kevingranade merged commit 119e2fe into CleverRaven:master Feb 1, 2022
@Drew4484 Drew4484 deleted the ASF_exos branch June 20, 2023 06:41
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 <Enhancement / Feature> New features, or enhancements on existing Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants