noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-30 01:12:25 +01:00
Code Issues Activity

Spacing

Browse source
This commit is contained in:
Chris-plus-alphanumericgibberish 2016-08-18 16:13:39 -04:00
parent f7fac79140
commit ce1d9b8789
1 changed files with 29 additions and 29 deletions

58
src/allmain.c
View file

@ -520,7 +520,7 @@ moveloop()
&&!(viz_array[u.uy][u.ux]&TEMP_LIT || levl[u.ux][u.uy].lit)
){
if(!u.nv_range){
if(++u.orthocounts>5) unbind(SEAL_ORTHOS,TRUE);
if(++u.orthocounts>5) unbind(SEAL_ORTHOS,TRUE);
} else {
if(++u.orthocounts>5*u.nv_range) unbind(SEAL_ORTHOS,TRUE);
}
@ -817,8 +817,8 @@ moveloop()
}
if(u.wimage){
if(u.wimage >= 10){
exercise(A_INT, TRUE);
exercise(A_WIS, FALSE);
exercise(A_INT, TRUE);
exercise(A_WIS, FALSE);
} else if(!(moves%10)) u.wimage--;
}
}
@ -1258,25 +1258,25 @@ moveloop()
if((mtmp = m_at(u.ux+dx, u.uy+dy)) && !mtmp->mtame && canseemon(mtmp) && !(mvitals[monsndx(mtmp->data)].seen)){
mvitals[monsndx(mtmp->data)].seen = 1;
if(Role_if(PM_TOURIST)){
more_experienced(experience(mtmp,0),0);
newexplevel();
}
more_experienced(experience(mtmp,0),0);
newexplevel();
}
}
}
}
}
}
hpDiff -= u.uhp;
hpDiff = (hpDiff > 0) ? hpDiff : 0;
if(uarmg && ART_GAUNTLETS_OF_THE_BERSERKER == uarmg->oartifact){
float a = .1; /* closer to 1 -> discard older faster */
long next = (long)(a * hpDiff + (1 - a) * uarmg->ovar1);
next = (next > 10) ? 10 : next;
long diff = next - uarmg->ovar1;
uarmg->ovar1 = next;
//if(diff) adj_abon(uarmg, diff);
}
hpDiff -= u.uhp;
hpDiff = (hpDiff > 0) ? hpDiff : 0;
if(uarmg && ART_GAUNTLETS_OF_THE_BERSERKER == uarmg->oartifact){
float a = .1; /* closer to 1 -> discard older faster */
long next = (long)(a * hpDiff + (1 - a) * uarmg->ovar1);
next = (next > 10) ? 10 : next;
long diff = next - uarmg->ovar1;
uarmg->ovar1 = next;
//if(diff) adj_abon(uarmg, diff);
}
} /* actual time passed */
@ -1331,20 +1331,20 @@ moveloop()
}
oldLightBlind = !!LightBlind;
////////////////////////////////////////////////////////////////////////////////////////////////
if (!oldCon != ACURR(A_CON)) {
int condif = conplus(ACURR(A_CON)) - conplus(oldCon);
if(condif != 0) u.uhpmax += u.ulevel*condif;
if(u.uhpmax < 1) u.uhpmax = 1;
if(u.uhp > u.uhpmax) u.uhp = u.uhpmax;
oldCon = ACURR(A_CON);
}
if (!oldCon != ACURR(A_CON)) {
int condif = conplus(ACURR(A_CON)) - conplus(oldCon);
if(condif != 0) u.uhpmax += u.ulevel*condif;
if(u.uhpmax < 1) u.uhpmax = 1;
if(u.uhp > u.uhpmax) u.uhp = u.uhpmax;
oldCon = ACURR(A_CON);
}
////////////////////////////////////////////////////////////////////////////////////////////////
if (!oldWisBon != ACURR(A_WIS)/4) {
u.uenmax += u.ulevel*(ACURR(A_WIS)/4 - oldWisBon);
if(u.uenmax < 0) u.uenmax = 0;
if(u.uen > u.uenmax) u.uen = u.uenmax;
oldWisBon = ACURR(A_WIS)/4;
}
if (!oldWisBon != ACURR(A_WIS)/4) {
u.uenmax += u.ulevel*(ACURR(A_WIS)/4 - oldWisBon);
if(u.uenmax < 0) u.uenmax = 0;
if(u.uen > u.uenmax) u.uen = u.uenmax;
oldWisBon = ACURR(A_WIS)/4;
}
////////////////////////////////////////////////////////////////////////////////////////////////
/*If anything we did caused us to get moved out of water, surface*/
if(u.usubwater && !is_pool(u.ux, u.uy)){