Change LCRy workings and add ELEC (wip)

1 files changed, 38 insertions, 10 deletions

diff --git a/src/elements/lcry.c b/src/elements/lcry.c
index e03a3a4..e570c90 100644
--- a/src/elements/lcry.c
+++ b/src/elements/lcry.c
@@ -1,11 +1,18 @@
 #include <element.h>
 
-int update_LCRY(UPDATE_FUNC_ARGS) {
-	if (parts[i].life>0 && parts[i].life!=10)
-		parts[i].life--;
-	if (parts[i].life==10)
+int update_LCRY(UPDATE_FUNC_ARGS)
+{
+	int r, rx, ry;
+	if(parts[i].tmp==1 || parts[i].tmp==0)
 	{
-		int r, rx, ry;
+		if(parts[i].tmp==1)
+		{
+			if(parts[i].life<=0)
+				parts[i].tmp = 0;
+			else
+				parts[i].life--;
+		}
+			
 		for (rx=-1; rx<2; rx++)
 			for (ry=-1; ry<2; ry++)
 				if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@@ -13,14 +20,35 @@ int update_LCRY(UPDATE_FUNC_ARGS) {
 					r = pmap[y+ry][x+rx];
 					if (!r)
 						continue;
-					if ((r&0xFF)==PT_LCRY)
+					if ((r&0xFF)==PT_LCRY && parts[r>>8].tmp == 3)
 					{
-						if (parts[r>>8].life<10&&parts[r>>8].life>0)
-							parts[i].life = 9;
-						else if (parts[r>>8].life==0)
-							parts[r>>8].life = 10;
+						parts[r>>8].tmp = 1;
 					}
 				}
 	}
+	else if(parts[i].tmp==2 || parts[i].tmp==3)
+	{
+		if(parts[i].tmp==2)
+		{
+			if(parts[i].life>=10)
+				parts[i].tmp = 3;
+			else
+				parts[i].life++;
+		}
+			
+		for (rx=-1; rx<2; rx++)
+			for (ry=-1; ry<2; ry++)
+				if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
+				{
+					r = pmap[y+ry][x+rx];
+					if (!r)
+						continue;
+					if ((r&0xFF)==PT_LCRY && parts[r>>8].tmp == 0)
+					{
+						parts[r>>8].tmp = 2;
+					}
+				}
+	}
+	parts[i].tmp = parts[i].tmp;
 	return 0;
 }