Skip to content

Commit

Permalink
- More weapon damage tweaking :V
Browse files Browse the repository at this point in the history
  • Loading branch information
@LordMisfit
LordMisfit committed Nov 19, 2017
1 parent 167417f commit 414f0f6
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 14 deletions.
Binary file modified acs/spelllib.o
View file
Binary file not shown.
62 changes: 48 additions & 14 deletions scripts/SPELLSRC.acs
View file
Expand Up @@ -42611,6 +42611,7 @@ script "GetPlayerATKDMG" (int type, int puff)
// MiscellaneousVars[34] = Sorcery
// MiscellaneousVars[35] = Strength
// MiscellaneousVars[36] = Therapeusis
int baserand1, baserand2;
int damage, extradmg1, extradmg2, extradmg3, extradmg4, extradmg5, extradmg6, finaldmg;
int rand1, rand2;
int flagchecktype = 0;
Expand Down Expand Up @@ -42680,8 +42681,10 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 7) // Repeater
{
baserand1 = 1 + (MiscellaneousVars[10023] / 2);
baserand2 = 3 + MiscellaneousVars[10023] + ((MiscellaneousVars[10024] * 3) / 2);
perkfactor += ((MiscellaneousVars[10023] * 200) + (MiscellaneousVars[10024] * 1000));
damage = random(1,3) * 6; // 6 to 18
damage = random(baserand1,baserand2) * 6; // 6 to 18
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 3) / 2; // 150% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand All @@ -42690,8 +42693,10 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 8) // Rocket/Grenade [main hit]
{
baserand1 = 1 + MiscellaneousVars[10025];
baserand2 = 8 + (MiscellaneousVars[10025] / 2) + ((MiscellaneousVars[10026] * 5) / 4);
perkfactor += ((MiscellaneousVars[10025] * random(700,1400)) + (MiscellaneousVars[10026] * random(1100,2200)));
damage = random((1 + MiscellaneousVars[10025]),(8 + (MiscellaneousVars[10025]/2) + ((MiscellaneousVars[10026]*5)/4)) ) * 20; // 20 to 160
damage = random(baserand1,baserand2) * 20; // 20 to 160
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 5) / 2; // 250% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand All @@ -42711,7 +42716,7 @@ script "GetPlayerATKDMG" (int type, int puff)
if (type == 10) // Repeater [explosion]
{
perkfactor += ((MiscellaneousVars[10023] * 200) + (MiscellaneousVars[10024] * 1000));
damage = 7; // 7
damage = 7 + (MiscellaneousVars[10023] * 4) + (MiscellaneousVars[10024] * 10); // 7
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 1) / 5; // 20% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand All @@ -42720,8 +42725,10 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 11) // Plasma
{
baserand1 = 1 + MiscellaneousVars[10023];
baserand2 = 8 + (MiscellaneousVars[10023] / 2) + ((MiscellaneousVars[10024] * 5) / 4);
perkfactor += ((MiscellaneousVars[10023] * 200) + (MiscellaneousVars[10024] * 1000));
damage = random(1,8) * 5; // 5 to 40
damage = random(baserand1,baserand2) * 5; // 5 to 40
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 15) / 16; // 93.34% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand All @@ -42730,9 +42737,11 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 12) // Plasma1 [BFG2704]
{
baserand1 = 1 + MiscellaneousVars[10023];
baserand2 = 8 + (MiscellaneousVars[10023] / 2) + ((MiscellaneousVars[10024] * 5) / 4);
perkfactor += ((MiscellaneousVars[10023] * 200) + (MiscellaneousVars[10024] * 1000));
perkfactor += ((MiscellaneousVars[10029] * 250) + (MiscellaneousVars[10030] * 1250));
damage = random(1,8) * 4; // 4 to 32
damage = random(baserand1,baserand2) * 4; // 4 to 32
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 1); // 100% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand All @@ -42741,9 +42750,11 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 13) // Plasma2 [BFG2704]
{
baserand1 = 1 + MiscellaneousVars[10023];
baserand2 = 8 + (MiscellaneousVars[10023] / 2) + ((MiscellaneousVars[10024] * 5) / 4);
perkfactor += ((MiscellaneousVars[10023] * 200) + (MiscellaneousVars[10024] * 1000));
perkfactor += ((MiscellaneousVars[10029] * 250) + (MiscellaneousVars[10030] * 1250));
damage = random(1,8) * 4; // 4 to 32
damage = random(baserand1,baserand2) * 4; // 4 to 32
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 11) / 10; // 110% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand All @@ -42752,9 +42763,15 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 14) // BFG [Main]
{
damage = random(1,8) * 100; // 100 to 800
if (MiscellaneousVars[10029] == 1) damage = random(4,17) * 50; // 200 to 850
if (MiscellaneousVars[10029] == 2) damage = random(8,20) * 50; // 400 to 1000
baserand1 = (MiscellaneousVars[10023] * 2);
if (MiscellaneousVars[10029] <= 0) baserand1 += 2;
if (MiscellaneousVars[10029] == 1) baserand1 += 4;
if (MiscellaneousVars[10029] >= 2) baserand1 += 8;
baserand2 = MiscellaneousVars[10023] + ((MiscellaneousVars[10024] * 3) / 2);
if (MiscellaneousVars[10029] <= 0) baserand2 += 16;
if (MiscellaneousVars[10029] == 1) baserand2 += 17;
if (MiscellaneousVars[10029] >= 2) baserand2 += 20;
damage = random(baserand1,baserand2) * 50; // 100 to 800
extradmg1 = (MiscellaneousVars[31] * 11); // 1100% of Agility
if (MiscellaneousVars[10029] == 1) extradmg1 = (MiscellaneousVars[31] * 12); // 1200% of Agility
if (MiscellaneousVars[10029] == 2) extradmg1 = (MiscellaneousVars[31] * 15); // 1500% of Agility
Expand All @@ -42764,6 +42781,19 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 15) // BFG [Tracer]
{
baserand1 = ((MiscellaneousVars[10023] * 3) / 2);
if (MiscellaneousVars[10029] <= 0) baserand1 += 1;
if (MiscellaneousVars[10029] == 1) baserand1 += 2;
if (MiscellaneousVars[10029] >= 2) baserand1 += 3;
baserand2 = ((MiscellaneousVars[10023] * 3) / 4) + ((MiscellaneousVars[10024] * 11) / 8);
if (MiscellaneousVars[10029] <= 0) baserand2 += 8;
if (MiscellaneousVars[10029] == 1) baserand2 += 9;
if (MiscellaneousVars[10029] >= 2) baserand2 += 10;

damage = random(baserand1,baserand2) + 15; // 100 to 800
if (MiscellaneousVars[10029] == 1) damage = random(baserand1,baserand2) + 18; // 20 to 37
if (MiscellaneousVars[10029] == 2) damage = random(baserand1,baserand2) + 22; // 25 to 32

damage = random(1,8) + 15; // 16 to 23
if (MiscellaneousVars[10029] == 1) damage = random(2,9) + 18; // 20 to 27
if (MiscellaneousVars[10029] == 2) damage = random(3,10) + 22; // 25 to 32
Expand All @@ -42776,8 +42806,10 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 16) // KSawBolt
{
baserand1 = 1 + MiscellaneousVars[10023];
baserand2 = 8 + (MiscellaneousVars[10023] / 2) + ((MiscellaneousVars[10024] * 5) / 4);
perkfactor = 10000 + ((MiscellaneousVars[10027] * 2500) + (MiscellaneousVars[10028] * 3750));
damage = random(1,8) * 12; // 12 to 96
damage = random(baserand1,baserand2) * 12; // 12 to 96
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 11) / 5; // 220% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand All @@ -42786,8 +42818,10 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 17) // KSawBolt
{
baserand1 = 1 + MiscellaneousVars[10023];
baserand2 = 8 + (MiscellaneousVars[10023] / 2) + ((MiscellaneousVars[10024] * 5) / 4);
perkfactor = 10000 + ((MiscellaneousVars[10027] * 2500) + (MiscellaneousVars[10028] * 3750));
damage = random(1,8) * 12; // 12 to 96
damage = random(baserand1,baserand2) * 12; // 12 to 96
damage = damage * perkfactor / 10000;
extradmg1 = (MiscellaneousVars[31] * 11) / 5; // 220% of Agility
extradmg1 = extradmg1 * perkfactor / 10000;
Expand Down Expand Up @@ -42875,12 +42909,12 @@ script "GetPlayerATKDMG" (int type, int puff)
}
if (type == 24) // RipperNew [HERETIC]
{
// perkfactor += 0;
perkfactor += ((MiscellaneousVars[10053] * 1000) + (MiscellaneousVars[10054] * 4000));
damage = 1 * random(1,8);
damage = damage * perkfactor / 10000;
extradmg1 = ((MiscellaneousVars[34] / 16) * random(1,8)); // 6.7% of Sorcery
extradmg1 = ((MiscellaneousVars[34] / 8) * random(1,8)); // 12.5% of Sorcery
extradmg1 = extradmg1 * perkfactor / 10000;
extradmg2 = ((MiscellaneousVars[36] / 64) * random(1,8)); // 1.67% of Therapeusis
extradmg2 = ((MiscellaneousVars[36] / 32) * random(1,8)); // 3.25% of Therapeusis
extradmg2 = extradmg2 * perkfactor / 10000;
}
if (type == 25) // ElectricBoltNew [STRIFE]
Expand Down

0 comments on commit 414f0f6

Please sign in to comment.