mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-04-15 06:21:23 +00:00
Code Issues Releases Wiki Activity

ru:: dressing takes time

Browse Source
This commit is contained in:
Zeno Rogue
2026-03-15 16:52:11 +01:00
parent f8308b6b3a
commit 26647b456f
3 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rogueviz/ru/classes.cpp
View File

@@ -388,6 +388,7 @@ struct man : public entity {
int attack_facing;
int attack_when;
int on_floor_when;
int dresstime;
entity *morphed = nullptr;
vector<effect> effects;

8
rogueviz/ru/man.cpp
View File

@@ -66,7 +66,8 @@ void man::hs(stater& s) {
.act("on_floor_when", on_floor_when, 0)
.act("xp", experience, 0)
.act("last_action", last_action, 0)
.act("gameseed", gameseed, 0);
.act("gameseed", gameseed, 0)
.act("dresstime", dresstime, 0);
sact(s1, "hair", hair);
sact(s1, "eyes", eye);
string z = unspace(backstory);
@@ -108,6 +109,11 @@ void man::act() {
hp = randround(1. * hp * max_hp() / h);
auto dat = get_dat();
if(dresstime) {
dresstime--;
if(dresstime == 0) addMessage("You finish redressing.");
}
if(on_floor) on_floor_when = gframeid;
fallthru = false;

42
rogueviz/ru/powers.cpp
View File

@@ -46,6 +46,7 @@ power& power::be_armor(const vector<vector<string>>& v) {
auto gn = get_name; get_name = [gn, this] {
string s = gn();
s += " [" + its(qty_filled) + "]";
if(flags & ACTIVE) s += " (worn)";
if(qty_owned > qty_filled) s += " (+" + its(qty_owned - qty_filled) + ")";
return s;
};
@@ -88,6 +89,47 @@ power& power::be_armor(const vector<vector<string>>& v) {
return desc;
};
auto ac = act;
act = [this, gn, ac] (data& d) {
if(d.keystate == 1) {
if(!m.is_stable)
addMessage("You need to be on stable footing to redress.");
else if(d.p->flags & ACTIVE) {
addMessage("You start removing your " + gn() + ".");
d.p->flags &=~ ACTIVE;
m.dresstime += game_fps * 1.5;
m.effects.emplace_back();
}
else {
power *wearing_what = nullptr;
for(auto& p: powers) if((p.flags & ACTIVE) && (p.flags & ARMOR)) wearing_what = &p;
if(wearing_what)
addMessage("You have to remove your " + wearing_what->name + " first.");
else {
d.p->flags |= ACTIVE;
addMessage("You start putting on your " + gn() + ".");
int len = game_fps * 2;
m.dresstime += len;
for(auto fac: {1, -1}) {
m.effects.emplace_back();
auto& e = m.effects.back();
e.p = this;
e.attack_when = gframeid;
e.attack_facing = fac;
e.length = len;
e.cf = [len] (color_t& col, int t) {
auto& alpha = part(col, 0);
alpha *= (t * 1. / len);
};
e.f = [fac, len] (int t) { return m.get_pixel_bbox_at(xy{m.where.x + fac * ((len - t) * 1. / len) * m.dsiz().x, m.where.y}); };
}
}
}
}
ac(d);
};
return self;
}