Feat: New GM Commands, princess commands on map menu, graphics for some explosions #6183

Scoppio · 2024-11-06T01:51:58Z

New GM Commands & Much More!

All the commands listed here are GM only, they allow the player who is a Game Master more freedom to change the game to the way they want the story to play out.
They would allow co-op games and RPG or dramatized games to have more events and give the GM more control over how they go.

Examples:

Custom scenario, a battle is happening while a space battle goes, every turn there is a chance a stray shot from a warship hits the ground mid battle.
A F5 hurrinane is moving towards the base and you need to evacuate the vehicles and people as fast as possible before they all die.
In the middle of the battle the day becomes night as the moon engulfs the sun.
The star of the system is pulsating, during round 10 it goes super nova, the planet you are playing is far away enough to not be instantaneously destroyed, but the temperature gets extreme and the atmosphere of the planetoid is stripped instantaneously, everyone that was outside a battlemek is dead. Is it worth keeping the fight?

GamemasterServerCommand

New type of ServerCommand, can only be used by gamemaster, it also has an automatic parser for its arguments with automatic error handling. Also has automated "documentation", using the descriptions for each variable as input for itself.

This extra complexity also allows for an automatic "dialog" setup that I implemented (its only in a functional state, not a good state).

Added a new type of server command, the gamemaster server command, it has automated parsing, error handling, argument assertion, automated documentation (for /help), it also implements the necessary tools to automate the GM Menu commands.
New server commands accept both positional arguments and named arguments. Positional and named arguments can be used in the same command but positional arguments must come first. Named arguments may be used in any order (after positional arguments if those are being used). Example:

The following are equivalent and valid:

    /ob 5 10 200 5
    /ob x=5 y=10 dmg=200 radius=5
    /ob 5 10 dmg=200 radius=5
    /ob 5 dmg=200 radius=5 y=10
    /ob 5 10 radius=5 dmg=200

Command KILL - When you want something DEAD

/kill <id>
Kills (ID) unit at GM's discretion, needs to be enabled in the game options.

Command NOSMOKE - Clear skies

/nosmoke
Clears all smoke clouds in the board.

Command WEATHER - Change planetary conditions

/weather [...args]
Allows the GM to change the weather on demand

Command Disaster - Disasters

/gomorrah <type>
Cast a disaster (like in the old days of SimCity) to spicy things up (WIP)!
The cheat is a homage to SimCity "gomorrah" cheat code which would start a nuclear disaster.

Command OB - Orbital Bombardment

/ob <x> <y> [damage=#] [radius=4]
Calls in orbital bombardment at the end of the next weapons firing phase (WIP)!

Command ChangeOwner - Traitor 2.0

/changeOwner <UnitID> <PlayerID>
Gives a unit to a player.

Command Rescue

/rescue <UnitID>
Rescue from the board a single unit. A "forced flee" if you will.

(Very crude) GM command dialogs

Allows the gamemaster to manually enter the commands

Features:

Numerical spinners which obeys the limits set in the command arguments.
Enumerator picker/drop down for those more complex commands.
Numerical spinners for X and Y position defaults to current hex square (under the mouse when you right clicked on the map).

GM Contextual Menu (Map Menu)

Ps: Some screenshots were taken early in development, so mileage may vary.

Added more functions to the map menu for GMs, most notable being:

Removed "Traitor" entry from Map Menu. I can roll back this change, but it was made because the current traitor functionality is very limited and the way it currently works does allow for big mistakes for those not used to how it works.
Added a new "Traitor" inside the GM menu, this uses a more contextual approach, it allows you to pick a unit in the hex as you would when targeting a unit.

Added new "Kill Unit" inside the GM menu. Allows you to pick a unit in the hex as you would when targeting a unit.

Added new "Special Commands" menu to the GM Menu. It lists all commands that are implemented with GamemasterServerCommand class.

Quick Access to Princess controls

You can now give orders to your allied royalty (Bots) using the right click menu, making the process of changing Princess' behavior, priority targets, etc, way easier.

Graphics for BIG BOOM

Nukes and orbital bombardment have graphics.

Support for BIG BOOM

Exploding a nuke on the game is a sure way to grind everything to a halt, your big powerful PC may simply sit down crunching numbers with CPU at 100% for many minutes, and the result is a 5 miles long report with all the units taking tens of thousands of damage points. I added an early exit check that identifies if the unit is already "devastated", if true then it consider the damage processing for that unit done and goes for the next one.
With this small change, now releasing nukes that boil lakes and turn cities into craters is nothing but childsplay!

…y WIP

codecov · 2024-11-06T01:57:07Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 29.06%. Comparing base (a28fd13) to head (7da1ad0).
Report is 12 commits behind head on master.

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #6183      +/-   ##
============================================
- Coverage     29.09%   29.06%   -0.03%     
- Complexity    13981    13982       +1     
============================================
  Files          2647     2647              
  Lines        267373   267642     +269     
  Branches      47650    47674      +24     
============================================
+ Hits          77793    77794       +1     
- Misses       185696   185964     +268     
  Partials       3884     3884

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests

megamek/src/megamek/server/commands/ChangeWeatherCommand.java

megamek/i18n/megamek/common/options/messages.properties

…nditions, orbital bombardment, etc.

megamek/src/megamek/server/commands/ChangeWeatherCommand.java

megamek/src/megamek/server/totalwarfare/TWGameManager.java

                }
                Report.addNewline(vDesc);
            }
        }
    }

+    private void explosionDamage(Coords position, Vector<Report> vDesc, Entity e, int damage) {


megamek/src/megamek/server/totalwarfare/TWGameManager.java

IllianiCBT

I saw you requested I review this.

I don’t have enough working knowledge of the mm side of our codebase, so try not to review mm-specific stuff unless it’s super basic - and even then, I prefer not to get involved. Didn’t want you thinking I was just ignoring your request. :)

BLR-IIC · 2024-11-10T02:18:37Z

I'm pretty excited to see this in progress. I've been turning over code in my head for making command line orbital bombardment work. I was going to borrow code from the nuke commands. I hope these commands see implementation!

HammerGS · 2024-11-10T02:57:30Z

Random thought...how hard would it be to create a "GM Command GUI" a simple GUI that lists the commands and lets you input the values

Scoppio · 2024-11-10T15:38:48Z

Random thought...how hard would it be to create a "GM Command GUI" a simple GUI that lists the commands and lets you input the values

I think its doable, I will do those in small steps. I want to release those first the way they are. I just need to make sure the terrain damage is not too bad.

Scoppio · 2024-11-10T15:41:45Z

I'm pretty excited to see this in progress. I've been turning over code in my head for making command line orbital bombardment work. I was going to borrow code from the nuke commands. I hope these commands see implementation!

Thanks, I picked the nuke as an example and turns out it is pretty standard. Actually the nuke doesnt take things into considerations like VTOL. It also is very expensive because it reachs the entire board and the scale of it is madness (amount of damage, garanteed kill on hit, etc).

So I had to reimplement alot of stuff, but there is still too much code duplication here, and not everything of the Terrain Factor and terrain damage is properly implemented.

I think I will implement the damage terrain in small steps until it is completely implemented, but at least it will be "good enough" for the narrative play.

megamek/src/megamek/client/ui/swing/MapMenu.java

megamek/src/megamek/client/ui/swing/boardview/BoardView.java

HammerGS · 2024-11-16T15:51:20Z

This was a request from the forums

If reworking the GM commands, can we get the Princess Ignore command on a right click menu somehow?

Scoppio · 2024-11-16T20:36:51Z

This was a request from the forums

If reworking the GM commands, can we get the Princess Ignore command on a right click menu somehow?

I will take a look, depending of complexity I can push for a next release

Scoppio · 2024-11-17T05:00:25Z

Added Nuke graphics, added controls for allied Princesses on the contextual map menu (right mouse button click on the map).

Scoppio · 2024-11-17T05:24:14Z

megamek/src/megamek/client/ui/swing/CollapseWarning.java

@@ -96,7 +96,7 @@ public static List<Coords> findCFWarningsMovement(Game g, Entity e, Board b) {

            List<Coords> hexesToCheck = new ArrayList<Coords>();
            if (pos != null) {
-                hexesToCheck = pos.allAtDistanceOrLess(range + 1);
+                hexesToCheck = pos.allAtDistanceOrLess(range);


Fixed the bug in the function so the fix isnt necessary anymore

Scoppio · 2024-11-17T05:24:53Z

megamek/src/megamek/client/ui/swing/MapMenu.java

-            return menu;
-        } else {
-
+        if (client.getLocalPlayer().getGameMaster()) {


I need to move those things to another class, will do it on a next PR

Scoppio · 2024-11-17T05:25:37Z

megamek/src/megamek/client/ui/swing/boardview/TerrainShadowHelper.java

-                    int lv = nhex.getLevel();
-                    if (lv < level) {
-                        surrounded = false;
+                    if (nhex != null) {


another instance where it may very well be null and there was no null guard

Scoppio · 2024-11-17T05:27:05Z

megamek/src/megamek/common/Coords.java

+     * Returns a list of all coordinates at the given distance (dist - 1)
+     * and anything less than dist as well.
+     */
+    public ArrayList<Coords> allLessThanDistance(int dist) {


places in the code that were using the previous version of the function allAtDistanceOrLess were changed to use this one instead. This implements the behavior that the previous/bugged version had (same functionality)

Scoppio · 2024-11-17T05:27:26Z

megamek/src/megamek/common/Mek.java

+        if (hex == null) {
+            return false;
+        }


another null check guard that was missing

Scoppio · 2024-11-17T05:27:46Z

megamek/src/megamek/common/MoveStep.java

+        if (destHex == null) {
+            return false;
+        }


I really want to give this program a pass with SonarQube

Scoppio · 2024-11-17T05:29:13Z

megamek/src/megamek/common/SpecialHexDisplay.java

 /**
 * @author dirk
 */
 public class SpecialHexDisplay implements Serializable {
    private static final long serialVersionUID = 27470795993329492L;

    public enum Type {
-        ARTILLERY_AUTOHIT(new MegaMekFile(Configuration.hexesDir(), "artyauto.gif").toString()) {
+        ARTILLERY_AUTOHIT(new MegaMekFile(Configuration.hexesDir(), "artyauto.gif")) {


so far, changing this from string to MegaMegFile seem to be working as expected. This also gave more flexibility on how to access those image files.

Scoppio · 2024-11-17T05:30:04Z

megamek/src/megamek/common/SpecialHexDisplay.java

+    public Image getDefaultImage() {
+        if (type.useFolderStructure()) {
+            return type.getImage(imageSignature);
+        }
+        return type.getDefaultImage();
+    }


allows to access files in folders, very handy for images that are split in multiple pieces

HammerGS · 2024-11-17T20:31:22Z

I saw the comment about feature creep, and agree that we should pause new things and only work testing things. Then get this merged. Plus of course polishing anything in here that needs polish.

repligator · 2024-11-17T21:50:50Z

"You cannot start a fire in a tornado" gets printed to the round report movement phase.

Scoppio · 2024-11-17T22:06:42Z

"You cannot start a fire in a tornado" gets printed to the round report movement phase.

This is interesting and new... the only way for it to print this message is if it tries to ignite a hex, let me run a test here quickly.

repligator · 2024-11-17T22:08:38Z

Not-sure-if-intended, but using the commands can cause atmospheric weather in space.

Scoppio · 2024-11-17T22:15:43Z

Not-sure-if-intended, but using the commands can cause atmospheric weather in space.

Space tornados!!!!

If the server currently allows you to set planetary conditions in space... I'd say its either a feature or a bug, could go both ways. I'm not against it, mostly because I want the tools to give narrative freedom to people.

Fire wont ignite on a tornado

About the cant start fire in a tornado, it seems to be correct IF the current weather is a tornado. It will print in the phase you are, so if you run the command to start a fire or to start a firestorm while a tornado is happening then the server won't allow the hexes to ignite

repligator · 2024-11-17T23:06:35Z

Using an orbital bombardment with a larger than default radius will throw a lot of errors in the log, and won't render correctly.

17:03:57,152 ERROR [megamek.common.util.ImageUtil] {AWT-EventQueue-0} megamek.common.util.ImageUtil$AWTImageLoader.loadImage(ImageUtil.java:289) - Trying to load image for a non-existent file data/images/hexes/orbital_bombardment/hit/col_9_row_8_odd.png

…ather in space, no fire in space

Scoppio · 2024-11-17T23:34:07Z

Fixed error with radius different than 4, it uses the bomb-hit graphic for other radii values (ortillery with default radius keeps the original image)

Added safeguards for the firestorm, firestart and change weather, now they cant be activated when in space (they still work for ground and atmosphere games).

HammerGS

Tested and everything seems to work.

HammerGS

Tested and everything seems to work.

Scoppio added 2 commits November 5, 2024 21:01

feat: adds slash kill command for GMs

7c4ab9b

feat: added nosmoke and change weather commands, disaster is currentl…

f614557

…y WIP

IllianiCBT reviewed Nov 6, 2024

View reviewed changes

megamek/src/megamek/server/commands/ChangeWeatherCommand.java Outdated Show resolved Hide resolved

github-advanced-security bot found potential problems Nov 6, 2024

View reviewed changes

feat: added change ownership command, disaster is still WIP

f7d8a48

SJuliez reviewed Nov 6, 2024

View reviewed changes

megamek/i18n/megamek/common/options/messages.properties Outdated Show resolved Hide resolved

feat: added multiple GM commands, including kill, change planetary co…

b797123

…nditions, orbital bombardment, etc.

Scoppio requested review from IllianiCBT and SJuliez November 8, 2024 03:36

github-advanced-security bot found potential problems Nov 8, 2024

View reviewed changes

Merge branch 'master' into feature/kill-command

ffe5736

IllianiCBT reviewed Nov 8, 2024

View reviewed changes

HammerGS added the For New Dev Cycle This PR should be merged at the beginning of a dev cycle label Nov 9, 2024

Merge branch 'master' into feature/kill-command

feeca5a

Scoppio added 5 commits November 10, 2024 18:17

Merge branch 'master' into feature/kill-command

cb1d927

Merge branch 'master' into feature/kill-command

300dc96

chore: gm improving gm commands, removing unnecessary options

fc2e5ac

feat: commands need a second pass for test and eval

4c3864e

feat: new commands implemented

02e9645

Scoppio self-assigned this Nov 15, 2024

Scoppio added 2 commits November 15, 2024 00:48

chore: gm improving gm commands, removing unnecessary options

4d3ecda

feat: commands need a second pass for test and eval

36b6b37

github-advanced-security bot found potential problems Nov 15, 2024

View reviewed changes

megamek/src/megamek/client/ui/swing/MapMenu.java Fixed Show resolved Hide resolved

megamek/src/megamek/client/ui/swing/boardview/BoardView.java Fixed Show resolved Hide resolved

feat: update server commands for gm

9f36d77

Scoppio force-pushed the feature/kill-command branch from 1117d85 to 9f36d77 Compare November 15, 2024 04:04

HammerGS requested a review from Sleet01 November 16, 2024 15:52

feat: added nuke graphics

b4b004a

Scoppio changed the title ~~feat: adds a couple of new commands for GMs on games.~~ Feat: New GM Commands, princess commands on map menu, graphics for some explosions Nov 17, 2024

Scoppio commented Nov 17, 2024

View reviewed changes

Scoppio added Performance GM Tools All things related to the GM Tools project. labels Nov 17, 2024

feat: added nuke drawing for player commited war crimes

5b203a4

Scoppio force-pushed the feature/kill-command branch from aca9459 to 5b203a4 Compare November 17, 2024 12:11

Merge branch 'master' into feature/kill-command

36e30b5

HammerGS removed the For New Dev Cycle This PR should be merged at the beginning of a dev cycle label Nov 17, 2024

fix: uses bomb hit in case of non-default radius for ortillery, no we…

29fd04e

…ather in space, no fire in space

Scoppio added 3 commits November 17, 2024 20:45

fix: removed hailstorm, fixed text on ice storm

948e5ea

fix: space disasters

cf27860

fix: fixed error where random disaster could endup with invalid value

7d47cbb

Scoppio force-pushed the feature/kill-command branch from 9efb970 to a2e0cdb Compare November 18, 2024 00:31

feat: improved on the enum for disasters

7da1ad0

Scoppio force-pushed the feature/kill-command branch from a2e0cdb to 7da1ad0 Compare November 18, 2024 00:31

HammerGS approved these changes Nov 23, 2024

View reviewed changes

HammerGS merged commit b33b7a3 into MegaMek:master Nov 23, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: New GM Commands, princess commands on map menu, graphics for some explosions #6183

Feat: New GM Commands, princess commands on map menu, graphics for some explosions #6183

Scoppio commented Nov 6, 2024 •

edited

Loading

codecov bot commented Nov 6, 2024 •

edited

Loading

IllianiCBT left a comment

BLR-IIC commented Nov 10, 2024

HammerGS commented Nov 10, 2024

Scoppio commented Nov 10, 2024

Scoppio commented Nov 10, 2024

HammerGS commented Nov 16, 2024

Scoppio commented Nov 16, 2024

Scoppio commented Nov 17, 2024

Scoppio Nov 17, 2024

Scoppio Nov 17, 2024

Scoppio Nov 17, 2024

Scoppio Nov 17, 2024

Scoppio Nov 17, 2024

Scoppio Nov 17, 2024

Scoppio Nov 17, 2024

Scoppio Nov 17, 2024

HammerGS commented Nov 17, 2024

repligator commented Nov 17, 2024

Scoppio commented Nov 17, 2024

repligator commented Nov 17, 2024

Scoppio commented Nov 17, 2024 •

edited

Loading

repligator commented Nov 17, 2024

Scoppio commented Nov 17, 2024

HammerGS left a comment

HammerGS left a comment

Feat: New GM Commands, princess commands on map menu, graphics for some explosions #6183

Feat: New GM Commands, princess commands on map menu, graphics for some explosions #6183

Conversation

Scoppio commented Nov 6, 2024 • edited Loading

New GM Commands & Much More!

GamemasterServerCommand

Command KILL - When you want something DEAD

Command NOSMOKE - Clear skies

Command WEATHER - Change planetary conditions

Command Disaster - Disasters

Command OB - Orbital Bombardment

Command ChangeOwner - Traitor 2.0

Command Rescue

(Very crude) GM command dialogs

GM Contextual Menu (Map Menu)

Ps: Some screenshots were taken early in development, so mileage may vary.

Quick Access to Princess controls

Graphics for BIG BOOM

Support for BIG BOOM

codecov bot commented Nov 6, 2024 • edited Loading

Codecov Report

IllianiCBT left a comment

Choose a reason for hiding this comment

BLR-IIC commented Nov 10, 2024

HammerGS commented Nov 10, 2024

Scoppio commented Nov 10, 2024

Scoppio commented Nov 10, 2024

HammerGS commented Nov 16, 2024

Scoppio commented Nov 16, 2024

Scoppio commented Nov 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HammerGS commented Nov 17, 2024

repligator commented Nov 17, 2024

Scoppio commented Nov 17, 2024

repligator commented Nov 17, 2024

Scoppio commented Nov 17, 2024 • edited Loading

Space tornados!!!!

Fire wont ignite on a tornado

repligator commented Nov 17, 2024

Scoppio commented Nov 17, 2024

HammerGS left a comment

Choose a reason for hiding this comment

HammerGS left a comment

Choose a reason for hiding this comment

Scoppio commented Nov 6, 2024 •

edited

Loading

codecov bot commented Nov 6, 2024 •

edited

Loading

Scoppio commented Nov 17, 2024 •

edited

Loading