Power Armor Overhaul #1505

KheirFerrum · 2022-05-02T21:18:06Z

Summary

SUMMARY: Infrastructure? "Full overhaul of Power Armour system"

Purpose of change

Power Armour effects are all currently hardcoded, and the way it works right now is fairly undeveloped. This PR is essentially a full overhaul of how Power Armour is stored, transforms, and it's effects. There will also be content additions along with this.

As a side effect optical cloaks which also use the ups_based_armor activation have also been changed to function using transforms.

Describe the solution

The goal is a gradual deprecation of the power_armor bool in the json, and rewrite the system so that modular attachments can be applied to power armour. It will also attempt to convert most of the effects of the power_armor bool (like climate control, power armour interface, etc) into JSON flags, as many of these effects can already be replicated with little effort.

Some effects will be added to Power Armour as well, mainly a carry weight modification so that the average joe isn't overburdened by basic power armour.

List of current plans and completed ideas follow.

Describe alternatives you've considered

Removal of the Power Armour Interface and rigging it so that it just draws from UPS instead (at rebalanced rate).

Could be done, but I have some plans for how the Power Armour Interface will work with modular additions. Also, it somewhat gatekeeps the practical use of Power Armour (to little gain, for now, this is part of the rework) Still, it's an idea.

Testing

Spawn in power armour, test that it can be worn and draws power appropriately.
Test that the on version can be turned on, taken off, and dropped without segfaults
Apparently I didn't consider that carrier could be null, fixed.
Test that peripherals cannot be stacked to insane amounts, check that peripherals can be worn with all power armour, etc.

Additional context

Oh, I also reordered the power_armor.json because finding where everything was placed gave me a headache.

Currently completed implementations are:

Power draw, it will either draw from UPS, or be charged by the PA Interface Bionic.
Encumbrance for activated variants has been altered to be similar to original hardcode, with some caveats (Hauling Frames have 5 Encumbrance.)
Flags POWERARMOR_EXO, POWERARMOR_EXTERNAL and POWERARMOR_MOD applied to appropriate items. EXTERNALS cannot be worn on parts with EXO, this is to allow ease of conversion for mods like Secronom, which has biological power armour exoskeletons that cover the entire body. This will also allow us to easily split the Exoskeleton into arms/legs later if it's deemed appropriate (though I'm not personally fond of the idea).
Modify Carry Weight effects were added to activated variants of power armour, so now when activated PA will carry it's own weight.
ups_based_armor action torn out, replaced with set_transform and set_transformed. Meant to be an extensible iuse action for use with more than just power armour, but currently only applies to worn items.
Rewrote the wear code, so now you can wear rings while wearing power armour instead of having to take off PA, wear the ring, then wear PA again. This applies to all 0 coverage items.

Future things to do. [Note: Remember to link the PRs of future fixes to this so that this set of PRs is easy to follow.]

Update exoskeletons and hauling frames to have holsters/sheaths of their own. Add relic data to PA so that it will provide bonuses to stats when activated.
Add more peripherals, including night-vision/infrared, motors to improve strength and/or speed, wrist mounted minilaunchers, and whatever else I can think of, is allowed, and don't die coding.
Overhaul process_tool to use energy units instead of integers. Will need to untangle from other use_charge functions as those need to be in integers, which probably means new functions but could also mean that templates are needed.
Update the itemgroups so that power armour, high tech gear, and power armour mods aren't almost impossible to find.

src/item.cpp

Basic helmets didn't transform, Heavy Helmet transformed into Heavy Exoskeleton, crashing the game.

Changed some of the text and flavour. Introduced new power armour flags and integrated UPS drain into them. power_armor tag deprecated. Removed the final vestiges of ups_based_armor. Rewrote the power armour can_wear process.

Coolthulhu · 2022-05-13T18:05:45Z

src/character.cpp

-            return true;
+        if( elem.has_flag( flag_POWERARMOR_EXO ) ) {
+            result = true;
+            if( hasHelmet == nullptr ) {


Unrelated to the PR itself, but this bool *hasHelmet is a terrible practice. Nowadays we'd return a struct or pair and not bother early exiting a loop over worn items because worn items vector is small.

I'm not sure how this should be fixed to be honest, C++ is still fairly arcane to me.

src/item.cpp

Was throwing up a few build errors for whatever reason.

Also adds code to check that a swap is valid. This only matters for power armour right now.

AngelicosPhosphoros · 2022-06-13T09:54:49Z

src/item.cpp

@@ -9203,16 +9284,46 @@ bool item::process_tool( player *carrier, const tripoint &pos )
    energy -= ammo_consume( energy, pos );

    // for items in player possession if insufficient charges within tool try UPS
-    if( carrier && has_flag( flag_USE_UPS ) ) {
+    if( carrier && ( has_flag( flag_USE_UPS ) || ( is_power_armor() ) ) ) {


Can we just make power armor use UPS and make it processed like any other UPS tool here? Switching off doesn't seem to be something specific for power armor.

I don't understand your meaning, this is my method of having the power armour use ups charges without having the (UPS) suffix and an incorrect description that the device has been "modified to run off a universal power supply" since that is it's default state.

It is thus processed exactly like a UPS tool assuming the power armour interface is not installed/activated.

I'd rather have the incorrect description, since many items have it as well. It looks like we may need to change the description, but for power armors, it should be consistent with other UPS items, even if the description is currently not perfect.

I just think it's really ugly, and I already folded the UPS description/function into the POWERARMOR_EXO/EXTERNAL/MOD flags alongside the Bionic Armour Interface. But if this is considered necessary I guess I can change that.

I'd also have to rewrite the use_charges and has_enough_charges function, which will be a bit of a pain due to how they are. It's hard to see a situation where we'd want power armour to run off the interface but not UPS.

It does make sense that only active tools are processed here.

src/visitable.cpp

I don't actually know if this is the appropriate way to add a description line.

KheirFerrum · 2022-07-03T07:20:29Z

There's a check to make power armour with the USE_UPS flag not have (UPS) appended to it. This is mainly a taste issue. I just don't like it to appear as "power armor basic (active) (UPS)". If you would prefer such a thing, then I can remove the check.

All the groundwork was already laid by previous contributors, just needed to remove the hardcode check.

Turns out I don't really need to make new functions to make set_transform(ed) work.

To silence (UPS) suffix

So that the description outright tells players it's more efficient than using UPS.

Also . , just irks me

This reverts commit 8e32ba6.

data/mods/No_Hope/Items/armor.json

Coolthulhu · 2022-07-06T20:13:47Z

Pre-existing and very minor bug: if you destroy worn power armor, you can keep the helmet on.

Power Armor Overhaul pt.1

69dc943

KheirFerrum changed the title ~~Power Armor Overhaul pt.1~~ Power Armor Overhaul May 2, 2022

Coolthulhu reviewed May 3, 2022

View reviewed changes

src/item.cpp Show resolved Hide resolved

KheirFerrum force-pushed the Power-Armour-Overhaul branch from 2dcd51b to b49bc65 Compare May 3, 2022 04:48

Bugfix

2bca562

KheirFerrum force-pushed the Power-Armour-Overhaul branch from b49bc65 to 2bca562 Compare May 3, 2022 04:48

KheirFerrum added 7 commits May 3, 2022 05:50

Merge branch 'upload' into Power-Armour-Overhaul

47e0a88

Styling

c31e652

Tear out unused ups_based_armor code.

d50c4a2

Bugfixes

4b29657

Basic helmets didn't transform, Heavy Helmet transformed into Heavy Exoskeleton, crashing the game.

Part 2

e4ef20d

Changed some of the text and flavour. Introduced new power armour flags and integrated UPS drain into them. power_armor tag deprecated. Removed the final vestiges of ups_based_armor. Rewrote the power armour can_wear process.

Styling

197f6a9

Trying to make Clangtidy happy

4c8f51a

Coolthulhu reviewed May 13, 2022

View reviewed changes

src/item.cpp Outdated Show resolved Hide resolved

KheirFerrum added 11 commits May 15, 2022 08:46

Moved main power armour description to flags.

141e7af

Styling

8a959f1

Update USE_UPS into POWERARMOR_EXO

d26be0c

Battery doesn't seem to be required.

f8763ab

Was throwing up a few build errors for whatever reason.

Lowercase

4eac4a6

Add Str boosting effects, balance weight capacity

29d325e

set_transform + set_transformed iuse

8fad96c

Styling & transform on wear/removal

725a00f

Bugfixes, more updates to set_transformed

4a77b76

Restrict number of mods/body part.

8ae5cd3

Also adds code to check that a swap is valid. This only matters for power armour right now.

Preliminary No_Hope updates

d4bf867

AngelicosPhosphoros reviewed Jun 13, 2022

View reviewed changes

KheirFerrum added 3 commits June 13, 2022 19:47

Clang

a62e631

Bugfixing

2762404

More bugfixes

71d5a98

KheirFerrum added 2 commits July 1, 2022 20:19

Update bionics.cpp

e50efac

Removed active check

7d46fb0

It does make sense that only active tools are processed here.

Coolthulhu reviewed Jul 1, 2022

View reviewed changes

src/visitable.cpp Outdated Show resolved Hide resolved

KheirFerrum added 4 commits July 2, 2022 14:02

Make fuel_efficiency congruent

dab7baf

Update visitable.cpp

1598647

Need to stop being stupid

b178d40

Re-add USE_UPS to PA

a2b2c9d

KheirFerrum force-pushed the Power-Armour-Overhaul branch from f83576e to a2b2c9d Compare July 3, 2022 04:27

Bugfixes

77b6942

I don't actually know if this is the appropriate way to add a description line.

KheirFerrum added 7 commits July 3, 2022 15:21

Styling

50541d3

Jsonize STURDY on PA

fe16c60

All the groundwork was already laid by previous contributors, just needed to remove the hardcode check.

Complete set_transform(ed)

0311a50

Turns out I don't really need to make new functions to make set_transform(ed) work.

Create NAT_UPS flag

62deb27

To silence (UPS) suffix

Styling

92b0f1b

Flavour update

d691a80

So that the description outright tells players it's more efficient than using UPS.

Grammar

8e32ba6

Also . , just irks me

KheirFerrum force-pushed the Power-Armour-Overhaul branch from 6b373a6 to 8e32ba6 Compare July 5, 2022 05:59

KheirFerrum added 2 commits July 6, 2022 00:15

Revert "Grammar"

1f1fdab

This reverts commit 8e32ba6.

No reason to be a nested if

38db970

Coolthulhu reviewed Jul 6, 2022

View reviewed changes

data/mods/No_Hope/Items/armor.json Outdated Show resolved Hide resolved

KheirFerrum added 2 commits July 6, 2022 22:18

Remove extra NAT_UPS

e3e3227

Styling

c215bf7

Coolthulhu merged commit 707ae43 into cataclysmbnteam:upload Jul 6, 2022

KheirFerrum deleted the Power-Armour-Overhaul branch July 6, 2022 20:49

KheirFerrum mentioned this pull request Jul 7, 2022

feat: flag for items NPCs will use in combat. #1704

Draft

7 tasks

KheirFerrum mentioned this pull request Aug 17, 2022

Tidy power armor jsons #1786

Merged

KheirFerrum mentioned this pull request Oct 28, 2022

Adding and refactoring flags for power armor items Kenan2000/BrightNights-Structured-Kenan-Modpack#121

Merged

KheirFerrum mentioned this pull request Nov 4, 2022

maximum_charges() now defaults to 0. Optical Cloak changed to TOOL_ARMOR category #2163

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Power Armor Overhaul #1505

Power Armor Overhaul #1505

KheirFerrum commented May 2, 2022 •

edited

Loading

Coolthulhu May 13, 2022

KheirFerrum May 15, 2022 •

edited

Loading

AngelicosPhosphoros Jun 13, 2022

KheirFerrum Jun 13, 2022 •

edited

Loading

Coolthulhu Jul 1, 2022 •

edited

Loading

KheirFerrum Jul 3, 2022 •

edited

Loading

KheirFerrum commented Jul 3, 2022 •

edited

Loading

Coolthulhu commented Jul 6, 2022

Power Armor Overhaul #1505

Power Armor Overhaul #1505

Conversation

KheirFerrum commented May 2, 2022 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Coolthulhu May 13, 2022

Choose a reason for hiding this comment

KheirFerrum May 15, 2022 • edited Loading

Choose a reason for hiding this comment

AngelicosPhosphoros Jun 13, 2022

Choose a reason for hiding this comment

KheirFerrum Jun 13, 2022 • edited Loading

Choose a reason for hiding this comment

Coolthulhu Jul 1, 2022 • edited Loading

Choose a reason for hiding this comment

KheirFerrum Jul 3, 2022 • edited Loading

Choose a reason for hiding this comment

KheirFerrum commented Jul 3, 2022 • edited Loading

Coolthulhu commented Jul 6, 2022

KheirFerrum commented May 2, 2022 •

edited

Loading

KheirFerrum May 15, 2022 •

edited

Loading

KheirFerrum Jun 13, 2022 •

edited

Loading

Coolthulhu Jul 1, 2022 •

edited

Loading

KheirFerrum Jul 3, 2022 •

edited

Loading

KheirFerrum commented Jul 3, 2022 •

edited

Loading