mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-25 01:20:37 +00:00
limits/reduction/marking provided for the new orbs. Also fixed Revolver to top at 6
This commit is contained in:
parent
4a60fa52c8
commit
fc1ad02573
15
orbs.cpp
15
orbs.cpp
@ -136,6 +136,8 @@ void reduceOrbPowers() {
|
|||||||
reduceOrbPower(itOrbRecall, 77);
|
reduceOrbPower(itOrbRecall, 77);
|
||||||
reduceOrbPower(itOrbBull, 120);
|
reduceOrbPower(itOrbBull, 120);
|
||||||
reduceOrbPower(itOrbHorns, 77);
|
reduceOrbPower(itOrbHorns, 77);
|
||||||
|
reduceOrbPower(itOrbLava, 80);
|
||||||
|
reduceOrbPower(itOrbMorph, 80);
|
||||||
if(cwt.c->land != laWildWest)
|
if(cwt.c->land != laWildWest)
|
||||||
reduceOrbPower(itRevolver, 6);
|
reduceOrbPower(itRevolver, 6);
|
||||||
whirlwind::calcdirs(cwt.c);
|
whirlwind::calcdirs(cwt.c);
|
||||||
@ -1230,7 +1232,7 @@ eItem targetRangedOrb(cell *c, orbAction a) {
|
|||||||
int orbcharges(eItem it) {
|
int orbcharges(eItem it) {
|
||||||
switch(it) {
|
switch(it) {
|
||||||
case itRevolver: //pickup-key
|
case itRevolver: //pickup-key
|
||||||
return 6;
|
return 6 - items[itRevolver];
|
||||||
case itOrbShield:
|
case itOrbShield:
|
||||||
return inv::on ? 30 : 20;
|
return inv::on ? 30 : 20;
|
||||||
case itOrbDiscord:
|
case itOrbDiscord:
|
||||||
@ -1292,6 +1294,13 @@ int orbcharges(eItem it) {
|
|||||||
return sphere ? 3 : 30;
|
return sphere ? 3 : 30;
|
||||||
case itOrbDragon:
|
case itOrbDragon:
|
||||||
return sphere ? 10 : 77;
|
return sphere ? 10 : 77;
|
||||||
|
|
||||||
|
case itOrbMorph:
|
||||||
|
return 60;
|
||||||
|
|
||||||
|
case itOrbLava:
|
||||||
|
return 50;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1309,8 +1318,8 @@ void makelava(cell *c, int i) {
|
|||||||
if(!pseudohept(c)) return;
|
if(!pseudohept(c)) return;
|
||||||
if(isPlayerOn(c)) return;
|
if(isPlayerOn(c)) return;
|
||||||
if(c->wall == waFire && c->wparam < i)
|
if(c->wall == waFire && c->wparam < i)
|
||||||
c->wparam = i;
|
c->wparam = i, orbused[itOrbLava] = true;
|
||||||
else makeflame(c, i, false);
|
else if(makeflame(c, i, false)) orbused[itOrbLava] = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void orboflava(int i) {
|
void orboflava(int i) {
|
||||||
|
Loading…
Reference in New Issue
Block a user