mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-25 09:54:48 +00:00
Code Issues Releases Wiki Activity

ru:: fixup missing parts of random effects

Browse Source
This commit is contained in:
Zeno Rogue
2025-05-23 09:33:38 +02:00
parent 22990d1883
commit 4fabbeb83e
1 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rogueviz/ru/powers.cpp
View File

@@ -101,18 +101,57 @@ power& power::be_potion() {
get_name = [np, this] { get_name = [np, this] {
string fname = potion_colors[np].first + " potion"; string fname = potion_colors[np].first + " potion";
if(flags & (PARTIAL | IDENTIFIED)) fname = fname + " of " + name; if(flags & (PARTIAL | IDENTIFIED)) fname = fname + " of " + name;
int insq = 0;
if(flags & IDENTIFIED)
for(auto& e: randeffs) {
if(!insq) fname += " ["; else fname += ", ";
fname += e->name;
insq++;
}
if(insq) fname += "]";
fname += " (" + its(qty_filled) + "/" + its(qty_owned) + ")"; fname += " (" + its(qty_filled) + "/" + its(qty_owned) + ")";
if(flags & ACTIVE) fname += " [active]";
return fname; return fname;
}; };
auto gd = get_desc; auto gd = get_desc;
get_desc = [this, gd] () -> string { get_desc = [this, gd] () -> string {
if(!(flags & (PARTIAL | IDENTIFIED))) if(!(flags & (PARTIAL | IDENTIFIED)))
return "You will need to drink this potion to identify it."; return "You will need to drink this potion to identify it.";
else return gd(); else {
auto desc = gd();
if(flags & IDENTIFIED)
for(auto& e: randeffs)
desc += e->desc;
return desc;
}
}; };
return self; return self;
} }
void random_potion_act(data& d) {
if(d.p->qty_filled == d.p->qty_owned) d.p->flags &=~ ACTIVE;
if(d.keystate == 1 && !(d.p->flags & ACTIVE)) {
if(d.p->qty_filled == 0) {
addMessage("You have no more " + d.p->get_name());
return;
}
addMessage("You drink the " + d.p->get_name());
for(auto& e: d.p->randeffs) {
if(e->effect != "") addMessage(e->effect);
d.re = e; d.mode = rev::start;
e->act(d);
}
d.p->flags |= (ACTIVE | PARTIAL | IDENTIFIED);
d.p->qty_filled--;
}
else if(d.p->flags & ACTIVE) {
for(auto& e: d.p->randeffs) {
d.re = e; d.mode = rev::active;
e->act(d);
}
}
};
vector<power> powers; vector<power> powers;
void power::init() { void power::init() {