mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 01:50:36 +00:00
Code Issues Releases Wiki Activity

fixed mousing over items with Energy+Time+Space combo

Browse Source
This commit is contained in:
Zeno Rogue 2022-09-09 12:21:55 +02:00
parent 613672b662
commit 852c637e4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
orbs.cpp
View File

@ -39,13 +39,13 @@ EX bool markOrb2(eItem it) {
return items[it] > 1; */ return items[it] > 1; */
} }
EX int fixpower(int qty) { EX int fixpower(int qty, bool checking) {
if(markOrb(itOrbEnergy)) qty = (qty+1)/2; if(checking ? items[itOrbEnergy] : markOrb(itOrbEnergy)) qty = (qty+1)/2;
return qty; return qty;
} }
EX void useupOrb(eItem it, int qty) { EX void useupOrb(eItem it, int qty) {
items[it] -= fixpower(qty); items[it] -= fixpower(qty, false);
if(items[it] < 0) items[it] = 0; if(items[it] < 0) items[it] = 0;
} }
@ -1332,7 +1332,7 @@ EX eItem targetRangedOrb(cell *c, orbAction a) {
&& CHK(c->item && !itemHiddenFromSight(c), XLAT("%The1 can only be used on items!", itOrbSpace)) && CHK(c->item && !itemHiddenFromSight(c), XLAT("%The1 can only be used on items!", itOrbSpace))
&& CHK(!cwt.at->item, XLAT("Cannot use %the1 here!", itOrbSpace)) && CHK(!cwt.at->item, XLAT("Cannot use %the1 here!", itOrbSpace))
&& CHK(!saved_tortoise_on(c), XLAT("No, that would be heartless!")) && CHK(!saved_tortoise_on(c), XLAT("No, that would be heartless!"))
&& CHK(items[itOrbSpace] >= fixpower(spacedrain(c).first), XLAT("Not enough power for telekinesis!")) && CHK(items[itOrbSpace] >= fixpower(spacedrain(c).first, isCheck(a)), XLAT("Not enough power for telekinesis!"))
&& CHK(!cantGetGrimoire(c, !isCheck(a)), XLAT("Cannot use %the1 here!", itOrbSpace)) && CHK(!cantGetGrimoire(c, !isCheck(a)), XLAT("Cannot use %the1 here!", itOrbSpace))
&& CHK(c->item != itBarrow, XLAT("%The1 is protected from this kind of magic!", c->item)) && CHK(c->item != itBarrow, XLAT("%The1 is protected from this kind of magic!", c->item))
) { ) {