dual:: movement orbs are replaced with Speed
This commit is contained in:
parent
f16f5e0f7e
commit
b7daf93f2e
6
game.cpp
6
game.cpp
|
@ -6967,7 +6967,7 @@ bool collectItem(cell *c2, bool telekinesis) {
|
||||||
}
|
}
|
||||||
else if(orbcharges(c2->item)) {
|
else if(orbcharges(c2->item)) {
|
||||||
eItem it = c2->item;
|
eItem it = c2->item;
|
||||||
if(it == itOrbRecall) {
|
if(it == itOrbRecall && !dual::state) {
|
||||||
cellwalker cw2 = cwt;
|
cellwalker cw2 = cwt;
|
||||||
cw2++;
|
cw2++;
|
||||||
cw2.at = c2;
|
cw2.at = c2;
|
||||||
|
@ -6981,6 +6981,10 @@ bool collectItem(cell *c2, bool telekinesis) {
|
||||||
else playSound(c2, "pickup-orb");
|
else playSound(c2, "pickup-orb");
|
||||||
if(items[itOrbChoice]) items[itOrbChoice] = 0, had_choice = true;
|
if(items[itOrbChoice]) items[itOrbChoice] = 0, had_choice = true;
|
||||||
int oc = orbcharges(it);
|
int oc = orbcharges(it);
|
||||||
|
if(dual::state && among(it, itOrbTeleport, itOrbFrog, itOrbPhasing, itOrbDash, itOrbRecall)) {
|
||||||
|
oc = 10;
|
||||||
|
it = itOrbSpeed;
|
||||||
|
}
|
||||||
if(c2->land == laAsteroids) oc = 10;
|
if(c2->land == laAsteroids) oc = 10;
|
||||||
if(markOrb(itOrbIntensity)) oc = oc * 6 / 5;
|
if(markOrb(itOrbIntensity)) oc = oc * 6 / 5;
|
||||||
if(!items[it]) items[it]++;
|
if(!items[it]) items[it]++;
|
||||||
|
|
Loading…
Reference in New Issue