Skip to content

Commit

Permalink
Merge pull request #149 from ikonomov/firewall-damage
Browse files Browse the repository at this point in the history
Firewall damage
  • Loading branch information
ikonomov authored Sep 9, 2023
2 parents e8757d9 + 4956a30 commit 3d4f8ba
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ Note: You must be logged into GitHub to download the attachments.
* The 1/2 spell damage modifier in player versus player is applied to all missiles.
#### Spells:
* Chain Lightning creates a maximum of 3+slvl/4 number of bolts.
* Lightning, Chain Lightning, Fire Wall, Guardian, Elemental, Fireball and Flash do 1/2 of the original damage.
* Lightning, Chain Lightning, Guardian, Elemental, Fireball and Flash do 1/2 of the original damage.
* Fire Wall has 1/2 of the original duration.
* Information inside the spell book has been modified with more accurate values.
* Apocalypse only works on monsters within the line of sight.
* Stone Curse does not affect unique monsters.
Expand Down
7 changes: 3 additions & 4 deletions Source/missiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -835,8 +835,8 @@ void GetDamageAmt(SpellID i, int *mind, int *maxd)
case SpellID::FireWall:
case SpellID::LightningWall:
case SpellID::RingOfFire:
*mind = (myPlayer._pLevel + 2) * 5 / 4;
*maxd = (myPlayer._pLevel + 20) * 5 / 4;
*mind = (myPlayer._pLevel + 2) * 5 / 2;
*maxd = (myPlayer._pLevel + 20) * 5 / 2;
break;
case SpellID::Fireball:
case SpellID::RuneOfFire: {
Expand Down Expand Up @@ -1878,7 +1878,6 @@ void AddFireWall(Missile &missile, AddMissileParameter &parameter)
{
missile._midam = GenerateRndSum(10, 2) + 2;
missile._midam += missile._misource >= 0 ? Players[missile._misource]._pLevel : currlevel; // BUGFIX: missing parenthesis around ternary (fixed)
missile._midam /= 2;
missile._midam <<= 3;
UpdateMissileVelocity(missile, parameter.dst, 16);
int i = missile._mispllvl;
Expand All @@ -1887,7 +1886,7 @@ void AddFireWall(Missile &missile, AddMissileParameter &parameter)
missile._mirange *= i + 1;
if (missile._micaster == TARGET_PLAYERS || missile._misource < 0)
missile._mirange += currlevel;
missile._mirange *= 16;
missile._mirange *= 8;
missile.var1 = missile._mirange - missile._miAnimLen;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/pfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace devilution {
#define PASSWORD_SPAWN_SINGLE "adslhfb1"
#define PASSWORD_SPAWN_MULTI "lshbkfg1"
#define PASSWORD_SINGLE "xrgyrkj1"
#define PASSWORD_MULTI "kznb6dez"
#define PASSWORD_MULTI "xbodgt8k"

bool gbValidSaveFile;

Expand Down

0 comments on commit 3d4f8ba

Please sign in to comment.