Nixprime's auto equalize shields by z64555 · Pull Request #324 · scp-fs2open/fs2open.github.com

z64555 · 2015-08-25T23:00:39Z

Verify singleplayer operation
Check with multiplayer
Check localization support and XSTR's
Should this be a default enabled or default disabled feature?

Original Post follows:
Salvages PR #111, whose author hasn't updated in some time. PR #310 added needed functionality to enable controls within a .tbl/.tbm that are disabled by default (either through controlsconfigdefaults.tbl or hard-coded).

z64555 · 2015-08-26T00:46:17Z

Some notes, concerns from the PR #111 conversation:

niffiwan:
Should auto-equalize be controled by a mod_table setting? Should the default-to-off setting be controled by a mod_table setting?

Yes, it is controlled by controlsconfigdefaults.tbl, and the original commit has the control enabled by default. PR #310 added the functionality needed to enable default-disabled items, so this can be done.

MageKing17:
there appears to be no way to interact with auto-equalization via script

He managed to add the control in lua.cpp, but I don't believe there's a way to activate the command yet.

MageKing17:
It should just require not enabling the defaults by default and adding "+Enable" capability... is this the sort of thing that should wait for the antipodes merge?

Antipodes doesn't have this capability, as PR #310 was based on master. Going ahead with PR #319 won't affect this PR.

z64555 · 2015-09-14T15:20:34Z

Ok, 2/3 concerns addressed, now all that's left is the scripting support

z64555 · 2015-09-14T16:58:23Z

A new concern that cropped up regards multiplayer. If auto-equalize shields is active, then the server can handle the shield management like it does with AI. I am not sure at the moment how the additions behave, whether the hit player sends a packet with shield info to the server or the server already handles the equalization.

z64555 · 2015-09-24T19:30:27Z

Ok, AI shield management, along with other AI controls, is handled by the host server and checked at a semi-regular frequency. AI adjust their shields by diverting power to the quadrant that was most recently hit. The ai code also suggest they balance their shields if not hit within a second, but I haven't observed them doing so in some past tests.

I'd like to try to use the AI's shield management routine instead of the new auto-equalize routine since it'll be a consistent behavior. Essentially, this would enable a portion of AI that will handle the player's shields for them. Could possibly add a flag to always equalize when hit to achieve this PR's original goals.

chief1983 · 2015-09-24T20:18:07Z

Actually I was under the impression that the AI had a difficulty multiplier for how long they wait to equalize shields, which on Very Easy scales down to 'never', and on very hard can be nearly immediate.

z64555 · 2015-09-24T20:20:13Z

Yes, it actually does have a difficulty multiplier on there. Friendlies in single-player are hardcoded to stay at the "average" difficulty while hostiles vary.

z64555 · 2016-02-19T10:29:23Z

Ok, I might be able to enable the AI shield management routines by turning on the Player_ai and setting it to a new AIM mode that would only activate the shield management. This would require moving things around a bit in ai_frame so as to not trigger things that would interfere with movement, etc.

I'll get that going in a separate PR, and maybe make a pair of test builds for folks to compare the two methods to see which one they like.

Automatic shield equalization is an optional feature that is toggled by pressing Alt-Q (this key combination is remappable). When enabled, damage to shields triggers shield equalization. Automatic shield equalization can be temporarily overriden by manually adjusting shield distribution; to re-enable automatic shield equalization, manually equalize your shields. Automatic shield equalization is subject to the same 2% power penalty per equalization (max 1/second) as manual shield equalization; it is therefore functionally equivalent to mashing Q as fast as possible.

…l control

…default disabled inside the hardcode.

z64555 · 2016-11-27T22:00:09Z

Rebased onto current master.

asarium · 2016-11-28T10:17:38Z

 			if (!Sel_NextNav())
 				gamesnd_play_iface(SND_GENERAL_FAIL);
 			break;
+


This looks like an accidental whitespace insertion.

z64555 · 2016-12-30T17:17:58Z

After a discussion with jg18 in the forums, I'm comfortable with my decision to get this merged in before I look for an AI alternative.

I'll need to do a bit of maintenance on it beforehand, however.

…b.com into nixprime-auto_equalize_shields # Conflicts: # code/controlconfig/controlsconfigcommon.cpp # code/scripting/lua.cpp

asarium · 2017-01-03T16:47:47Z

 						advance_to_eoln(NULL);
 						ignore_white_space();
 						return;
+						mprintf(("  Deprecated option '+Disable' found. Please use '$Disable: true' instead\n"));


This is dead code since it appears after a return.

asarium · 2017-01-03T16:52:20Z

+			if (Players[Player_num].flags & PLAYER_FLAGS_AUTO_SHIELD_EQUALIZE) {
+				Players[Player_num].flags &= ~PLAYER_FLAGS_AUTO_SHIELD_EQUALIZE_OVERRIDE;
+				button_function(SHIELD_EQUALIZE);
+				HUD_printf(XSTR("Auto shield equalization activated", 1638));


Since this uses a printf style format string, the format string should not be supplied from a function call. This should use "%s" as the format string and the XSTR call should be the format parameter.

asarium · 2017-01-03T16:52:33Z

+				button_function(SHIELD_EQUALIZE);
+				HUD_printf(XSTR("Auto shield equalization activated", 1638));
+			} else {
+				HUD_printf(XSTR("Auto shield equalization deactivated", 1639));


z64555 mentioned this pull request Aug 25, 2015

Add automatic shield equalization #111

Closed

niffiwan added the enhancement A new feature or upgrade of an existing feature to add additional functionality. label Aug 27, 2015

z64555 force-pushed the nixprime-auto_equalize_shields branch from c75b1b6 to 190b0b2 Compare September 14, 2015 15:18

z64555 force-pushed the nixprime-auto_equalize_shields branch from 190b0b2 to 5987a02 Compare September 14, 2015 15:57

z64555 added the unfinished (Deprecated by PR Drafts) A feature or issue that's unfinished, but still wants feedback/review label Nov 27, 2016

nixprime and others added 4 commits November 27, 2016 15:47

auto-equalize shield toggle, like other energy controls, is a critica…

913bb55

…l control

Disables auto-equalize by default. Allows control_config items to be …

eb5edf6

…default disabled inside the hardcode.

adds a few mprintf's to write controlconfigdefaults.tbl debug messages

fe7a18e

z64555 force-pushed the nixprime-auto_equalize_shields branch from 5987a02 to fe7a18e Compare November 27, 2016 21:59

asarium reviewed Nov 28, 2016

View reviewed changes

z64555 added unfinished (Deprecated by PR Drafts) A feature or issue that's unfinished, but still wants feedback/review and removed unfinished (Deprecated by PR Drafts) A feature or issue that's unfinished, but still wants feedback/review labels Dec 30, 2016

Merge branch 'master' of https://github.com/scp-fs2open/fs2open.githu…

ef53a23

…b.com into nixprime-auto_equalize_shields # Conflicts: # code/controlconfig/controlsconfigcommon.cpp # code/scripting/lua.cpp

z64555 removed the unfinished (Deprecated by PR Drafts) A feature or issue that's unfinished, but still wants feedback/review label Dec 31, 2016

asarium reviewed Jan 3, 2017

View reviewed changes

asarium requested changes Jan 3, 2017

View reviewed changes

Goober5000 added this to the Release 26.0 milestone Oct 14, 2025

BMagnu added the Waiting for Stable Marks a pull request that is to be merged after the next stable release, due to a release cycle label May 31, 2026

BMagnu modified the milestones: Release 26.0, Release 26.2 May 31, 2026

Conversation

z64555 commented Aug 25, 2015 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

z64555 commented Aug 26, 2015

Uh oh!

z64555 commented Sep 14, 2015

Uh oh!

z64555 commented Sep 14, 2015

Uh oh!

z64555 commented Sep 24, 2015

Uh oh!

chief1983 commented Sep 24, 2015

Uh oh!

z64555 commented Sep 24, 2015

Uh oh!

z64555 commented Feb 19, 2016

Uh oh!

z64555 commented Nov 27, 2016

Uh oh!

asarium Nov 28, 2016

Choose a reason for hiding this comment

Uh oh!

z64555 commented Dec 30, 2016

Uh oh!

asarium Jan 3, 2017

Choose a reason for hiding this comment

Uh oh!

asarium Jan 3, 2017

Choose a reason for hiding this comment

Uh oh!

asarium Jan 3, 2017

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

z64555 commented Aug 25, 2015 •

edited

Loading