1 files changed, 13 insertions, 17 deletions
diff --git a/TemplePushing.c4s/System.c4g/Goblet.c b/TemplePushing.c4s/System.c4g/Goblet.c
index a916e35..0f9506f 100644
--- a/TemplePushing.c4s/System.c4g/Goblet.c
+++ b/TemplePushing.c4s/System.c4g/Goblet.c
@@ -1,21 +1,17 @@
-#strict
-#appendto GBLT
+/*-- Goblet --*/
 
-func Activate(pClonk)
-{
- [$Shot$|Image=GNPW]
- Sound("Blast2");
- Exit(this(),-10+20*GetDir(pClonk));
- SetXDir(-80+160*GetDir(pClonk));
- SetYDir(-10);
- return(1);
-}
+#strict 2
+
+#appendto GBLT
 
-func Hit()
+private func FillCheck()
 {
- if (Random(2)) return(_inherited());
- else
- SetYDir(-20);
- Sound("BOING");
- return(1);
+	var ret = _inherited();
+	if (iTimer >= 5)
+	{
+		var clonk = Contained();
+		if (clonk && clonk->GetOCF() & OCF_CrewMember) clonk->DoEnergy(10);
+		iTimer = 0;
+	}
+	return ret;
 }