Krakens no longer destroy player boats in peaceful mode
This commit is contained in:
parent
3dde8d805a
commit
32bfdf42c3
|
@ -168,7 +168,7 @@ EX bool monstersnear(cell *c, eMonster who) {
|
||||||
if(elec::affected(c2)) continue;
|
if(elec::affected(c2)) continue;
|
||||||
if(fast && c2->monst != moWitchSpeed) continue;
|
if(fast && c2->monst != moWitchSpeed) continue;
|
||||||
// Krakens just destroy boats
|
// Krakens just destroy boats
|
||||||
if(who == moPlayer && c2->monst == moKrakenT && c->wall == waBoat) {
|
if(who == moPlayer && c2->monst == moKrakenT && c->wall == waBoat && !peace::on) {
|
||||||
kraken_will_destroy_boat = true;
|
kraken_will_destroy_boat = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2981,7 +2981,7 @@ EX namespace kraken {
|
||||||
attackMonster(c2, AF_NORMAL | AF_MSG, c->monst);
|
attackMonster(c2, AF_NORMAL | AF_MSG, c->monst);
|
||||||
sleep(c);
|
sleep(c);
|
||||||
}
|
}
|
||||||
else for(int i=0; i<numplayers(); i++) if(playerpos(i) == c2) {
|
else for(int i=0; i<numplayers(); i++) if(playerpos(i) == c2 && !peace::on) {
|
||||||
if(isPlayerInBoatOn(c2, i)) {
|
if(isPlayerInBoatOn(c2, i)) {
|
||||||
addMessage(XLAT("%The1 destroys your boat!", moKrakenH));
|
addMessage(XLAT("%The1 destroys your boat!", moKrakenH));
|
||||||
dboat = true;
|
dboat = true;
|
||||||
|
|
Loading…
Reference in New Issue