diff options
| author | Jan <> | 2015-02-02 17:55:29 +0100 |
|---|---|---|
| committer | Jan <_> | 2015-07-10 17:49:45 +0200 |
| commit | 32a9632fbca3dd7a88bd3154b84a3773af39c276 (patch) | |
| tree | a226b9404844a73c7229e9d13db993c86b5be2c1 /TemplePushing.c4s/System.c4g/Goblet.c | |
| parent | 40fb3e5d61c44886b06d839a35adb0c11a5f918f (diff) | |
| download | tempelschubsen-32a9632fbca3dd7a88bd3154b84a3773af39c276.tar.gz tempelschubsen-32a9632fbca3dd7a88bd3154b84a3773af39c276.zip | |
TemplePush v6.1.7601.18409.c4s
Diffstat (limited to 'TemplePushing.c4s/System.c4g/Goblet.c')
| -rw-r--r-- | TemplePushing.c4s/System.c4g/Goblet.c | 30 |
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; } |