Skip to content

Hitlog nerf, spotter nerf #166

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

Open
misterjoper007 wants to merge 2 commits into
base: fta
Choose a base branch
from
Open

Hitlog nerf, spotter nerf #166

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
d47563a
Hitlog nerf, spotter nerf
misterjoper007 Jun 16, 2022
6ce218c
stealh overwatch
misterjoper007 Jun 20, 2022
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
8 changes: 8 additions & 0 deletions src/Battlescape/AIModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,13 @@ void AIModule::think(BattleAction *action)
action->target = _patrolAction.target;
break;
case AI_COMBAT:
if (_save->isStealthMission() && _save->getAlarmLevel() == 0 && _save->getGeoscapeSave()->getDifficulty() < 3)
{
action->type = _attackAction.type = BA_NONE;
action->finalAction = true;
}
else
{
action->type = _attackAction.type;
action->target = _attackAction.target;
// this may have changed to a grenade.
Expand Down Expand Up @@ -455,6 +462,7 @@ void AIModule::think(BattleAction *action)
{
action->kneel = _unit->getArmor()->allowsKneeling(false);
}
}
break;
case AI_AMBUSH:
_unit->setCharging(0);
Expand Down
1 change: 0 additions & 1 deletion src/Battlescape/ProjectileFlyBState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,6 @@ void ProjectileFlyBState::projectileHitUnit(Position pos)
{
ai->setWasHitBy(_unit);
_unit->setTurnsSinceSpotted(0);
_unit->setTurnsLeftSpottedForSnipers(std::max(victim->getSpotterDuration(), _unit->getTurnsLeftSpottedForSnipers()));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Battlescape/TileEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2532,7 +2532,7 @@ bool TileEngine::hitUnit(BattleActionAttack attack, BattleUnit *target, const Po
const int stunDamage = target->getStunlevel() - stunLevelOrig;

// hit log
if (attack.attacker)
if (attack.attacker && target->getVisible())
{
if (healthDamage > 0 || stunDamage > 0)
{
Expand Down