Ben's AI spell fixes #224
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,294 @@ | ||
| #include "combat/combat.h" | ||
|
|
||
| float heuristicModifierForDuration[] = { | ||
| 0.0, | ||
| 0.5, | ||
| 0.65, | ||
| 0.78, | ||
| 0.85, | ||
| 0.95, | ||
| 1.03, | ||
| 1.08, | ||
| 1.12, | ||
| 1.15, | ||
| 1.18 | ||
| }; | ||
|
|
||
| float durationBenefit[] = { | ||
| 0.0, | ||
| 0.33, | ||
| 0.55, | ||
| 0.72, | ||
| 0.85, | ||
| 0.95, | ||
| 1.03, | ||
| 1.08, | ||
| 1.12, | ||
| 1.15, | ||
| 1.18 | ||
| }; | ||
|
|
||
| void combatManager::DetermineEffectOfSpell(int spell, int *value, int *target) { | ||
| *value = 0; | ||
| AI_SPELL_TYPES aiSpellType; | ||
| int targetSide = 0; | ||
|
|
||
| switch(spell) { | ||
| case SPELL_MASS_SLOW: | ||
| case SPELL_MASS_CURSE: | ||
| aiSpellType = AI_MASS_DEBUFF_SPELL; | ||
| targetSide = 1 - this->currentActionSide; | ||
| break; | ||
| case SPELL_SLOW: | ||
| case SPELL_CURSE: | ||
| aiSpellType = AI_TARGET_DAMAGE_OR_DEBUFF_SPELL; | ||
| targetSide = 1 - this->currentActionSide; | ||
| default: | ||
| this->DetermineEffectOfSpell_orig(spell, value, target); | ||
| return; | ||
| } | ||
|
|
||
| int targetHex = 0; | ||
| int hex = 1; | ||
|
|
||
| if(aiSpellType == AI_TARGET_BUFF_SPELL | ||
| || aiSpellType == AI_TARGET_DAMAGE_OR_DEBUFF_SPELL | ||
| || aiSpellType == AI_MASS_DEBUFF_SPELL | ||
| || aiSpellType == AI_MASS_BUFF_SPELL | ||
|
Owner
There was a problem hiding this comment. As written, only AI_MASS_DEBUFF_SPELL will reach this line. What's with the rest of this? |
||
| || aiSpellType == AI_DISPEL_SPELL) | ||
| targetHex = this->FirstArmy(1, targetSide, &hex); | ||
|
|
||
| bool targSpentTurn = 1; | ||
| float durBenefit = 1.0; | ||
| while(true) { | ||
| if(!targetHex) { | ||
| bool incapacitated = false; | ||
| bool underMyControl = false; | ||
| army *potTarg = nullptr; | ||
|
|
||
| if(this->combatGrid[hex].stackIdx < 0 || this->combatGrid[hex].unitOwner < 0) { | ||
| potTarg = 0; | ||
| } else { | ||
| potTarg = &this->creatures[this->combatGrid[hex].unitOwner][this->combatGrid[hex].stackIdx]; | ||
| giCurrSpellGroup = this->combatGrid[hex].unitOwner; | ||
| targSpentTurn = (potTarg->creature.creature_flags & MAYBE_NOT_LOST_TURN) != 0; | ||
| int duration = this->heroSpellpowers[this->currentActionSide]; | ||
| if(this->heroes[this->currentActionSide]->HasArtifact(ARTIFACT_ENCHANTED_HOURGLASS)) | ||
| duration += 2; | ||
| if(this->heroes[this->currentActionSide]->HasArtifact(ARTIFACT_WIZARDS_HAT)) | ||
| duration += 10; | ||
| int durationBenefitIdx = duration - targSpentTurn; | ||
| if(duration - targSpentTurn >= 10) | ||
| durationBenefitIdx = 10; | ||
| durBenefit = durationBenefit[durationBenefitIdx]; | ||
| if(potTarg->effectStrengths[EFFECT_HYPNOTIZE] || potTarg->effectStrengths[EFFECT_BERSERKER]) | ||
| underMyControl = true; | ||
| if(potTarg->effectStrengths[EFFECT_BLIND] || potTarg->effectStrengths[EFFECT_PARALYZE] || potTarg->effectStrengths[EFFECT_PETRIFY]) | ||
| incapacitated = true; | ||
| } | ||
|
|
||
| int effectValue = 0; | ||
| switch(spell) { | ||
| case SPELL_SLOW: | ||
| case SPELL_MASS_SLOW: | ||
| if(!incapacitated) { | ||
| if(!underMyControl) { | ||
| if(!potTarg->effectStrengths[EFFECT_SLOW]) { | ||
| effectValue = -this->RawEffectSpellInfluence(potTarg, EFFECT_SLOW) * durBenefit; | ||
| if(potTarg->effectStrengths[EFFECT_HASTE]) { | ||
| int durModifierIdx = targSpentTurn + potTarg->effectStrengths[EFFECT_HASTE]; | ||
| if(durModifierIdx >= 10) | ||
| durModifierIdx = 10; | ||
|
|
||
| effectValue += this->RawEffectSpellInfluence(potTarg, EFFECT_HASTE) * heuristicModifierForDuration[durModifierIdx]; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| break; | ||
| case SPELL_CURSE: | ||
| case SPELL_MASS_CURSE: | ||
| if(!incapacitated) { | ||
| if(!underMyControl) { | ||
| if(!potTarg->effectStrengths[EFFECT_CURSE]) { | ||
| effectValue = -this->RawEffectSpellInfluence(potTarg, EFFECT_CURSE) * durBenefit; | ||
| if(potTarg->effectStrengths[EFFECT_BLESS]) { | ||
| int durModifierIdx = targSpentTurn + potTarg->effectStrengths[EFFECT_BLESS]; | ||
| if(durModifierIdx >= 10) | ||
| durModifierIdx = 10; | ||
| effectValue += this->RawEffectSpellInfluence(potTarg, EFFECT_BLESS) * heuristicModifierForDuration[durModifierIdx]; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| break; | ||
| default: | ||
| *value = 0; | ||
| break; | ||
| } | ||
|
|
||
| int finalEffectValue = 0; | ||
| switch(aiSpellType) { | ||
| case AI_MASS_BUFF_SPELL: | ||
| case AI_MASS_DEBUFF_SPELL: | ||
| finalEffectValue += effectValue; | ||
| break; | ||
| case AI_BATTLEFIELD_AFFECTING_SPELL: | ||
| case AI_BALL_SPALL: | ||
| case AI_TARGET_BUFF_SPELL: | ||
| case AI_TARGET_DAMAGE_OR_DEBUFF_SPELL: | ||
| case AI_RESURRECT_SPELL: | ||
| case AI_DISPEL_SPELL: | ||
| finalEffectValue = effectValue; | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
|
|
||
| if(aiSpellType == AI_MASS_BUFF_SPELL || aiSpellType == AI_MASS_DEBUFF_SPELL || *value < finalEffectValue) { | ||
| *value = finalEffectValue; | ||
| *target = hex; | ||
| } | ||
|
|
||
| switch(aiSpellType) { | ||
| case AI_BATTLEFIELD_AFFECTING_SPELL: | ||
| targetHex = 1; | ||
| break; | ||
| case AI_MASS_BUFF_SPELL: | ||
| case AI_MASS_DEBUFF_SPELL: | ||
| case AI_TARGET_BUFF_SPELL: | ||
| case AI_TARGET_DAMAGE_OR_DEBUFF_SPELL: | ||
| case AI_DISPEL_SPELL: | ||
| targetHex = this->FirstArmy(hex + 1, targetSide, &hex); | ||
| break; | ||
| case AI_RESURRECT_SPELL: | ||
| targetHex = this->FirstResurrectable(hex + 1, &hex, spell); | ||
| break; | ||
| case AI_BALL_SPALL: | ||
| this->NextPos(&hex); | ||
| if(hex > 43) | ||
|
Collaborator
Author
There was a problem hiding this comment. for area spells: fireball, fireblast, meteorshower and coldring
Owner
There was a problem hiding this comment. No, I mean: what's special about hex 43? |
||
| targetHex = 1; | ||
| break; | ||
| } | ||
| continue; | ||
| } | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| int combatManager::RawEffectSpellInfluence(army *stack, int eff) { | ||
|
Owner
There was a problem hiding this comment. The argument should be STACK_MODIFYING_EFFECT, not int. |
||
| double chance = stack->SpellCastWorkChance(giSpellInfluenceToSpell[eff]); | ||
| if(chance < 0.0001) { | ||
| return 0; | ||
| } | ||
|
|
||
| int preResult; | ||
| int fightValue = stack->quantity * stack->creature.fight_value; | ||
| int owningSide = stack->owningSide; | ||
| int otherSide = 1 - owningSide; | ||
| switch(eff) { | ||
| case EFFECT_SLOW: | ||
| case EFFECT_HASTE: | ||
| { | ||
| int speedWithEffect; | ||
| if(eff == EFFECT_SLOW) | ||
| speedWithEffect = (stack->creature.speed + 1) >> 1; | ||
| else | ||
| speedWithEffect = stack->creature.speed + 2; | ||
|
|
||
| if(eff == EFFECT_HASTE && stack->creature.creature_flags & FLYER) | ||
| return 0; | ||
|
|
||
| if(this->isCastleBattle && owningSide == 1) | ||
| return 0; | ||
|
|
||
| if(stack->creature.creature_flags & SHOOTER) | ||
| return 0; | ||
|
|
||
| if(stack->GetAttackMask(stack->occupiedHex, 1, -1) == 255) { | ||
| int hexXCoord = stack->occupiedHex % 13; | ||
| int distFromOptimalColumn; | ||
| if(!this->currentActionSide) | ||
|
There was a problem hiding this comment. Здесь должно быть: |
||
| distFromOptimalColumn = 10 - hexXCoord; | ||
| else | ||
| distFromOptimalColumn = hexXCoord - 2; | ||
| if(distFromOptimalColumn < 0) | ||
| distFromOptimalColumn = 0; | ||
|
|
||
|
|
||
| int adjustedDistFromOtherSide = distFromOptimalColumn + 2; | ||
| if(this->isCastleBattle) | ||
| adjustedDistFromOtherSide += 3; | ||
| double currentTurnsToOtherSide; | ||
| if(stack->creature.creature_flags & FLYER) | ||
| currentTurnsToOtherSide = 1.0; | ||
| else | ||
| currentTurnsToOtherSide = adjustedDistFromOtherSide / stack->creature.speed; | ||
|
|
||
| double turnsToOtherSideAfterCast = adjustedDistFromOtherSide / speedWithEffect; | ||
| if(turnsToOtherSideAfterCast > 7.0) | ||
| turnsToOtherSideAfterCast = 7.0; | ||
| if(currentTurnsToOtherSide > 7.0) | ||
| currentTurnsToOtherSide = 7.0; | ||
| preResult = (currentTurnsToOtherSide - turnsToOtherSideAfterCast) / 10.0 * fightValue; | ||
| } else | ||
| return 0; | ||
| break; | ||
| } | ||
| case EFFECT_BLESS: | ||
| case EFFECT_CURSE: { | ||
| double avgDamage = (stack->creature.min_damage + stack->creature.max_damage) * 0.5; | ||
| preResult = (avgDamage - stack->creature.min_damage) / stack->creature.min_damage * fightValue * 0.45; | ||
| if(eff == EFFECT_CURSE) | ||
| preResult = -preResult; | ||
| break; | ||
| } | ||
| case EFFECT_DRAGON_SLAYER: { | ||
| bool hasAdjacentDragons = false; | ||
| int numDragons = 0; | ||
|
|
||
| for(int i = 0; this->numCreatures[otherSide] > i; ++i) { | ||
| army* cr = &this->creatures[otherSide][i]; | ||
| int creatureIdx = cr->creatureIdx; | ||
| if(creatureIdx == CREATURE_GREEN_DRAGON | ||
| || creatureIdx == CREATURE_RED_DRAGON | ||
| || creatureIdx == CREATURE_BLACK_DRAGON | ||
| || creatureIdx == CREATURE_BONE_DRAGON) { | ||
| numDragons++; | ||
| if(stack->OtherArmyAdjacent(otherSide, cr->stackIdx)) | ||
|
There was a problem hiding this comment. Да, 1-owningSide и otherSide - одно и то же |
||
| hasAdjacentDragons = true; | ||
| } | ||
| } | ||
| double dragonsVal; | ||
| if(hasAdjacentDragons) | ||
| dragonsVal = 1.0; | ||
| else | ||
| dragonsVal = numDragons / this->numCreatures[otherSide]; | ||
|
Owner
There was a problem hiding this comment. This will basically always return 0. Should it be this way? There was a problem hiding this comment. fightValue multiplier is missing, sorry. My last comment concerned raw 211 (if(!(stack->owningSide)) instead of if(!this->currentActionSide)) |
||
| preResult = 0.28 * dragonsVal; | ||
|
Owner
There was a problem hiding this comment. dragonsVal cannot be higher than 1. Therefore preResult cannot be higher than 0.28. preResult gets rounded to an int, i.e.: 0. Therefore: The effect of dragon slayer is always 0 and the AI never casts it. Is this right?
Owner
There was a problem hiding this comment. BTW, looking at the decompiled code, this problem seems to have already been there. |
||
| break; | ||
| } | ||
| case EFFECT_SHIELD: { | ||
| int numShooters = 0; | ||
| for(int j = 0; this->numCreatures[otherSide] > j; ++j) { | ||
| if(this->creatures[otherSide][j].creature.creature_flags & SHOOTER) | ||
|
There was a problem hiding this comment. Да, otherSide и 1-owningSide - то же самое :) |
||
| numShooters++; | ||
| } | ||
| double shooterVal = numShooters / this->numCreatures[otherSide]; | ||
|
Owner
There was a problem hiding this comment. This does integer division. It will basically always be zero. Is it supposed to be this way? |
||
| if(!owningSide && this->isCastleBattle) { | ||
| shooterVal += 0.3; | ||
| if(shooterVal > 1.0) | ||
| shooterVal = 1.0; | ||
| } | ||
| preResult = 0.45 * shooterVal; | ||
| break; | ||
| } | ||
| default: | ||
| return this->RawEffectSpellInfluence_orig(stack, eff); | ||
| } | ||
|
|
||
| if(stack->effectStrengths[EFFECT_BERSERKER] || stack->effectStrengths[EFFECT_HYPNOTIZE]) { | ||
| if(eff != EFFECT_ANTI_MAGIC) | ||
| return 0; | ||
| } | ||
| return preResult * chance; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1827,4 +1827,5 @@ int combatManager::ViewSpells(int unused) { | |
| return 0; | ||
| return 1; | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should there be a break here?