mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-06-13 20:04:07 +00:00
ru:: better power structure, gold to picup
This commit is contained in:
parent
2ee3d11458
commit
b290eff382
@ -15,16 +15,26 @@ using powerfun = hr::function<void(data&)>;
|
||||
struct power {
|
||||
int key;
|
||||
string name;
|
||||
string xname;
|
||||
string desc;
|
||||
string glyph;
|
||||
color_t color;
|
||||
flagtype flags;
|
||||
powerfun pf;
|
||||
int id_status;
|
||||
power(int key, string name, string desc, string glyph, color_t color, flagtype f, powerfun pf) : key(key), name(name), desc(desc), glyph(glyph), color(color), flags(f), pf(pf) {
|
||||
id_status = 0;
|
||||
}
|
||||
int qty_filled;
|
||||
int qty_owned;
|
||||
flagtype flags;
|
||||
void init();
|
||||
hr::function<void(data&)> act, paused_act;
|
||||
hr::function<string()> get_name;
|
||||
hr::function<string()> get_desc;
|
||||
hr::function<string()> get_glyph;
|
||||
hr::function<color_t()> get_color;
|
||||
hr::function<void(int)> picked_up;
|
||||
power& is_starting();
|
||||
power& be_weapon();
|
||||
power& be_resource(string plural);
|
||||
power& while_paused();
|
||||
power& identified_name(string, string);
|
||||
};
|
||||
|
||||
extern vector<power> powers;
|
||||
@ -241,16 +251,17 @@ struct hint : public entity {
|
||||
};
|
||||
|
||||
struct item : public entity {
|
||||
int id;
|
||||
int id, qty;
|
||||
string pickup_message;
|
||||
double sx() override { return 12; }
|
||||
double sy() override { return 12; }
|
||||
string glyph() override { return powers[id].glyph; }
|
||||
color_t color() override { return powers[id].color; }
|
||||
string glyph() override { return powers[id].get_glyph(); }
|
||||
color_t color() override { return powers[id].get_color(); }
|
||||
void act() override {
|
||||
kino();
|
||||
if(intersect(get_pixel_bbox(), m.get_pixel_bbox())) {
|
||||
addMessage(pickup_message);
|
||||
powers[id].picked_up(qty);
|
||||
destroyed = true;
|
||||
}
|
||||
}
|
||||
|
@ -1,66 +1,117 @@
|
||||
namespace rogue_unlike {
|
||||
|
||||
flagtype STARTING = Flag(1);
|
||||
flagtype WHILE_PAUSED = Flag(2);
|
||||
flagtype TOGGLEABLE = Flag(4);
|
||||
flagtype ACTIVE = Flag(8);
|
||||
flagtype NEEDS_IDENTIFY = Flag(16);
|
||||
flagtype IDENTIFIED = Flag(1);
|
||||
flagtype ACTIVE = Flag(2);
|
||||
|
||||
vector<power> powers = {
|
||||
power('1', "Potion of Extra Life",
|
||||
data fakedata;
|
||||
|
||||
power& power::is_starting() { qty_filled = qty_owned = 1; return self; }
|
||||
|
||||
power& power::while_paused() { paused_act = act; return self; }
|
||||
|
||||
power& power::identified_name(string s, string desc) {
|
||||
auto gn = get_name;
|
||||
get_name = [gn, s, this] () { return (flags & IDENTIFIED) ? s : gn(); };
|
||||
auto gd = get_desc;
|
||||
get_desc = [gd, s, this] () { return (flags & IDENTIFIED) ? s : gd(); };
|
||||
return self;
|
||||
}
|
||||
|
||||
power& power::be_weapon() {
|
||||
picked_up = [this] (int x) { qty_owned += x; qty_filled = max(qty_filled, x); };
|
||||
auto gn = get_name; get_name = [gn, this] { return "+" + its(qty_filled-1) + " " + gn() + " (+" + its(qty_owned-qty_filled) + ")"; };
|
||||
return self;
|
||||
}
|
||||
|
||||
power& power::be_resource(string s) {
|
||||
get_name = [this, s] { return its(qty_filled) + " " + s; };
|
||||
return self;
|
||||
}
|
||||
|
||||
vector<power> powers;
|
||||
|
||||
void power::init() {
|
||||
id_status = 0;
|
||||
qty_filled = 0; qty_owned = 0;
|
||||
flags = 0;
|
||||
act = [this] (data& d) { pf(d); };
|
||||
paused_act = [] (data&) {};
|
||||
get_name = [this] { return name; };
|
||||
get_desc = [this] { return desc; };
|
||||
get_color = [this] { return color; };
|
||||
get_glyph = [this] { return glyph; };
|
||||
picked_up = [this] (int x) { qty_filled += x; qty_owned += x; };
|
||||
}
|
||||
|
||||
power& gen_power(int key, string name, string desc, string glyph, color_t color, powerfun pf) {
|
||||
powers.emplace_back();
|
||||
auto& p = powers.back();
|
||||
p.key = key;
|
||||
p.name = name;
|
||||
p.desc = desc;
|
||||
p.glyph = glyph;
|
||||
p.color = color;
|
||||
p.pf = pf;
|
||||
p.init();
|
||||
return p;
|
||||
}
|
||||
|
||||
void gen_powers() {
|
||||
powers.reserve(100);
|
||||
|
||||
gen_power('1', "Potion of Extra Life",
|
||||
"You are really proud of this potion, which, after you die, will let you return to the moment of time when you drank it. "
|
||||
"Unfortunately it still requires an ingredient found only in the magical fountains of the Dungeons of Alchemy.\n\n"
|
||||
"You can only drink this potion when at a magical fountain. To protect yourself from dying permanently, it is drank "
|
||||
"automatically whenever you are at a magical fountain.",
|
||||
"!", 0xFFFF00FF, STARTING,
|
||||
"!", 0xFFFF00FF,
|
||||
[] (data& d) { }
|
||||
),
|
||||
).is_starting(),
|
||||
|
||||
power('d', "move right",
|
||||
gen_power('d', "move right",
|
||||
"A special power of human beings, and most other animals, that they earn early in their life.",
|
||||
">", 0xFF0000FF, STARTING,
|
||||
">", 0xFF0000FF,
|
||||
[] (data& d) { if(d.keystate & 1) d.dx += 1; }
|
||||
),
|
||||
).is_starting(),
|
||||
|
||||
power('a', "move left",
|
||||
gen_power('a', "move left",
|
||||
"Moving to the right was a mistake? If so, this special power can be used to ignore the consequences. In most cases, at least...",
|
||||
"<", 0xFF0000FF, STARTING,
|
||||
"<", 0xFF0000FF,
|
||||
[] (data& d) { if(d.keystate & 1) d.dx -= 1; }
|
||||
),
|
||||
).is_starting(),
|
||||
|
||||
power('w', "jump",
|
||||
gen_power('w', "jump",
|
||||
"This power can be used to reach higher parts of the world. Its power is quite limited compared to move left and right, but "
|
||||
"you expect to find some ways to make it more powerful.",
|
||||
"^", 0xFF0000FF, STARTING,
|
||||
"^", 0xFF0000FF,
|
||||
[] (data& d) {
|
||||
if(d.keystate & 1) {
|
||||
bool can_jump = m.on_floor;
|
||||
println(hlog, "on_floor_when = ", m.on_floor_when, " gframeid = ", gframeid, " coyote_time = ", m.coyote_time);
|
||||
if(gframeid <= m.on_floor_when + m.coyote_time) can_jump = true;
|
||||
if(can_jump) m.vel_y = -(non_hyperbolic ? 3 : 5) * d.d * d.modv, m.on_floor_when = -1000;
|
||||
}
|
||||
}
|
||||
),
|
||||
).is_starting(),
|
||||
|
||||
power('s', "fall",
|
||||
gen_power('s', "fall",
|
||||
"If you are on a platform, this ability can be used to drop down.",
|
||||
"v", 0xFF0000FF, STARTING,
|
||||
"v", 0xFF0000FF,
|
||||
[] (data& d) {
|
||||
m.fallthru = (d.keystate & 1);
|
||||
}
|
||||
),
|
||||
).is_starting(),
|
||||
|
||||
power('p', "pause",
|
||||
gen_power('p', "pause",
|
||||
"Becoming an alchemist requires intelligence: thinking quickly to react to surprising effects of experiments. "
|
||||
"To reflect this, you can use this power at any time to give yourself more time to think about the situation.",
|
||||
"-", 0xFF0000FF, STARTING | WHILE_PAUSED,
|
||||
"-", 0xFF0000FF,
|
||||
[] (data& d) {
|
||||
if(d.keystate == 1) cmode = mode::paused;
|
||||
}),
|
||||
if(d.keystate == 1) cmode = (cmode == mode::paused ? mode::playing : mode::paused);
|
||||
}).is_starting().while_paused(),
|
||||
|
||||
power(' ', "dagger",
|
||||
gen_power(' ', "dagger",
|
||||
"This sharp dagger is very useful during the preparation of alchemical ingredients, but it works as a basic weapon too.",
|
||||
")", 0xFFFFFFFF, 0,
|
||||
")", 0xFFFFFFFF,
|
||||
[] (data& d) {
|
||||
if(d.keystate != 1) return;
|
||||
m.attack_facing = m.facing; m.attack_when = gframeid;
|
||||
@ -75,66 +126,51 @@ vector<power> powers = {
|
||||
addMessage("You smash the door!");
|
||||
}
|
||||
}
|
||||
}),
|
||||
}).be_weapon(),
|
||||
|
||||
power('o', "strange blue crystal ball", "You feel an urge to look into it.",
|
||||
"o", 0x00FF00FF, WHILE_PAUSED | NEEDS_IDENTIFY,
|
||||
gen_power('o', "strange blue crystal ball", "You feel an urge to look into it.",
|
||||
"o", 0x00FF00FF,
|
||||
[] (data& d) {
|
||||
if(!(d.p->flags & NEEDS_IDENTIFY))
|
||||
d.p->name = "Poincaré's Crystal Ball",
|
||||
d.p->desc =
|
||||
"This crystal ball will not let you predict the future or see things elsewhere, but will let you easily map the "
|
||||
"parts of the world you have seen so far. This artifact is rumored to have been actually created by Beltrami, but "
|
||||
"it was bought and presented to people by the famous wizard Poincaré, and people thought it was Poincaré's creation.";
|
||||
if(d.keystate != 1) return;
|
||||
d.p->flags &=~ NEEDS_IDENTIFY;
|
||||
d.p->flags |= IDENTIFIED;
|
||||
switch_mapmode_to(cmapmode == mapmode::poincare ? mapmode::standard : mapmode::poincare);
|
||||
}
|
||||
),
|
||||
).while_paused().identified_name("Poincaré's Crystal Ball", "This crystal ball will not let you predict the future or see things elsewhere, but will let you easily map the "
|
||||
"parts of the world you have seen so far. This artifact is rumored to have been actually created by Beltrami, but "
|
||||
"it was bought and presented to people by the famous wizard Poincaré, and people thought it was Poincaré's creation."),
|
||||
|
||||
power('b', "strange cyan crystal ball", "You feel an urge to look into it.",
|
||||
"o", 0x00FFFFFF, WHILE_PAUSED | NEEDS_IDENTIFY,
|
||||
gen_power('b', "strange cyan crystal ball", "You feel an urge to look into it.",
|
||||
"o", 0x00FFFFFF,
|
||||
[] (data& d) {
|
||||
if(!(d.p->flags & NEEDS_IDENTIFY))
|
||||
d.p->name = "Beltrami's Crystal Ball",
|
||||
d.p->desc =
|
||||
"Created by the ancient wizard Beltrami, this crystal ball will not let you predict the future or see things elsewhere, "
|
||||
"but will let you easily map the parts of the world you have seen so far. Contrary to Poincaré's ball, straight lines are "
|
||||
"mapped faithfully.";
|
||||
if(d.keystate != 1) return;
|
||||
d.p->flags &=~ NEEDS_IDENTIFY;
|
||||
d.p->flags |= IDENTIFIED;
|
||||
switch_mapmode_to(cmapmode == mapmode::klein ? mapmode::standard : mapmode::klein);
|
||||
}
|
||||
),
|
||||
).while_paused().identified_name("Beltrami's Crystal Ball","Created by the ancient wizard Beltrami, this crystal ball will not let you predict the future or see things elsewhere, "
|
||||
"but will let you easily map the parts of the world you have seen so far. Contrary to Poincaré's ball, straight lines are "
|
||||
"mapped faithfully."),
|
||||
|
||||
power('c', "furry ring",
|
||||
gen_power('c', "furry ring",
|
||||
"This strange ring is too small to put on your finger, but maybe you could put it on your small toe?",
|
||||
"=", 0xe1cbbeFF, TOGGLEABLE | NEEDS_IDENTIFY,
|
||||
"=", 0xe1cbbeFF,
|
||||
[] (data& d) {
|
||||
if(!(d.p->flags & NEEDS_IDENTIFY))
|
||||
d.p->name = "Toe Ring of the Coyote",
|
||||
d.p->desc =
|
||||
"This ring, worn on a toe, will let you still jump after running off a platform. Just make sure that you run off with the foot that you are wearing this ring on!";
|
||||
if(d.keystate == 1) {
|
||||
d.p->flags ^= ACTIVE;
|
||||
if(d.p->flags & ACTIVE) addMessage("You put the " + d.p->name + " on your toe.");
|
||||
else addMessage("You remove the " + d.p->name + " from your toe.");
|
||||
if(d.p->flags & ACTIVE) addMessage("You put the " + d.p->get_name() + " on your toe.");
|
||||
else addMessage("You remove the " + d.p->get_name() + " from your toe.");
|
||||
}
|
||||
if(d.p->flags & ACTIVE) m.next_coyote_time += 30;
|
||||
if((d.p->flags & NEEDS_IDENTIFY) && (gframeid <= m.on_floor_when + m.coyote_time) && !m.on_floor) {
|
||||
d.p->flags &=~ NEEDS_IDENTIFY;
|
||||
if(!(d.p->flags & IDENTIFIED) && (gframeid <= m.on_floor_when + m.coyote_time) && !m.on_floor) {
|
||||
d.p->flags |= IDENTIFIED;
|
||||
addMessage("You feel a strange magical force wanting to hold your foot from below.");
|
||||
}
|
||||
}
|
||||
),
|
||||
).identified_name("Toe Ring of the Coyote", "This ring, worn on a toe, will let you still jump after running off a platform. Just make sure that you run off with the foot that you are wearing this ring on!"),
|
||||
|
||||
power('g', "Golden Shoelaces",
|
||||
gen_power('g', "Golden Shoelaces",
|
||||
"These shoelaces might bind you into place or give you freedom... or they could just be mundane shoelaces for rich people... one way to tell.",
|
||||
"=", 0xFFD500FF, TOGGLEABLE,
|
||||
"=", 0xFFD500FF,
|
||||
[] (data& d) {
|
||||
if(!(d.p->flags & NEEDS_IDENTIFY))
|
||||
d.p->desc =
|
||||
"Normally you cannot control your jumps while you are flying. These shoelaces allow you some control over your jumps.";
|
||||
if(d.keystate == 1) {
|
||||
d.p->flags ^= ACTIVE;
|
||||
if(d.p->flags & ACTIVE) addMessage("You put the Golden Shoelaces on your boots.");
|
||||
@ -159,41 +195,47 @@ vector<power> powers = {
|
||||
addMessage("You feel able to control your jumps while flying.");
|
||||
}
|
||||
if(ids == 10) {
|
||||
d.p->flags |= NEEDS_IDENTIFY;
|
||||
d.p->flags |= IDENTIFIED;
|
||||
addMessage("This control originates from your golden shoelaces.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
),
|
||||
).identified_name("Golden Shoelaces", "Normally you cannot control your jumps while you are flying. These shoelaces allow you some control over your jumps."),
|
||||
|
||||
power('r', "steel ring",
|
||||
gen_power('r', "steel ring",
|
||||
"Is it safe to put this ring on?",
|
||||
"=", 0xC04040FF, TOGGLEABLE | NEEDS_IDENTIFY,
|
||||
"=", 0xC04040FF,
|
||||
[] (data& d) {
|
||||
if(!(d.p->flags & NEEDS_IDENTIFY))
|
||||
d.p->name = "Ring of Strength",
|
||||
d.p->desc =
|
||||
"This will raise your strength!";
|
||||
if(d.keystate == 1) {
|
||||
d.p->flags ^= ACTIVE;
|
||||
d.p->flags &=~ NEEDS_IDENTIFY;
|
||||
d.p->flags |= IDENTIFIED;
|
||||
if(d.p->flags & ACTIVE) addMessage("You put the Ring of Strength on your finger.");
|
||||
else addMessage("You remove the Ring of Strength from your finger.");
|
||||
}
|
||||
}
|
||||
),
|
||||
).identified_name("Ring of Strength", "This will raise your strength!"),
|
||||
|
||||
gen_power('g', "gold",
|
||||
"For some weird reason, people love gold, and they will give you anything if you give them enough gold.\n\n"
|
||||
"This can be used to buy things in shops. "
|
||||
"Just stand on the item, press the hotkey, go to the shopkeeper, and press the hotkey again.\n\n"
|
||||
"If you decide not to buy, press the hotkey without going to the shopkeeper.",
|
||||
"$", 0xFFD500FF,
|
||||
[] (data& d) {}
|
||||
).be_resource("pieces of gold");
|
||||
|
||||
};
|
||||
|
||||
void handle_powers(data& d) {
|
||||
for(auto& p: powers) {
|
||||
if(cmode == mode::paused && !(p.flags & WHILE_PAUSED)) continue;
|
||||
if(!p.qty_owned) continue;
|
||||
d.keystate = 0;
|
||||
if(keyheld(p.key)) d.keystate |= 1;
|
||||
if(keywasheld(p.key)) d.keystate |= 2;
|
||||
d.p = &p;
|
||||
p.pf(d);
|
||||
if(cmode == mode::paused) p.paused_act(d);
|
||||
else p.act(d);
|
||||
}
|
||||
}
|
||||
|
||||
@ -208,12 +250,12 @@ void draw_inventory() {
|
||||
auto st = vid.fsize * 1.2;
|
||||
displaystr(sx, sy, 0, vid.fsize, "Your inventory:", 0xC0C0C0, 0);
|
||||
int lineid = 2;
|
||||
for(auto& p: powers) {
|
||||
for(auto& p: powers) if(p.qty_owned) {
|
||||
string s = ""; s += dialog::keyname(p.key);
|
||||
s += " ";
|
||||
s += p.glyph;
|
||||
s += p.get_glyph();
|
||||
s += " ";
|
||||
s += p.name;
|
||||
s += p.get_name();
|
||||
displaystr(sx, sy + st * (lineid++), 0, vid.fsize, s, p.color >> 8, 0);
|
||||
}
|
||||
}
|
||||
|
@ -320,6 +320,7 @@ void enable() {
|
||||
|
||||
set_sval();
|
||||
init_scales();
|
||||
gen_powers();
|
||||
|
||||
hyperpoint aleft = deparabolic13(to_hyper(l_margin_at, yctr));
|
||||
hyperpoint aright = deparabolic13(to_hyper(r_margin_at, yctr));
|
||||
|
@ -110,7 +110,8 @@ void load_room(fhstream& f, cell *c) {
|
||||
}
|
||||
else if(cap == "ITEM") {
|
||||
auto b = std::make_unique<item>();
|
||||
sscanf(param.c_str(), "%lf%lf", &b->where_x, &b->where_y);
|
||||
b->qty = 1;
|
||||
sscanf(param.c_str(), "%lf%lf%d", &b->where_x, &b->where_y, &b->qty);
|
||||
s = scanline_noblank(f);
|
||||
b->id = -1;
|
||||
for(int i=0; i<isize(powers); i++) if(powers[i].name == s) b->id = i;
|
||||
|
Loading…
x
Reference in New Issue
Block a user