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

inv:: the new Orbs displayed and hotkeyed correctly

Browse Source
This commit is contained in:
Zeno Rogue 2021-05-30 13:21:42 +02:00
parent bc0eed4cf0
commit cc31e1cd64
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inventory.cpp
View File

@ -409,7 +409,7 @@ EX namespace inv {
} }
map<char, eItem> orbmap; map<char, eItem> orbmap;
string orbkeys = "zfwplSetsTaMIYgCcPOWAFydLGRUkouE.,bVNxDjJZnrvhBm!23456789@#$%"; string orbkeys = "zfwplSetsTaMIYgCcPOWAFydLGRUkouE.,bVNxDjJZnrvhBm!23456789@#$%()";
typedef pair<int, int> pxy; typedef pair<int, int> pxy;
vector<pxy> orbcoord; vector<pxy> orbcoord;
@ -496,7 +496,7 @@ EX namespace inv {
cmode = sm::CENTER; cmode = sm::CENTER;
orbcoord.clear(); orbcoord.clear();
for(int y=-3; y<=3; y++) for(int x=-5; x<=5; x++) if(x+y<=5 && x+y >= -5 && (x||y)) for(int y=-3; y<=3; y++) for(int x=-5; x<=5; x++) if(x+y<=6 && x+y >= -6 && (x||y))
orbcoord.emplace_back(x,y); orbcoord.emplace_back(x,y);
sort(orbcoord.begin(), orbcoord.end(), [](pxy p1, pxy p2) { sort(orbcoord.begin(), orbcoord.end(), [](pxy p1, pxy p2) {
return sq(p1) < sq(p2); }); return sq(p1) < sq(p2); });
@ -517,7 +517,7 @@ EX namespace inv {
for(int i=0; i<ittypes; i++) { for(int i=0; i<ittypes; i++) {
eItem o = eItem(i); eItem o = eItem(i);
if(itemclass(o) == IC_ORB) { if(itemclass(o) == IC_ORB && !(classflag(o) & IF_CURSE)) {
char c = orbkeys[j++]; char c = orbkeys[j++];
if(c == 0) println(hlog, "missing char for ", dnameof(o)); if(c == 0) println(hlog, "missing char for ", dnameof(o));
if(remaining[i] || usedup[i]) { if(remaining[i] || usedup[i]) {
@ -525,6 +525,10 @@ EX namespace inv {
if(plain) if(plain)
dialog::addSelItem(XLAT1(iinf[o].name), its(remaining[i]), c); dialog::addSelItem(XLAT1(iinf[o].name), its(remaining[i]), c);
else { else {
if(oc >= isize(orbcoord)) {
println(hlog, "error: oc=", oc, " with only ", isize(orbcoord), " positions");
continue;
}
auto pos = orbcoord[oc++]; auto pos = orbcoord[oc++];
ld px = current_display->xcenter + 2*rad*pos.first + rad*pos.second; ld px = current_display->xcenter + 2*rad*pos.first + rad*pos.second;
ld py = current_display->ycenter + pos.second * rad3; ld py = current_display->ycenter + pos.second * rad3;