Start at 5000, rebalance scrambles

This commit is contained in:
TehRealSalt 2019-10-03 11:36:35 -04:00
parent d10e4aebac
commit bcd142c2a0
2 changed files with 23 additions and 12 deletions

View file

@ -133,30 +133,37 @@ void K_SetPowerLevelScrambles(SINT8 powertype)
min = clientpowerlevels[i][0]; min = clientpowerlevels[i][0];
} }
if (min >= 6000) if (min >= 7800)
{ {
if (avg >= 8000) if (avg >= 8200)
t = 5;
else
t = 4;
}
else if (min >= 6800)
{
if (avg >= 7200)
t = 4; t = 4;
else else
t = 3; t = 3;
} }
else if (min >= 4000) else if (min >= 5800)
{ {
if (avg >= 5000) if (avg >= 6200)
t = 3; t = 3;
else else
t = 2; t = 2;
} }
else if (min >= 2500) else if (min >= 3800)
{ {
if (avg >= 3000) if (avg >= 4200)
t = 2; t = 2;
else else
t = 1; t = 1;
} }
else if (min >= 500) else if (min >= 1800)
{ {
if (avg >= 2000) if (avg >= 2200)
t = 1; t = 1;
else else
t = 0; t = 0;
@ -166,18 +173,22 @@ void K_SetPowerLevelScrambles(SINT8 powertype)
switch (t) switch (t)
{ {
case 4: case 5:
speed = 2; speed = 2;
encore = true; encore = true;
break; break;
case 3: case 4:
speed = M_RandomChance((7<<FRACBITS)/10) ? 2 : 1; speed = M_RandomChance((7<<FRACBITS)/10) ? 2 : 1;
encore = M_RandomChance(FRACUNIT>>1); encore = M_RandomChance(FRACUNIT>>1);
break; break;
case 2: case 3:
speed = M_RandomChance((3<<FRACBITS)/10) ? 2 : 1; speed = M_RandomChance((3<<FRACBITS)/10) ? 2 : 1;
encore = M_RandomChance(FRACUNIT>>2); encore = M_RandomChance(FRACUNIT>>2);
break; break;
case 2:
speed = 1;
encore = M_RandomChance(FRACUNIT>>3);
break;
case 1: default: case 1: default:
speed = 1; speed = 1;
encore = false; encore = false;

View file

@ -9,7 +9,7 @@
#define PWRLV_BATTLE 1 #define PWRLV_BATTLE 1
#define PWRLV_NUMTYPES 2 #define PWRLV_NUMTYPES 2
#define PWRLVRECORD_START 1000 #define PWRLVRECORD_START 5000 //1000
#define PWRLVRECORD_DEF 5000 #define PWRLVRECORD_DEF 5000
#define PWRLVRECORD_MIN 1 #define PWRLVRECORD_MIN 1
#define PWRLVRECORD_MAX 9999 #define PWRLVRECORD_MAX 9999