Revert "Battlemaster stock loadouts, Behemoth weapon groups, 18-entry MP time list"
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:
co-authored by
Claude Sonnet 4.6
GitHub Copilot
parent
aa500be7c6
commit
9aa317ea09
@@ -39,7 +39,7 @@
|
||||
#define TIME_LIST_DEFAULT $$g_nTimeList_Index$$ // 5 // 7 minutes
|
||||
#define TIME_VALUE_DEFAULT $$g_nTimeList_Value$$ // 7 // 7 minutes
|
||||
#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_VALUE_DEFAULT $$g_nTimeList_Value$$ // 7 // 7 minutes
|
||||
#endif // DEMO_CODE
|
||||
@@ -283,19 +283,14 @@ main
|
||||
o_game_options[i].offsetLabel = drop_name_loc[i]
|
||||
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
|
||||
if i == 6
|
||||
{
|
||||
o_game_options[i].max_displayed = 4
|
||||
}
|
||||
else
|
||||
{
|
||||
o_game_options[i].max_displayed = 16
|
||||
}
|
||||
{
|
||||
o_game_options[i].max_displayed = 16
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -448,7 +443,7 @@ main
|
||||
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[1] = "2"
|
||||
@@ -465,22 +460,13 @@ main
|
||||
|
||||
o_game_options[i].nselected = TIME_LIST_DEFAULT
|
||||
#else // !DEMO_CODE
|
||||
o_game_options[i].list_item[2] = "3"
|
||||
o_game_options[i].list_item[3] = "4"
|
||||
o_game_options[i].list_item[4] = "5"
|
||||
o_game_options[i].list_item[5] = "6"
|
||||
o_game_options[i].list_item[6] = "7"
|
||||
o_game_options[i].list_item[7] = "8"
|
||||
o_game_options[i].list_item[8] = "9"
|
||||
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"
|
||||
o_game_options[i].list_item[2] = "5"
|
||||
o_game_options[i].list_item[3] = "7"
|
||||
o_game_options[i].list_item[4] = "9"
|
||||
o_game_options[i].list_item[5] = "10"
|
||||
o_game_options[i].list_item[6] = "12"
|
||||
o_game_options[i].list_item[7] = "15"
|
||||
o_game_options[i].list_item[8] = "30"
|
||||
|
||||
if callback($$GetLocalNetworkMissionParamater$$, time_limit) == 0
|
||||
o_game_options[i].nselected = TIME_LIST_DEFAULT
|
||||
|
||||
Reference in New Issue
Block a user