vwemirror/firestorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Battlemaster stock loadouts, Behemoth weapon groups, 18-entry MP time list"

Browse Source 
Reverts aa500be7. Contains a ConLobby.script typo fixed in mfdsplit.
mfdsplit will be promoted to main once fully tested, at which point this change
is superseded. Main kept prod-clean until that promotion cycle completes.

Co-authored-by: Claude Sonnet 4.6 (Anthropic) <noreply@anthropic.com>
Co-authored-by: GitHub Copilot <copilot@github.com>
This commit is contained in:
dicion
2026-07-19 14:53:24 -05:00
co-authored by Claude Sonnet 4.6 GitHub Copilot
parent aa500be7c6
commit 9aa317ea09
12 changed files with 34 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gameleap/mw4/Content/Mechs/Battlemaster/battlemaster.subsystems
+3 -83
View File
@@ -167,90 +167,10 @@ Model=Subsystems\HeatSinkSubsystem.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
InternalLocation=CenterTorso InternalLocation=CenterTorso
[PPC1] [MediumPulse1]
Model=WeaponSubsystems\PPCWeaponSubsystem\PPC.data Model=WeaponSubsystems\PulseLaserWeaponSubsystem\MediumPulseLaser.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
CriticalHitsTaken=1 CriticalHitsTaken=1
Site=site_rdgunport Site=site_lbgunport
GroupIndex=1
InternalLocation=Special2
[MediumLaser1]
Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_rdtorsoport
GroupIndex=1
InternalLocation=RightTorso
[MediumLaser2]
Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_rdtorsoport
GroupIndex=1
InternalLocation=RightTorso
[MediumLaser3]
Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_rdtorsoport
GroupIndex=1
InternalLocation=RightTorso
WeaponFacing=1
[MediumLaser4]
Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_ldtorsoport
GroupIndex=1
InternalLocation=LeftTorso
[MediumLaser5]
Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_ldtorsoport
GroupIndex=1
InternalLocation=LeftTorso
[MediumLaser6]
Model=WeaponSubsystems\LaserWeaponSubsystem\MediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_ldtorsoport
GroupIndex=1
InternalLocation=LeftTorso
WeaponFacing=1
[MachineGun1]
Model=WeaponSubsystems\MachineGunWeaponSubsystem\MachineGun.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_lagunport
EjectSite=site_lagunport
GroupIndex=1 GroupIndex=1
InternalLocation=LeftArm InternalLocation=LeftArm
AmmoCount=200
[MachineGun2]
Model=WeaponSubsystems\MachineGunWeaponSubsystem\MachineGun.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_lagunport
EjectSite=site_lagunport
GroupIndex=1
InternalLocation=LeftArm
AmmoCount=200
[SRM6_1]
Model=WeaponSubsystems\SRMWeaponSubsystem\SRM6.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_missile
GroupIndex=2
InternalLocation=Special1
AmmoCount=15
Gameleap/mw4/Content/Mechs/Battlemaster2c/battlemaster2c.subsystems
+2 -80
View File
@@ -167,88 +167,10 @@ Model=Subsystems\HeatSinkSubsystem.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
InternalLocation=CenterTorso InternalLocation=CenterTorso
[ERPPC1] [MediumPulse1]
Model=WeaponSubsystems\PPCWeaponSubsystem\ClanERPPC.data Model=WeaponSubsystems\PulseLaserWeaponSubsystem\ClanMediumPulseLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_ragunport
GroupIndex=1
InternalLocation=RightArm
[ERMediumLaser1]
Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_rdtorsoport
GroupIndex=1
InternalLocation=RightTorso
[ERMediumLaser2]
Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_rdtorsoport
GroupIndex=1
InternalLocation=RightTorso
[ERMediumLaser3]
Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_rdtorsoport
GroupIndex=1
InternalLocation=RightTorso
WeaponFacing=1
[ERMediumLaser4]
Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_ldtorsoport
GroupIndex=1
InternalLocation=LeftTorso
[ERMediumLaser5]
Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_ldtorsoport
GroupIndex=1
InternalLocation=LeftTorso
[ERMediumLaser6]
Model=WeaponSubsystems\LaserWeaponSubsystem\ClanERMediumLaser.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_ldtorsoport
GroupIndex=1
InternalLocation=LeftTorso
WeaponFacing=1
[Gauss1]
Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_lagunport
GroupIndex=1
InternalLocation=LeftArm
AmmoCount=16
[Gauss2]
Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
CriticalHitsTaken=1 CriticalHitsTaken=1
Site=site_lbgunport Site=site_lbgunport
GroupIndex=1 GroupIndex=1
InternalLocation=LeftArm InternalLocation=LeftArm
AmmoCount=16
[SSRM6_1]
Model=WeaponSubsystems\SSRMWeaponSubsystem\ClanSSRM6.data
ExecutionState=NeverExecuteState
CriticalHitsTaken=1
Site=site_missile
GroupIndex=2
InternalLocation=Special1
AmmoCount=15
Gameleap/mw4/Content/Mechs/Behemoth/behemoth.subsystems
+3 -3
View File
@@ -185,7 +185,7 @@ InternalLocation=RightTorso
Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
Site=site_lmgunport Site=site_lmgunport
GroupIndex=1 GroupIndex=3
InternalLocation=LeftArm InternalLocation=LeftArm
AmmoCount=16 AmmoCount=16
@@ -193,7 +193,7 @@ AmmoCount=16
Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
Site=site_rmgunport Site=site_rmgunport
GroupIndex=1 GroupIndex=3
InternalLocation=RightArm InternalLocation=RightArm
AmmoCount=16 AmmoCount=16
@@ -201,6 +201,6 @@ AmmoCount=16
Model=WeaponSubsystems\LaserWeaponSubsystem\LargeLaser.data Model=WeaponSubsystems\LaserWeaponSubsystem\LargeLaser.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
Site=site_ctorsoport Site=site_ctorsoport
GroupIndex=1 GroupIndex=3
InternalLocation=Special1 InternalLocation=Special1
Gameleap/mw4/Content/Mechs/Behemoth2/behemoth2.subsystems
+3 -3
View File
@@ -185,7 +185,7 @@ InternalLocation=RightTorso
Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
Site=site_lmgunport Site=site_lmgunport
GroupIndex=1 GroupIndex=3
InternalLocation=LeftArm InternalLocation=LeftArm
AmmoCount=16 AmmoCount=16
@@ -193,7 +193,7 @@ AmmoCount=16
Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data Model=WeaponSubsystems\GaussWeaponSubsystem\ClanGaussRifle.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
Site=site_rmgunport Site=site_rmgunport
GroupIndex=1 GroupIndex=3
InternalLocation=RightArm InternalLocation=RightArm
AmmoCount=16 AmmoCount=16
@@ -201,6 +201,6 @@ AmmoCount=16
Model=WeaponSubsystems\LaserWeaponSubsystem\LargeLaser.data Model=WeaponSubsystems\LaserWeaponSubsystem\LargeLaser.data
ExecutionState=NeverExecuteState ExecutionState=NeverExecuteState
Site=site_ctorsoport Site=site_ctorsoport
GroupIndex=1 GroupIndex=3
InternalLocation=Special1 InternalLocation=Special1
Gameleap/mw4/Content/ShellScripts/Multiplayer/ConLobbyMission.script
+14 -28
View File
@@ -39,7 +39,7 @@
#define TIME_LIST_DEFAULT $$g_nTimeList_Index$$ // 5 // 7 minutes #define TIME_LIST_DEFAULT $$g_nTimeList_Index$$ // 5 // 7 minutes
#define TIME_VALUE_DEFAULT $$g_nTimeList_Value$$ // 7 // 7 minutes #define TIME_VALUE_DEFAULT $$g_nTimeList_Value$$ // 7 // 7 minutes
#else // !DEMO_CODE #else // !DEMO_CODE
#define TIME_LIST_COUNT 18 // MSL // JPP array total #define TIME_LIST_COUNT 9 // MSL
#define TIME_LIST_DEFAULT $$g_nTimeList_Index$$ // 3 // 7 minutes #define TIME_LIST_DEFAULT $$g_nTimeList_Index$$ // 3 // 7 minutes
#define TIME_VALUE_DEFAULT $$g_nTimeList_Value$$ // 7 // 7 minutes #define TIME_VALUE_DEFAULT $$g_nTimeList_Value$$ // 7 // 7 minutes
#endif // DEMO_CODE #endif // DEMO_CODE
@@ -283,19 +283,14 @@ main
o_game_options[i].offsetLabel = drop_name_loc[i] o_game_options[i].offsetLabel = drop_name_loc[i]
o_game_options[i].arrowHeight = 15 o_game_options[i].arrowHeight = 15
if i == 5 if i == 6
{ {
o_game_options[i].max_displayed = 10 o_game_options[i].max_displayed = 4
} }
else else
if i == 6 {
{ o_game_options[i].max_displayed = 16
o_game_options[i].max_displayed = 4 }
}
else
{
o_game_options[i].max_displayed = 16
}
} }
else else
{ {
@@ -448,7 +443,7 @@ main
callback($$Shell_CallbackHandler$$, ShellSetTime, o_game_options[i].nselected) callback($$Shell_CallbackHandler$$, ShellSetTime, o_game_options[i].nselected)
} }
if i == 5 //jpp add time list here if i == 5
{ {
o_game_options[i].list_item[0] = "1" o_game_options[i].list_item[0] = "1"
o_game_options[i].list_item[1] = "2" o_game_options[i].list_item[1] = "2"
@@ -465,22 +460,13 @@ main
o_game_options[i].nselected = TIME_LIST_DEFAULT o_game_options[i].nselected = TIME_LIST_DEFAULT
#else // !DEMO_CODE #else // !DEMO_CODE
o_game_options[i].list_item[2] = "3" o_game_options[i].list_item[2] = "5"
o_game_options[i].list_item[3] = "4" o_game_options[i].list_item[3] = "7"
o_game_options[i].list_item[4] = "5" o_game_options[i].list_item[4] = "9"
o_game_options[i].list_item[5] = "6" o_game_options[i].list_item[5] = "10"
o_game_options[i].list_item[6] = "7" o_game_options[i].list_item[6] = "12"
o_game_options[i].list_item[7] = "8" o_game_options[i].list_item[7] = "15"
o_game_options[i].list_item[8] = "9" o_game_options[i].list_item[8] = "30"
o_game_options[i].list_item[9] = "10"
o_game_options[i].list_item[10] = "11"
o_game_options[i].list_item[11] = "12"
o_game_options[i].list_item[12] = "13"
o_game_options[i].list_item[13] = "14"
o_game_options[i].list_item[14] = "15"
o_game_options[i].list_item[15] = "20"
o_game_options[i].list_item[16] = "25"
o_game_options[i].list_item[17] = "30"
if callback($$GetLocalNetworkMissionParamater$$, time_limit) == 0 if callback($$GetLocalNetworkMissionParamater$$, time_limit) == 0
o_game_options[i].nselected = TIME_LIST_DEFAULT o_game_options[i].nselected = TIME_LIST_DEFAULT
Gameleap/mw4/MW4pro.exe
LFS
BIN
View File
Binary file not shown.
Gameleap/mw4/Resource/core.dep
BIN
View File
Binary file not shown.
Gameleap/mw4/Resource/core.mw4
LFS
BIN
View File
Binary file not shown.
Gameleap/mw4/Resource/props.dep
BIN
View File
Binary file not shown.
Gameleap/mw4/Resource/props.mw4
LFS
BIN
View File
Binary file not shown.
MW4/Resource/core.mw4
LFS
BIN
View File
Binary file not shown.
MW4/Resource/props.mw4
LFS
BIN
View File
Binary file not shown.