mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

renamed waBlandDie to waHappyDie

This commit is contained in:
Zeno Rogue 2021-05-27 16:38:20 +02:00
parent 707292a7e4
commit a2a1acfd8d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
celldrawer.cpp
View File

@ -1601,7 +1601,7 @@ void celldrawer::draw_features() {
poly_outline = OUTLINE_DEFAULT;
}
else if(among(c->wall, waRichDie, waBlandDie)) {
else if(among(c->wall, waRichDie, waHappyDie)) {
color_t col = darkena(winf[c->wall].color, 0, 0xFF);
ld footphase;

6
complex2.cpp
View File

@ -986,15 +986,15 @@ EX namespace dice {
int pct = hrand(100);
int pct2 = hrand(6000);
if(pct < 3) {
c->wall = waBlandDie;
c->wall = waHappyDie;
generate_specific(c, &d4, 0, 99);
}
else if(pct < 6) {
c->wall = waBlandDie;
c->wall = waHappyDie;
generate_specific(c, &d8, 0, 1);
}
else if(pct < (items[itOrbLuck] ? 8 : 9)) {
c->wall = waBlandDie;
c->wall = waHappyDie;
generate_specific(c, &d20, 0, 1);
}
else if(pct < 14) {

2
content.cpp
View File

@ -1704,7 +1704,7 @@ WALL('d', 0x7F6A10, "Unhappy Die", waRichDie, WF_WALL | WF_PUSHABLE, RESERVED, 0
"Sentent dice like to be in a position such that their highest number is on top, or somewhere close. "
"Unfortunately, someone has rolled this one into a wrong position, and did not fix this. "
"It will reward you if you roll it so that the highest number is on top again!")
WALL('d', 0x106010, "Happy Die", waBlandDie, WF_WALL | WF_PUSHABLE, RESERVED, 0, sgNone,
WALL('d', 0x106010, "Happy Die", waHappyDie, WF_WALL | WF_PUSHABLE, RESERVED, 0, sgNone,
"A happy sentent die. You can roll it.")
MONSTER('d', 0x603010, "Animated Die", moAnimatedDie, ZERO, RESERVED, moHexDemon,

6
game.cpp
View File

@ -379,13 +379,13 @@ EX void pushThumper(const movei& mi) {
cto->wall = waCrateOnTarget;
th->wall = waCrateTarget;
}
else if(among(w, waRichDie, waBlandDie)) {
else if(among(w, waRichDie, waHappyDie)) {
th->wall = waNone;
cto->wall = w;
animateMovement(mi, LAYER_BOAT);
dice::roll(mi);
if(w == waRichDie && dice::data[cto].happy() > 0) {
cto->wall = waBlandDie;
cto->wall = waHappyDie;
if(cto->land == laDice && th->land == laDice) {
items[itDice]++;
addMessage(XLAT("The die is now happy, and you are rewarded!"));
@ -403,7 +403,7 @@ EX void pushThumper(const movei& mi) {
}
EX bool canPushThumperOn(cell *tgt, cell *thumper, cell *player) {
if(among(thumper->wall, waRichDie, waBlandDie) && ctof(tgt))
if(among(thumper->wall, waRichDie, waHappyDie) && ctof(tgt))
return false;
if(tgt->wall == waBoat || tgt->wall == waStrandedBoat) return false;
if(isReptile(tgt->wall)) return false;

6
orbs.cpp
View File

@ -1102,13 +1102,13 @@ void blowoff(const movei& mi) {
}
if(ct->monst == moAnimatedDie && dice::data[ct].happy() > 0) {
ct->monst = moNone;
ct->wall = waBlandDie;
ct->wall = waHappyDie;
if(ct->land == laDice && cf->land == laDice) {
cf->item = itDice;
addMessage(XLAT("The die is now happy, and you are rewarded!"));
}
}
if(die && ct->wall == waBlandDie) {
if(die && ct->wall == waHappyDie) {
/* pushMonster already awarded us -- place the reward on cf instead */
cf->item = itDice;
items[itDice]--;
@ -1147,7 +1147,7 @@ EX movei blowoff_destination(cell *c, int& di) {
if(d<c->type) for(int e=d; e<d+c->type; e++) {
int di = e % c->type;
cell *c2 = c->move(di);
if((c->monst == moAnimatedDie || c->wall == waBlandDie || c->wall == waRichDie) && ctof(c2)) continue;
if((c->monst == moAnimatedDie || c->wall == waHappyDie || c->wall == waRichDie) && ctof(c2)) continue;
if(c2 && c2->cpdist > c->cpdist && passable(c2, c, P_BLOW)) return movei(c, c2, di);
}
return movei(c, c, NO_SPACE);