matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added condition so that EXOT does not automatically replicate WARP to avoid confusion, and changed spawn tmp value to avoid instant copying on spawn.

Browse Source
This commit is contained in:
Catelite 2012-06-06 13:27:58 -04:00 committed by Simon Robertshaw
parent dfb0357382
commit 4e3d87737e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/exot.c
View File

@ -33,7 +33,7 @@ int update_EXOT(UPDATE_FUNC_ARGS) {
} }
} }
if (parts[i].tmp>245) if (parts[i].tmp>245)
if ((r&0xFF)!=PT_EXOT && (r&0xFF)!=PT_BREL && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PRTI && (r&0xFF)!=PT_PRTO && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_PHOT && (r&0xFF)!=PT_VOID && (r&0xFF)!=PT_NBHL) if ((r&0xFF)!=PT_EXOT && (r&0xFF)!=PT_BREL && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PRTI && (r&0xFF)!=PT_PRTO && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_PHOT && (r&0xFF)!=PT_VOID && (r&0xFF)!=PT_NBHL && (r&0xFF)!=PT_WARP)
create_part(i, x, y, parts[r>>8].type); create_part(i, x, y, parts[r>>8].type);
} }
parts[i].tmp--; parts[i].tmp--;

1
src/powder.c
View File

@ -1025,6 +1025,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
break; break;
case PT_EXOT: case PT_EXOT:
parts[i].life = 1000; parts[i].life = 1000;
parts[i].tmp = 244;
break; break;
case PT_STKM: case PT_STKM:
if (player.spwn==0) if (player.spwn==0)