From dab09d89d66ac1a6840291603cdd67d9e237c59f Mon Sep 17 00:00:00 2001 From: Charles Spurrill Date: Sat, 15 Oct 2011 02:25:44 -0700 Subject: [PATCH] Dynamite and dynamite box are IsAlchemyProduct() (and the igniter is not!) --- planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c | 2 ++ .../Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c | 3 +++ .../Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c index 5ffa79b2d..049564e0e 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c @@ -151,6 +151,8 @@ public func DoExplode() Explode(18); } +public func IsAlchemyProduct() { return true; } + local ActMap = { Fuse = { Prototype = Action, diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c index 58fd01d0a..e0b0d7a85 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c @@ -73,6 +73,9 @@ public func ResetClonk(clonk) RemoveObject(); } +public func IsTool() { return true; } +public func IsAlchemyProduct() { return false; } + func Definition(def) { SetProperty("PictureTransformation",Trans_Scale(), def); // Hide it TODO: Remove if the mesh isn't shown if there is a picture set } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c index 4e789f215..61bef200c 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c @@ -155,7 +155,7 @@ func FxIntLengthStop(pTarget, effect, iReason, fTmp) } public func IsTool() { return true; } -public func IsToolProduct() { return true; } +public func IsAlchemyProduct() { return true; } func Definition(def) { SetProperty("PictureTransformation",Trans_Scale(), def); // Hide it TODO: Remove if the mesh isn't shown if there is a picture set