1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-08-11 23:21:37 +01:00

Merge remote-tracking branch 'nero/patch-6' into compat-3.14.0

This commit is contained in:
Tangles 2017-05-08 19:46:04 +10:00
commit 14207cb827

View file

@ -982,7 +982,7 @@ castmu(mtmp, mattk, thinks_it_foundyou, foundyou)
int cnt = 40;
// if(Race_if(PM_DROW) && mtmp->data == &mons[PM_AVATAR_OF_LOLTH] && !Role_if(PM_EXILE) && !mtmp->mpeaceful){
if(mtmp->data == &mons[PM_AVATAR_OF_LOLTH] && !mtmp->mpeaceful && strcmp(urole.cgod,"Lolth")){
if(mtmp->data == &mons[PM_AVATAR_OF_LOLTH] && !mtmp->mpeaceful && !strcmp(urole.cgod,"Lolth")){
u.ugangr[Align2gangr(A_CHAOTIC)]++;
angrygods(A_CHAOTIC);
return 1;
@ -3204,7 +3204,7 @@ fire_um:
case AD_COLD:
cold_um:
pline("%s is covered in frost.", Monnam(mtmp));
if(resists_fire(mtmp)) {
if(resists_cold(mtmp)) {
shieldeff(mtmp->mx, mtmp->my);
pline("But %s resists the effects.",
mhe(mtmp));