mirror/fallout2-ce
1
0
Fork 0
mirror of https://github.com/alexbatalov/fallout2-ce.git synced 2024-09-03 13:29:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review isWithinPerception

Browse Source
This commit is contained in:
Alexander Batalov 2022-10-05 14:25:36 +03:00
parent 56d798dd12
commit db57fe6a5e
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/combat_ai.cc
View File

@ -1570,7 +1570,7 @@ static Object* _ai_danger_source(Object* a1)
for (int index = 0; index < 4; index++) { for (int index = 0; index < 4; index++) {
Object* candidate = targets[index]; Object* candidate = targets[index];
if (candidate != NULL && objectCanHearObject(a1, candidate)) { if (candidate != NULL && isWithinPerception(a1, candidate)) {
if (pathfinderFindPath(a1, a1->tile, candidate->tile, NULL, 0, _obj_blocking_at) != 0 if (pathfinderFindPath(a1, a1->tile, candidate->tile, NULL, 0, _obj_blocking_at) != 0
|| _combat_check_bad_shot(a1, candidate, HIT_MODE_RIGHT_WEAPON_PRIMARY, false) == COMBAT_BAD_SHOT_OK) { || _combat_check_bad_shot(a1, candidate, HIT_MODE_RIGHT_WEAPON_PRIMARY, false) == COMBAT_BAD_SHOT_OK) {
return candidate; return candidate;
@ -3088,7 +3088,7 @@ bool _combatai_want_to_stop(Object* a1)
} }
Object* v4 = _ai_danger_source(a1); Object* v4 = _ai_danger_source(a1);
return v4 == NULL || !objectCanHearObject(a1, v4); return v4 == NULL || !isWithinPerception(a1, v4);
} }
// 0x42B504 // 0x42B504
@ -3360,7 +3360,7 @@ int _combatai_check_retaliation(Object* a1, Object* a2)
} }
// 0x42BA04 // 0x42BA04
bool objectCanHearObject(Object* a1, Object* a2) bool isWithinPerception(Object* a1, Object* a2)
{ {
if (a2 == NULL) { if (a2 == NULL) {
return false; return false;
@ -3370,46 +3370,46 @@ bool objectCanHearObject(Object* a1, Object* a2)
int perception = critterGetStat(a1, STAT_PERCEPTION); int perception = critterGetStat(a1, STAT_PERCEPTION);
int sneak = skillGetValue(a2, SKILL_SNEAK); int sneak = skillGetValue(a2, SKILL_SNEAK);
if (_can_see(a1, a2)) { if (_can_see(a1, a2)) {
int v8 = perception * 5; int maxDistance = perception * 5;
if ((a2->flags & OBJECT_TRANS_GLASS) != 0) { if ((a2->flags & OBJECT_TRANS_GLASS) != 0) {
v8 /= 2; maxDistance /= 2;
} }
if (a2 == gDude) { if (a2 == gDude) {
if (dudeIsSneaking()) { if (dudeIsSneaking()) {
v8 /= 4; maxDistance /= 4;
if (sneak > 120) { if (sneak > 120) {
v8 -= 1; maxDistance -= 1;
} }
} else if (dudeHasState(0)) { } else if (dudeHasState(DUDE_STATE_SNEAKING)) {
v8 = v8 * 2 / 3; maxDistance = maxDistance * 2 / 3;
} }
} }
if (distance <= v8) { if (distance <= maxDistance) {
return true; return true;
} }
} }
int v12; int maxDistance;
if (isInCombat()) { if (isInCombat()) {
v12 = perception * 2; maxDistance = perception * 2;
} else { } else {
v12 = perception; maxDistance = perception;
} }
if (a2 == gDude) { if (a2 == gDude) {
if (dudeIsSneaking()) { if (dudeIsSneaking()) {
v12 /= 4; maxDistance /= 4;
if (sneak > 120) { if (sneak > 120) {
v12 -= 1; maxDistance -= 1;
} }
} else if (dudeHasState(0)) { } else if (dudeHasState(DUDE_STATE_SNEAKING)) {
v12 = v12 * 2 / 3; maxDistance = maxDistance * 2 / 3;
} }
} }
if (distance <= v12) { if (distance <= maxDistance) {
return true; return true;
} }
@ -3480,10 +3480,10 @@ void _combatai_notify_onlookers(Object* a1)
for (int index = 0; index < _curr_crit_num; index++) { for (int index = 0; index < _curr_crit_num; index++) {
Object* obj = _curr_crit_list[index]; Object* obj = _curr_crit_list[index];
if ((obj->data.critter.combat.maneuver & CRITTER_MANEUVER_0x01) == 0) { if ((obj->data.critter.combat.maneuver & CRITTER_MANEUVER_0x01) == 0) {
if (objectCanHearObject(obj, a1)) { if (isWithinPerception(obj, a1)) {
obj->data.critter.combat.maneuver |= CRITTER_MANEUVER_0x01; obj->data.critter.combat.maneuver |= CRITTER_MANEUVER_0x01;
if ((a1->data.critter.combat.results & DAM_DEAD) != 0) { if ((a1->data.critter.combat.results & DAM_DEAD) != 0) {
if (!objectCanHearObject(obj, obj->data.critter.combat.whoHitMe)) { if (!isWithinPerception(obj, obj->data.critter.combat.whoHitMe)) {
debugPrint("\nSomebody Died and I don't know why! Run!!!"); debugPrint("\nSomebody Died and I don't know why! Run!!!");
aiInfoSetFriendlyDead(obj, a1); aiInfoSetFriendlyDead(obj, a1);
} }
@ -3501,7 +3501,7 @@ void _combatai_notify_friends(Object* a1)
for (int index = 0; index < _curr_crit_num; index++) { for (int index = 0; index < _curr_crit_num; index++) {
Object* obj = _curr_crit_list[index]; Object* obj = _curr_crit_list[index];
if ((obj->data.critter.combat.maneuver & CRITTER_MANEUVER_0x01) == 0 && team == obj->data.critter.combat.team) { if ((obj->data.critter.combat.maneuver & CRITTER_MANEUVER_0x01) == 0 && team == obj->data.critter.combat.team) {
if (objectCanHearObject(obj, a1)) { if (isWithinPerception(obj, a1)) {
obj->data.critter.combat.maneuver |= CRITTER_MANEUVER_0x01; obj->data.critter.combat.maneuver |= CRITTER_MANEUVER_0x01;
} }
} }

2
src/combat_ai.h
View File

@ -62,7 +62,7 @@ int critterSetAiPacket(Object* object, int aiPacket);
int _combatai_msg(Object* a1, Attack* attack, int a3, int a4); int _combatai_msg(Object* a1, Attack* attack, int a3, int a4);
Object* _combat_ai_random_target(Attack* attack); Object* _combat_ai_random_target(Attack* attack);
int _combatai_check_retaliation(Object* a1, Object* a2); int _combatai_check_retaliation(Object* a1, Object* a2);
bool objectCanHearObject(Object* a1, Object* a2); bool isWithinPerception(Object* a1, Object* a2);
void aiMessageListReloadIfNeeded(); void aiMessageListReloadIfNeeded();
void _combatai_notify_onlookers(Object* a1); void _combatai_notify_onlookers(Object* a1);
void _combatai_notify_friends(Object* a1); void _combatai_notify_friends(Object* a1);

4
src/interpreter_extra.cc
View File

@ -1839,7 +1839,7 @@ static void opObjectCanSeeObject(Program* program)
critterGetStat(object1, STAT_PERCEPTION); critterGetStat(object1, STAT_PERCEPTION);
if (objectCanHearObject(object1, object2)) { if (isWithinPerception(object1, object2)) {
Object* a5; Object* a5;
_make_straight_path(object1, object1->tile, object2->tile, NULL, &a5, 16); _make_straight_path(object1, object1->tile, object2->tile, NULL, &a5, 16);
if (a5 == object2) { if (a5 == object2) {
@ -2627,7 +2627,7 @@ static void opObjectCanHearObject(Program* program)
if (object2 == NULL || object1 == NULL) { if (object2 == NULL || object1 == NULL) {
if (object2->elevation == object1->elevation) { if (object2->elevation == object1->elevation) {
if (object2->tile != -1 && object1->tile != -1) { if (object2->tile != -1 && object1->tile != -1) {
if (objectCanHearObject(object2, object1)) { if (isWithinPerception(object2, object1)) {
canHear = true; canHear = true;
} }
} }