From 4e3d87737edf8f862172c0f5e10585b0a567fc5a Mon Sep 17 00:00:00 2001
From: Catelite <liclockwork@yahoo.com>
Date: Wed, 6 Jun 2012 13:27:58 -0400
Subject: Added condition so that EXOT does not automatically replicate WARP to
 avoid confusion, and changed spawn tmp value to avoid instant copying on
 spawn.


diff --git a/src/elements/exot.c b/src/elements/exot.c
index c26129b..aeb77ce 100644
--- a/src/elements/exot.c
+++ b/src/elements/exot.c
@@ -33,7 +33,7 @@ int update_EXOT(UPDATE_FUNC_ARGS) {
 						}
 				}
 				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);
 			}
 	parts[i].tmp--;	
diff --git a/src/powder.c b/src/powder.c
index ecd3418..82d52b7 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -1025,6 +1025,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
 			break;
 		case PT_EXOT:
 			parts[i].life = 1000;
+			parts[i].tmp = 244;
 			break;
 		case PT_STKM:
 			if (player.spwn==0)
--
cgit v0.9.2-21-gd62e