Skip to content

Add on option to start at maximum aiming level #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Asdow merged 2 commits into from
Jan 22, 2023
Merged

Add on option to start at maximum aiming level #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
586f02a
Add on option to start at maximum aiming level
Asdow Jan 22, 2023
a43eede
Correct conditional on when to reset aim to max
Asdow Jan 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions GameSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ BOOLEAN LoadGameSettings()
gGameSettings.fOptions[TOPTION_RTCONFIRM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_RTCONFIRM" , FALSE );
gGameSettings.fOptions[TOPTION_SLEEPWAKE_NOTIFICATION] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SLEEPWAKE_NOTIFICATION" , TRUE );
gGameSettings.fOptions[TOPTION_USE_METRIC_SYSTEM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_USE_METRIC_SYSTEM" , TRUE );
gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = iniReader.ReadBoolean("JA2 Game Settings", "TOPTION_MERC_CASTS_LIGHT", FALSE);
gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = iniReader.ReadBoolean("JA2 Game Settings", "TOPTION_MERC_CASTS_LIGHT" , FALSE);
gGameSettings.fOptions[TOPTION_SMART_CURSOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SMART_CURSOR" , FALSE );
gGameSettings.fOptions[TOPTION_SNAP_CURSOR_TO_DOOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SNAP_CURSOR_TO_DOOR" , TRUE );
gGameSettings.fOptions[TOPTION_GLOW_ITEMS] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_GLOW_ITEMS" , TRUE );
Expand Down Expand Up @@ -332,6 +332,7 @@ BOOLEAN LoadGameSettings()
else
gGameSettings.fOptions[TOPTION_TOGGLE_TURN_MODE] = FALSE;

gGameSettings.fOptions[TOPTION_ALT_START_AIM] = iniReader.ReadBoolean("JA2 Game Settings", "TOPTION_ALT_START_AIM" , FALSE); // Start at max aiming level instead of default no aiming
gGameSettings.fOptions[TOPTION_MERCENARY_FORMATIONS] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_MERCENARY_FORMATIONS" , TRUE ); // Flugente: mercenary formations
gGameSettings.fOptions[TOPTION_SHOW_ENEMY_LOCATION] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SHOW_ENEMY_LOCATION" , FALSE); // sevenfm: show locations of known enemies
gGameSettings.fOptions[TOPTION_REPORT_MISS_MARGIN] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_REPORT_MISS_MARGIN" , FALSE ); // HEADROCK HAM 4: Shot offset report
Expand Down Expand Up @@ -607,12 +608,13 @@ BOOLEAN SaveGameSettings()
settings << "TOPTION_AUTO_FAST_FORWARD_MODE = " << (gGameSettings.fOptions[TOPTION_AUTO_FAST_FORWARD_MODE] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_SHOW_LAST_ENEMY = " << (gGameSettings.fOptions[TOPTION_SHOW_LAST_ENEMY] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_SHOW_LBE_CONTENT = " << (gGameSettings.fOptions[TOPTION_SHOW_LBE_CONTENT] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_INVERT_WHEEL = " << (gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_INVERT_WHEEL = " << (gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? "TRUE" : "FALSE" ) << endl;

settings << "TOPTION_ZOMBIES = " << (gGameSettings.fOptions[TOPTION_ZOMBIES] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_ENABLE_INVENTORY_POPUPS = " << (gGameSettings.fOptions[TOPTION_ENABLE_INVENTORY_POPUPS] ? "TRUE" : "FALSE" ) << endl; // the_bob : enable popups for picking items from sector inv
settings << "TOPTION_MERCENARY_FORMATIONS = " << (gGameSettings.fOptions[TOPTION_MERCENARY_FORMATIONS] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_SHOW_ENEMY_LOCATION = " << (gGameSettings.fOptions[TOPTION_SHOW_ENEMY_LOCATION] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_ALT_START_AIM = " << (gGameSettings.fOptions[TOPTION_ALT_START_AIM] ? "TRUE" : "FALSE") << endl;

settings << "TOPTION_CHEAT_MODE_OPTIONS_HEADER = " << (gGameSettings.fOptions[TOPTION_CHEAT_MODE_OPTIONS_HEADER] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = " << (gGameSettings.fOptions[TOPTION_FORCE_BOBBY_RAY_SHIPMENTS] ? "TRUE" : "FALSE" ) << endl;
Expand Down Expand Up @@ -839,7 +841,8 @@ void InitGameSettings()
gGameSettings.fOptions[TOPTION_INVERT_WHEEL] = FALSE;

gGameSettings.fOptions[ TOPTION_MERCENARY_FORMATIONS ] = FALSE; // Flugente: mercenary formations
gGameSettings.fOptions[ TOPTION_SHOW_ENEMY_LOCATION ] = FALSE; // sevenfm: show locations of known enemies
gGameSettings.fOptions[TOPTION_SHOW_ENEMY_LOCATION] = FALSE; // sevenfm: show locations of known enemies
gGameSettings.fOptions[TOPTION_ALT_START_AIM] = FALSE;

// arynn: Cheat/Debug Menu
gGameSettings.fOptions[ TOPTION_CHEAT_MODE_OPTIONS_HEADER ] = FALSE;
Expand Down
1 change: 1 addition & 0 deletions GameSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ enum

// sevenfm: new settings
TOPTION_SHOW_ENEMY_LOCATION,
TOPTION_ALT_START_AIM,

// arynn: Debug/Cheat
TOPTION_CHEAT_MODE_OPTIONS_HEADER,
Expand Down
39 changes: 32 additions & 7 deletions Tactical/UI Cursors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ BOOLEAN GetMouseRecalcAndShowAPFlags( UINT32 *puiCursorFlags, BOOLEAN *pfShowAPs
// FUNCTIONS FOR CURSOR DETERMINATION!
UINT8 GetProperItemCursor( UINT8 ubSoldierID, UINT16 ubItemIndex, INT32 usMapPos, BOOLEAN fActivated )
{
SOLDIERTYPE *pSoldier;
UINT32 uiCursorFlags;
BOOLEAN fShowAPs = FALSE;
BOOLEAN fRecalc = FALSE;
SOLDIERTYPE *pSoldier;
UINT32 uiCursorFlags;
BOOLEAN fShowAPs = FALSE;
BOOLEAN fRecalc = FALSE;
INT32 sTargetGridNo = usMapPos;
UINT8 ubCursorID=0;
UINT8 ubItemCursor;
UINT8 ubCursorID=0;
UINT8 ubItemCursor = 0;

pSoldier = MercPtrs[ ubSoldierID ];

Expand Down Expand Up @@ -350,6 +350,7 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, INT32 usMapPos, BOOLEA
UINT16 usCursor=0;
BOOLEAN fMaxPointLimitHit = FALSE;
UINT16 usInHand;
extern UINT32 guiNewUICursor;

UINT16 reverse = 0;

Expand Down Expand Up @@ -457,6 +458,30 @@ UINT8 HandleActivatedTargetCursor( SOLDIERTYPE *pSoldier, INT32 usMapPos, BOOLEA
gsCurrentActionPoints = CalcTotalAPsToAttack( pSoldier, usMapPos, TRUE, (INT8)(pSoldier->aiData.bShownAimTime ) );
}

const bool isCursorOnTarget = (
guiNewUICursor == ACTION_SHOOT_UICURSOR || guiNewUICursor == ACTION_TARGETBURST_UICURSOR ||
guiNewUICursor == ACTION_FLASH_SHOOT_UICURSOR || guiNewUICursor == ACTION_FLASH_BURST_UICURSOR ||
guiNewUICursor == ACTION_NOCHANCE_SHOOT_UICURSOR || guiNewUICursor == ACTION_NOCHANCE_BURST_UICURSOR
);
// Start at maximum aiming levels if the option is toggled
if (gGameSettings.fOptions[TOPTION_ALT_START_AIM] && isCursorOnTarget)
Comment on lines +461 to +467
Copy link
Copy Markdown
Contributor

@majcosta majcosta Jan 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either squash this commit onto the previous, or move the UI Cursors changes in the previous commit to this one.

This 'Commit A - Did something', 'Commit B - Fix something that was wrong in commit A' structure makes it harder to review this, not easier.

{
pSoldier->aiData.bShownAimTime = maxAimLevels;
sAPCosts = CalcTotalAPsToAttack(pSoldier, usMapPos, TRUE, pSoldier->aiData.bShownAimTime);
// Determine if we can afford!
while (!EnoughPoints(pSoldier, sAPCosts, 0, FALSE))
{
pSoldier->aiData.bShownAimTime -= 1;
if (pSoldier->aiData.bShownAimTime < 0)
{
pSoldier->aiData.bShownAimTime = REFINE_AIM_1;
break;
}
sAPCosts = CalcTotalAPsToAttack(pSoldier, usMapPos, TRUE, pSoldier->aiData.bShownAimTime);
}
gsCurrentActionPoints = sAPCosts;
}

// If we don't have any points and we are at the first refine, do nothing but warn!
if ( !EnoughPoints( pSoldier, gsCurrentActionPoints, 0 , FALSE ) && (pSoldier->aiData.bShownAimTime == 0))
{
Expand Down Expand Up @@ -4004,4 +4029,4 @@ UINT8 DefaultAutofireBulletsByGunClass( SOLDIERTYPE* pSoldier )
}

return ubBullets;
}
}
2 changes: 2 additions & 0 deletions Utils/_ChineseText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6574,6 +6574,7 @@ STR16 zOptionsToggleText[] =
L"反转鼠标滚轮", //L"Invert mouse wheel",
L"保持佣兵间距", // when multiple mercs are selected, they will try to keep their relative distances
L"显示已知敌人位置", //L"Show enemy location", show locator on last known enemy location
L"Start at maximum aim",
L"--作弊模式选项--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"强制 Bobby Ray 送货", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6693,6 +6694,7 @@ STR16 zOptionsScreenHelpText[] =
L"打开时，反转鼠标滚轮方向。",
L"打开时，当选择多个佣兵，在前进时会保持彼此的间距。|C|t|r|l+|A|l|t+|G \n（按|S|h|i|f|t+点击人物头像可以加入或移出队伍）", //L"When ON and multiple mercs are selected, they will try to keep their relative distances while moving.\n(press |C|t|r|l+|A|l|t+|G to toggle mode or |S|h|i|f|t + click to move in formation)", TODO.Translate
L"打开时，会显示已知敌人最后移动的位置。", //L"When ON, shows last known enemy location.",
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"强制 Bobby Ray 出货",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down
2 changes: 2 additions & 0 deletions Utils/_DutchText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6576,6 +6576,7 @@ STR16 zOptionsToggleText[] =
L"Invert mouse wheel", // TODO.Translate
L"Formation Movement", // when multiple mercs are selected, they will try to keep their relative distances // TODO.Translate
L"Show enemy location", // show locator on last known enemy location
L"Start at maximum aim",
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6695,6 +6696,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, inverts mouse wheel directions.", // TODO.Translate
L"When ON and multiple mercs are selected, they will try to keep their relative distances while moving.\n(press |C|t|r|l+|A|l|t+|G to toggle mode or |S|h|i|f|t + click to move in formation)", //TODO.Translate
L"When ON, shows last known enemy location.", //TODO.Translate
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down
2 changes: 2 additions & 0 deletions Utils/_EnglishText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6574,6 +6574,7 @@ STR16 zOptionsToggleText[] =
L"Invert Mouse Wheel",
L"Formation Movement", // when multiple mercs are selected, they will try to keep their relative distances
L"Show enemy location", // show locator on last known enemy location
L"Start at maximum aim",
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray Shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6693,6 +6694,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, inverts mouse wheel directions.",
L"When ON and multiple mercs are selected, they will try to keep their relative distances while moving.\n(press |C|t|r|l+|A|l|t+|G to toggle mode or |S|h|i|f|t + click to move in formation)",
L"When ON, shows last known enemy location.",
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down
2 changes: 2 additions & 0 deletions Utils/_FrenchText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6581,6 +6581,7 @@ STR16 zOptionsToggleText[] =
L"Inverser molette/souris",
L"Déplacement tactique", // when multiple mercs are selected, they will try to keep their relative distances
L"Show enemy location", // show locator on last known enemy location
L"Start at maximum aim",
L"--Options mode triche--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Forcer envois Bobby Ray", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6699,6 +6700,7 @@ STR16 zOptionsScreenHelpText[] =
L"Si activé, inverse le sens de la molette de la souris.",
L"When ON and multiple mercs are selected, they will try to keep their relative distances while moving.\n(press |C|t|r|l+|A|l|t+|G to toggle mode or |S|h|i|f|t + click to move in formation)", //TODO.Translate
L"When ON, shows last known enemy location.", //TODO.Translate
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Forcer tous les envois en attente de Bobby Ray",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down
2 changes: 2 additions & 0 deletions Utils/_GermanText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6447,6 +6447,7 @@ STR16 zOptionsToggleText[] =
L"Mausradrichtung umkehren",
L"Bewegung in Formation", // when multiple mercs are selected, they will try to keep their relative distances
L"Show enemy location", // show locator on last known enemy location
L"Start at maximum aim",
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Erzwinge BR Lieferung", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6566,6 +6567,7 @@ STR16 zOptionsScreenHelpText[] =
L"Wenn diese Funktion aktiviert ist, wird die Mausradrichtung umgekehrt",
L"When ON and multiple mercs are selected, they will try to keep their relative distances while moving.\n(press |C|t|r|l+|A|l|t+|G to toggle mode or |S|h|i|f|t + click to move in formation)", //TODO.Translate
L"When ON, shows last known enemy location.", //TODO.Translate
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down
2 changes: 2 additions & 0 deletions Utils/_ItalianText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6559,6 +6559,7 @@ STR16 zOptionsToggleText[] =
L"Invert mouse wheel", // TODO.Translate
L"Formation Movement", // when multiple mercs are selected, they will try to keep their relative distances // TODO.Translate
L"Show enemy location", // show locator on last known enemy location
L"Start at maximum aim",
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6678,6 +6679,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, inverts mouse wheel directions.", // TODO.Translate
L"When ON and multiple mercs are selected, they will try to keep their relative distances while moving.\n(press |C|t|r|l+|A|l|t+|G to toggle mode or |S|h|i|f|t + click to move in formation)", //TODO.Translate
L"When ON, shows last known enemy location.", //TODO.Translate
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down
2 changes: 2 additions & 0 deletions Utils/_PolishText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6578,6 +6578,7 @@ STR16 zOptionsToggleText[] =
L"Invert mouse wheel", // TODO.Translate
L"Formation Movement", // when multiple mercs are selected, they will try to keep their relative distances // TODO.Translate
L"Show enemy location", // show locator on last known enemy location
L"Start at maximum aim",
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6697,6 +6698,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, inverts mouse wheel directions.", // TODO.Translate
L"When ON and multiple mercs are selected, they will try to keep their relative distances while moving.\n(press |C|t|r|l+|A|l|t+|G to toggle mode or |S|h|i|f|t + click to move in formation)", //TODO.Translate
L"When ON, shows last known enemy location.", //TODO.Translate
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Wymuś wszystkie oczekiwane dostawy od Bobby Ray's.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down
2 changes: 2 additions & 0 deletions Utils/_RussianText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6570,6 +6570,7 @@ STR16 zOptionsToggleText[] =
L"Инвертировать колесо мыши",
L"Боевой порядок", // when multiple mercs are selected, they will try to keep their relative distances
L"Показывать расположение", // show locator on last known enemy location
L"Start at maximum aim",
L"--Читерские настройки--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Ускорить доставку Бобби Рэя", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
Expand Down Expand Up @@ -6689,6 +6690,7 @@ STR16 zOptionsScreenHelpText[] =
L"Если включено, инвертирует направление\nпрокрутки колеса мыши.",
L"Если выбрано несколько наёмников,\nони будут пытаться сохранять взаимное расположение\nи дистанцию при движении\n(нажмите |C|t|r|l+|A|l|t+|G для переключения или |S|h|i|f|t + клик для движения).",
L"Если включено, показывает известное расположение противника\n(нажмите |S|h|i|f|t, чтобы показать источник шума).",
L"When ON, aiming at enemy will start at maximum aiming instead of default no aim",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Выберите этот пункт,\nчтобы груз Бобби Рэя прибыл немедленно.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Expand Down