mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2026-10-29 12:04:30 +00:00
fixed some issues with north/south poles
This commit is contained in:
1 parent
556076a950
commit
5d6483886f
3 files changed
+5
-5
No files matched your search
+2
-2
@@ -757,9 +757,9 @@ EX void checkTide(cell *c) {
|
||||
EX bool makeNoMonster(cell *c) {
|
||||
changes.ccell(c);
|
||||
if(isAnyIvy(c->monst)) killMonster(c, moPlayer, 0);
|
||||
else if(c->monst == moPair) {
|
||||
else if(is_paired(c->monst)) {
|
||||
changes.ccell(c->move(c->mondir));
|
||||
if(c->move(c->mondir)->monst == moPair)
|
||||
if(is_paired(c->move(c->mondir)->monst))
|
||||
c->move(c->mondir)->monst = moNone;
|
||||
}
|
||||
else if(isWorm(c->monst)) {
|
||||
|
||||
@@ -1171,9 +1171,9 @@ void poly_attack(cell *dest) {
|
||||
dest->monst = target;
|
||||
if(!dest->stuntime) dest->stuntime = 1;
|
||||
|
||||
if(among(orig, moPair, moSouthPole, moNorthPole)) {
|
||||
if(is_paired(orig)) {
|
||||
cell *dest2 = dest->move(dest->mondir);
|
||||
if(dest2->monst == moPair) {
|
||||
if(is_paired(dest2->monst)) {
|
||||
dest2->monst = dest->monst;
|
||||
if(!dest2->stuntime) dest2->stuntime = 1;
|
||||
}
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ EX void destroycellcontents(cell *c) {
|
||||
c->land = laMemory;
|
||||
c->wall = waChasm;
|
||||
c->item = itNone;
|
||||
if(!isMultitile(c->monst) && c->monst != moPair)
|
||||
if(!isMultitile(c->monst) && !is_paired(c->monst))
|
||||
c->monst = moNone;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user