From 8880e8e9b958f1dd62d791e827a9058cd0566ab5 Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Thu, 22 Oct 2026 14:52:14 -0400 Subject: [PATCH] Fix #645: Rebranded Illogical Scenario Modifiers; Re-Enabled Ambush Modifiers --- .../scenariomodifiers/Concealed Defences.json | 70 ++++++++++++++++++ data/scenariomodifiers/Infantry.json | 70 ++++++++++++++++++ .../scenariomodifiers/LocalGarrisonBoats.json | 71 ------------------- .../LocalGarrisonInfantry.json | 70 ------------------ .../groundBattleModifiers.json | 9 +-- data/scenariomodifiers/modifiermanifest.json | 8 +-- .../GarrisonDuty.json | 2 +- 7 files changed, 150 insertions(+), 150 deletions(-) create mode 100644 data/scenariomodifiers/Concealed Defences.json create mode 100644 data/scenariomodifiers/Infantry.json delete mode 100644 data/scenariomodifiers/LocalGarrisonBoats.json delete mode 100644 data/scenariomodifiers/LocalGarrisonInfantry.json diff --git a/data/scenariomodifiers/Concealed Defences.json b/data/scenariomodifiers/Concealed Defences.json new file mode 100644 index 0000000000..33f77ca019 --- /dev/null +++ b/data/scenariomodifiers/Concealed Defences.json @@ -0,0 +1,70 @@ +# MegaMek Data (C) 2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. +# To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/ +# +# NOTICE: The MegaMek organization is a non-profit group of volunteers +# creating free software for the BattleTech community. +# +# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks +# of The Topps Company, Inc. All Rights Reserved. +# +# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of +# InMediaRes Productions, LLC. +# +# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under +# Microsoft's "Game Content Usage Rules" +# and it is not endorsed by or +# affiliated with Microsoft. + +{ + "modifierName" : "Concealed Defences", + "additionalBriefingText" : "Hidden defences have been reported in the area.", + "benefitsPlayer" : false, + "blockFurtherEvents" : false, + "eventTiming" : "PostForceGeneration", + "forceDefinition" : { + "forceAlignment" : 4, + "generationMethod" : 2, + "forceMultiplier" : 1.0, + "deploymentZones" : [ 10 ], + "destinationZone" : 5, + "retreatThreshold" : 50, + "allowedUnitType" : 7, + "canReinforceLinked" : false, + "contributesToBV" : false, + "contributesToUnitCount" : false, + "forceName" : "Local Fixed Defences", + "syncedForceName" : null, + "syncDeploymentType" : "None", + "syncRetreatThreshold" : false, + "arrivalTurn" : 0, + "maxWeightClass" : 4, + "minWeightClass" : 0, + "contributesToMapSize" : true, + "actualDeploymentZone" : -1, + "fixedUnitCount" : 0, + "generationOrder" : 2, + "allowAeroBombs" : false, + "startingAltitude" : 0, + "useArtillery" : false, + "deployOffBoard" : false, + "objectiveLinkedForces" : [ ], + "subjectToRandomRemoval" : true, + "fixedMul" : null, + "forceRoleStrings" : [ ] + }, + "skillAdjustment" : null, + "qualityAdjustment" : null, + "eventRecipient" : "Opposing", + "battleDamageIntensity" : null, + "ammoExpenditureIntensity" : null, + "unitRemovalCount" : null, + "allowedMapLocations" : [ "AllGroundTerrain", "SpecificGroundTerrain" ], + "allowedTerrainTypes" : null, + "useAmbushLogic" : true, + "switchSides" : false, + "numExtraEvents" : null, + "bvBudgetAdditiveMultiplier" : null, + "reinforcementDelayReduction" : null, + "objectives" : [ ], + "linkedModifiers" : { } +} \ No newline at end of file diff --git a/data/scenariomodifiers/Infantry.json b/data/scenariomodifiers/Infantry.json new file mode 100644 index 0000000000..7e03c4d248 --- /dev/null +++ b/data/scenariomodifiers/Infantry.json @@ -0,0 +1,70 @@ +# MegaMek Data (C) 2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. +# To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/ +# +# NOTICE: The MegaMek organization is a non-profit group of volunteers +# creating free software for the BattleTech community. +# +# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks +# of The Topps Company, Inc. All Rights Reserved. +# +# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of +# InMediaRes Productions, LLC. +# +# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under +# Microsoft's "Game Content Usage Rules" +# and it is not endorsed by or +# affiliated with Microsoft. + +{ + "modifierName" : "Infantry", + "additionalBriefingText" : "Hidden infantry are reported in the area.", + "benefitsPlayer" : false, + "blockFurtherEvents" : false, + "eventTiming" : "PostForceGeneration", + "forceDefinition" : { + "forceAlignment" : 4, + "generationMethod" : 2, + "forceMultiplier" : 1.0, + "deploymentZones" : [ 10 ], + "destinationZone" : 5, + "retreatThreshold" : 50, + "allowedUnitType" : 3, + "canReinforceLinked" : false, + "contributesToBV" : false, + "contributesToUnitCount" : false, + "forceName" : "Local Infantry", + "syncedForceName" : null, + "syncDeploymentType" : "None", + "syncRetreatThreshold" : false, + "arrivalTurn" : 0, + "maxWeightClass" : 4, + "minWeightClass" : 0, + "contributesToMapSize" : true, + "actualDeploymentZone" : -1, + "fixedUnitCount" : 0, + "generationOrder" : 5, + "allowAeroBombs" : false, + "startingAltitude" : 0, + "useArtillery" : false, + "deployOffBoard" : false, + "objectiveLinkedForces" : [ ], + "subjectToRandomRemoval" : true, + "fixedMul" : null, + "forceRoleStrings" : [ ] + }, + "skillAdjustment" : null, + "qualityAdjustment" : null, + "eventRecipient" : "Opposing", + "battleDamageIntensity" : null, + "ammoExpenditureIntensity" : null, + "unitRemovalCount" : null, + "allowedMapLocations" : [ "AllGroundTerrain", "SpecificGroundTerrain" ], + "allowedTerrainTypes" : null, + "useAmbushLogic" : true, + "switchSides" : false, + "numExtraEvents" : null, + "bvBudgetAdditiveMultiplier" : null, + "reinforcementDelayReduction" : null, + "objectives" : [ ], + "linkedModifiers" : { } +} \ No newline at end of file diff --git a/data/scenariomodifiers/LocalGarrisonBoats.json b/data/scenariomodifiers/LocalGarrisonBoats.json deleted file mode 100644 index bdb01c44dd..0000000000 --- a/data/scenariomodifiers/LocalGarrisonBoats.json +++ /dev/null @@ -1,71 +0,0 @@ -# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. -# To view a copy of this license, visit https: //creativecommons.org/licenses/by-nc-sa/4.0/ -# -# NOTICE: The MegaMek organization is a non-profit group of volunteers -# creating free software for the BattleTech community. -# -# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks -# of The Topps Company, Inc. All Rights Reserved. -# -# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of -# InMediaRes Productions, LLC. -# -# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under -# Microsoft's "Game Content Usage Rules" -# and it is not endorsed by or -# affiliated with Microsoft. - -{ -"modifierName": null, -"additionalBriefingText": "Water-naval units have been reported in the area.", -"benefitsPlayer": false, -"blockFurtherEvents": false, -"eventTiming": "PostForceGeneration", -"forceDefinition": { -"forceAlignment": 4, -"generationMethod": 2, -"forceMultiplier": 1.0, -"deploymentZones": [0], -"destinationZone": 5, -"retreatThreshold": 50, -"allowedUnitType": 6, -"canReinforceLinked": false, -"contributesToBV": false, -"contributesToUnitCount": false, -"forceName": "Local Naval Units", -"syncedForceName": null, -"syncDeploymentType": "None", -"syncRetreatThreshold": false, -"arrivalTurn": 0, -"maxWeightClass": 4, -"minWeightClass": 0, -"contributesToMapSize": true, -"actualDeploymentZone": -1, -"fixedUnitCount": 0, -"generationOrder": 2, -"allowAeroBombs": false, -"startingAltitude": 0, -"useArtillery": false, -"deployOffBoard": false, -"objectiveLinkedForces": [], -"subjectToRandomRemoval": true, -"fixedMul": null, -"forceRoleStrings": [ -] -}, -"skillAdjustment": null, -"qualityAdjustment": null, -"eventRecipient" : null, -"battleDamageIntensity": null, -"ammoExpenditureIntensity": null, -"unitRemovalCount": null, -"allowedMapLocations": [ -"AllGroundTerrain", "SpecificGroundTerrain"], -"useAmbushLogic": null, -"switchSides": null, -"numExtraEvents": null, -"bvBudgetAdditiveMultiplier": null, -"reinforcementDelayReduction" : null, -"objectives": [], -"linkedModifiers": {} -} diff --git a/data/scenariomodifiers/LocalGarrisonInfantry.json b/data/scenariomodifiers/LocalGarrisonInfantry.json deleted file mode 100644 index a59644d52c..0000000000 --- a/data/scenariomodifiers/LocalGarrisonInfantry.json +++ /dev/null @@ -1,70 +0,0 @@ -# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. -# To view a copy of this license, visit https: //creativecommons.org/licenses/by-nc-sa/4.0/ -# -# NOTICE: The MegaMek organization is a non-profit group of volunteers -# creating free software for the BattleTech community. -# -# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks -# of The Topps Company, Inc. All Rights Reserved. -# -# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of -# InMediaRes Productions, LLC. -# -# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under -# Microsoft's "Game Content Usage Rules" -# and it is not endorsed by or -# affiliated with Microsoft. - -{ -"modifierName": null, -"additionalBriefingText": "Planetary garrison infantry are reported in the area.", -"benefitsPlayer": false, -"blockFurtherEvents": false, -"eventTiming": "PostForceGeneration", -"forceDefinition": { -"forceAlignment": 4, -"generationMethod": 2, -"forceMultiplier": 1.0, -"deploymentZones": [10], -"destinationZone": 5, -"retreatThreshold": 50, -"allowedUnitType": 3, -"canReinforceLinked": false, -"contributesToBV": false, -"contributesToUnitCount": false, -"forceName": "Local Infantry", -"syncedForceName": null, -"syncDeploymentType": "None", -"syncRetreatThreshold": false, -"arrivalTurn": 0, -"maxWeightClass": 4, -"minWeightClass": 0, -"contributesToMapSize": true, -"actualDeploymentZone": -1, -"fixedUnitCount": 0, -"generationOrder": 5, -"allowAeroBombs": false, -"startingAltitude": 0, -"useArtillery": false, -"deployOffBoard": false, -"objectiveLinkedForces": [], -"subjectToRandomRemoval": true, -"fixedMul": null, -"forceRoleStrings": [] -}, -"skillAdjustment": null, -"qualityAdjustment": null, -"eventRecipient" : null, -"battleDamageIntensity": null, -"ammoExpenditureIntensity": null, -"unitRemovalCount": null, -"allowedMapLocations": [ -"AllGroundTerrain", "SpecificGroundTerrain"], -"useAmbushLogic": null, -"switchSides": null, -"numExtraEvents": null, -"bvBudgetAdditiveMultiplier": null, -"reinforcementDelayReduction" : null, -"objectives": [], -"linkedModifiers": {} -} diff --git a/data/scenariomodifiers/groundBattleModifiers.json b/data/scenariomodifiers/groundBattleModifiers.json index 6f3037923d..5efc460f6d 100644 --- a/data/scenariomodifiers/groundBattleModifiers.json +++ b/data/scenariomodifiers/groundBattleModifiers.json @@ -16,7 +16,7 @@ # affiliated with Microsoft. # This is *all* possible ground scenario modifiers. -# Disabled modifiers (kept for reference): HotDrop.json, EnemyDropShip.json, GroundedEnemyDropShip.json, Duel.json, EnemyAmbush.json, PlayerAmbush.json, AlliedTreachery.json, OffworldOperation.json, EnemyAceMekARC2R.json, EnemyAceMekAWS8Q.json, EnemyAceMekFS9M.json, EnemyAceMekGHR5N.json, EnemyAceMekHGN733P.json, EnemyAceMekMAD3D.json, EnemyAceMekPXH1D.json, EnemyAirCav.json, EnemyAirMobileInf.json, EnemyMercFireSupport.json, EnemyMercBrawl.json, EnemyMercSkirmish.json, EnemyMercScouts.json, AlliedCavLance.json, AlliedMekAceCRD.json, AlliedMekAceGLT.json, AlliedMekAceGOL.json, AlliedMekAceOTT.json, AlliedMekAceTBT.json, AlliedASFAce01.json, EnemyASFAce01.json, EnemyASFAce02.json +# Disabled modifiers (kept for reference): HotDrop.json, EnemyDropShip.json, GroundedEnemyDropShip.json, Duel.json, AlliedTreachery.json, OffworldOperation.json, EnemyAceMekARC2R.json, EnemyAceMekAWS8Q.json, EnemyAceMekFS9M.json, EnemyAceMekGHR5N.json, EnemyAceMekHGN733P.json, EnemyAceMekMAD3D.json, EnemyAceMekPXH1D.json, EnemyAirCav.json, EnemyAirMobileInf.json, EnemyMercFireSupport.json, EnemyMercBrawl.json, EnemyMercSkirmish.json, EnemyMercScouts.json, AlliedCavLance.json, AlliedMekAceCRD.json, AlliedMekAceGLT.json, AlliedMekAceGOL.json, AlliedMekAceOTT.json, AlliedMekAceTBT.json, AlliedASFAce01.json, EnemyASFAce01.json, EnemyASFAce02.json { "fileNameList": [ "EnemyAirSupport.json", @@ -26,9 +26,10 @@ "EnemyTankReinforcements.json", "EnemyMekReinforcements.json", "EnemyArty.json", -"LocalGarrisonInfantry.json", -"LocalGarrisonTurrets.json", -"LocalGarrisonBoats.json", +"Infantry.json", +"Concealed Defences.json" +"EnemyAmbush.json", +"PlayerAmbush.json", "EnemyTurrets.json", "Rookies.json", "Veterans.json", diff --git a/data/scenariomodifiers/modifiermanifest.json b/data/scenariomodifiers/modifiermanifest.json index 6876a440a6..d69c560cbf 100644 --- a/data/scenariomodifiers/modifiermanifest.json +++ b/data/scenariomodifiers/modifiermanifest.json @@ -26,9 +26,8 @@ "EnemyTankReinforcements.json", "EnemyMekReinforcements.json", "EnemyArty.json", -"LocalGarrisonInfantry.json", -"LocalGarrisonTurrets.json", -"LocalGarrisonBoats.json", +"Infantry.json", +"Concealed Defences.json" "EnemyTurrets.json", "Rookies.json", "Veterans.json", @@ -50,7 +49,8 @@ "ReinforcementDelayReductionAllied.json", # Need "special duel flag": Duel.json # Need objective system: TrainingExercise.json -# Disabled until Princess can better manage Hidden units: EnemyAmbush.json, PlayerAmbush.json +"EnemyAmbush.json", +"PlayerAmbush.json", "AlliedAirSupport.json", "AlliedAirSupportBombers.json", "AlliedGroundSupport.json", diff --git a/data/stratconcontractdefinitions/GarrisonDuty.json b/data/stratconcontractdefinitions/GarrisonDuty.json index 5e1133e971..783fd1cdca 100644 --- a/data/stratconcontractdefinitions/GarrisonDuty.json +++ b/data/stratconcontractdefinitions/GarrisonDuty.json @@ -27,7 +27,7 @@ "objectiveCount": -1.0, "objectiveScenarios": [], "objectiveScenarioModifiers": [ - "LocalGarrisonTurrets.json" + "Concealed Defences.json" ] } ],