diff --git a/megamek/i18n/megamek/common/options/messages.properties b/megamek/i18n/megamek/common/options/messages.properties index b99011e2e51..17f1fe80a6e 100644 --- a/megamek/i18n/megamek/common/options/messages.properties +++ b/megamek/i18n/megamek/common/options/messages.properties @@ -140,8 +140,6 @@ GameOptionsInfo.option.allow_nukes.displayableName=Allow command-line nukes. GameOptionsInfo.option.allow_nukes.description=This must be checked to allow players to throw nukes from the command line. If this is not checked, nukes are still available as advanced munitions. GameOptionsInfo.option.really_allow_nukes.displayableName=REALLY allow command-line nukes. GameOptionsInfo.option.really_allow_nukes.description=This must be checked to allow players to throw nukes from the command line. If this is not checked, nukes are still available as advanced munitions. -GameOptionsInfo.option.gm_can_kill_units.displayableName=Allow command-line kill (GM only). -GameOptionsInfo.option.gm_can_kill_units.description=This must be checked to allow the GM to kill units using command line. If this is not checked, the command is disabled. GameOptionsInfo.group.advancedRules.displayableName=Advanced Rules diff --git a/megamek/src/megamek/common/options/GameOptions.java b/megamek/src/megamek/common/options/GameOptions.java index c780f42b731..56875bb6c21 100755 --- a/megamek/src/megamek/common/options/GameOptions.java +++ b/megamek/src/megamek/common/options/GameOptions.java @@ -93,7 +93,6 @@ public synchronized void initialize() { addOption(allowed, OptionsConstants.ALLOWED_NO_CLAN_PHYSICAL, false); addOption(allowed, OptionsConstants.ALLOWED_ALLOW_NUKES, false); addOption(allowed, OptionsConstants.ALLOWED_REALLY_ALLOW_NUKES, false); - addOption(allowed, OptionsConstants.ALLOWED_GM_CAN_KILL_UNITS, false); IBasicOptionGroup advancedRules = addGroup("advancedRules"); addOption(advancedRules, OptionsConstants.ADVANCED_MINEFIELDS, false); diff --git a/megamek/src/megamek/common/options/OptionsConstants.java b/megamek/src/megamek/common/options/OptionsConstants.java index 5af5898077b..6850acaf3fb 100644 --- a/megamek/src/megamek/common/options/OptionsConstants.java +++ b/megamek/src/megamek/common/options/OptionsConstants.java @@ -330,7 +330,6 @@ public class OptionsConstants { public static final String ALLOWED_NO_CLAN_PHYSICAL = "no_clan_physical"; public static final String ALLOWED_ALLOW_NUKES = "allow_nukes"; public static final String ALLOWED_REALLY_ALLOW_NUKES = "really_allow_nukes"; - public static final String ALLOWED_GM_CAN_KILL_UNITS = "gm_can_kill_units"; public static final String ADVANCED_MINEFIELDS = "minefields"; public static final String ADVANCED_HIDDEN_UNITS = "hidden_units"; public static final String ADVANCED_BLACK_ICE= "black_ice"; diff --git a/megamek/src/megamek/server/commands/KillCommand.java b/megamek/src/megamek/server/commands/KillCommand.java index bc436c49380..45f2b6d7dca 100644 --- a/megamek/src/megamek/server/commands/KillCommand.java +++ b/megamek/src/megamek/server/commands/KillCommand.java @@ -45,10 +45,6 @@ public KillCommand(Server server, TWGameManager gameManager) { public void run(int connId, String[] args) { // Check to make sure gm kills are allowed! - if (!(server.getGame().getOptions().booleanOption(OptionsConstants.ALLOWED_GM_CAN_KILL_UNITS))) { - server.sendServerChat(connId, "Command-line kill is not enabled in this game."); - return; - } if (!isGM(connId)) { server.sendServerChat(connId, "You are not a Game Master."); return; diff --git a/megamek/src/megamek/server/commands/OrbitalBombardmentCommand.java b/megamek/src/megamek/server/commands/OrbitalBombardmentCommand.java index c3d31e2202f..5424526f93d 100644 --- a/megamek/src/megamek/server/commands/OrbitalBombardmentCommand.java +++ b/megamek/src/megamek/server/commands/OrbitalBombardmentCommand.java @@ -35,12 +35,12 @@ public OrbitalBombardmentCommand(Server server, TWGameManager gameManager) { super(server, "ob", "GM Drops a bomb onto the board doing of 100 damage with a 3 hex radius, to be exploded at" + "the end of the next weapons attack phase." + "Allowed formats:"+ - "/bomb and" + - "/bomb [factor=10] [radius=4]" + - "the damage at impact point is 10 times the factor, default is 10. " + + "/ob and" + + "/ob [factor=#] [radius=#]" + + "the damage at impact point is the factor times 10, default factor value is 10. " + "and hex x, y is x=column number and y=row number (hex 0923 would be x=9 and y=23), the explosion blast radius default " + "is equal to 4, it automatically applies a linear damage dropoff each hex away from the center." + - " All parameters in square brackets may be ommited. " + + " All parameters in square brackets may be omitted. " + " Example: /ob 10 10 factor=12 "); this.gameManager = gameManager; }