diff options
Diffstat (limited to 'TemplePushing.c4s/System.c4g')
| -rw-r--r-- | TemplePushing.c4s/System.c4g/Goblet.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/TemplePushing.c4s/System.c4g/Goblet.c b/TemplePushing.c4s/System.c4g/Goblet.c index a083d8c..2b25870 100644 --- a/TemplePushing.c4s/System.c4g/Goblet.c +++ b/TemplePushing.c4s/System.c4g/Goblet.c @@ -1,7 +1,6 @@ /*-- Add unique Goblet mechanics --*/ -#strict 2 - +#strict 3 #appendto GBLT local energyLeft; @@ -17,6 +16,10 @@ public func Initialize() private func FillCheck() { var ret = _inherited(); + if (ret) + { + return ret; + } if (iTimer >= 5) { @@ -36,7 +39,7 @@ private func FillCheck() energyLeft -= doEnergy; } - if (energyLeft == 0) SetEmpty(); + if (energyLeft == 0) return SetEmpty(); } iTimer = 0; } @@ -81,14 +84,14 @@ private func RemoveAnyEffect(string name, object target, string checkCall) var effectNumber = GetEffect(name, target, i); if (effectNumber == 0) break; if (checkCall && eval(Format("%s(Object(%d), %d)", checkCall, ObjectNumber(target), effectNumber))) continue; - effectNumbers[GetLength(effectNumbers)] = effectNumber; + effectNumbers[] = effectNumber; } // Fail if no effects were found if (GetLength(effectNumbers) == 0) return false; // Randomly select an effect to remove - RemoveEffect(0, target, effectNumbers[Random(GetLength(effectNumbers))]); + RemoveEffect(nil, target, effectNumbers[Random(GetLength(effectNumbers))]); return true; // Success } |