Objects: Convert Definition functions to local variable declarations

Only some functions calling functions are left.

planet/Melees.c4f/Ruins.c4s/ObjectFade.c4d/Script.c

@@ -61,6 +61,4 @@ public func FxIntFadeOutTimerEffect(string new_effect_name) {
 		return -1;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Animals.c4d/Wolf.c4d/Script.c

@@ -223,8 +223,7 @@ protected func ContainedDigDouble()
 	return 1;
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 Walk = {
 	Prototype = Action,
 	Name = "Walk",
@@ -405,6 +404,5 @@ Dead = {
 	ObjectDisabled = 1,
 	Animation = "Death",
 },
-}, def);
-	SetProperty("Name", "$Name$", def);
-}
+};
+local Name = "$Name$";

planet/Objects.c4d/Effects.c4d/Cloud.c4d/Script.c

@@ -38,15 +38,13 @@ func UpdateTransferZone()
 	Show();
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 		Fly = {
 			Prototype = Action,
 			Name = "Fly",
 			Procedure = DFA_FLOAT,
 			NextAction = "Hold"
 		},
-			}, def);
-			
-	SetProperty("Name", "Cloud", def);
-}
+};
+local Name = "Cloud";
+

planet/Objects.c4d/Effects.c4d/Trajectory.c4d/Script.c

@@ -59,14 +59,13 @@ public func AttachTargetLost()
   RemoveObject();
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 Attach = {
 	Prototype = Action,
 	Name = "Attach",
 	Procedure = DFA_ATTACH,
 	Length = 1,
 	Delay = 0,
-},	}, def);
-	SetProperty("Name", "$Name$", def);
-}
+},
+};
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Clouds.c4d/AcidRain.c4d/Script.c

@@ -1,4 +1 @@
-
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Clouds.c4d/Cloud.c4d/Script.c

@@ -167,5 +167,5 @@ Fly = {
 	TurnAction = "Turn",
 },
 }, def);
-	SetProperty("Name", "Cloud", def);
 }
+local Name = "Cloud";

planet/Objects.c4d/Environment.c4d/Clouds.c4d/Lightning.c4d/Script.c

@@ -97,7 +97,4 @@ private func DrawRotatedParticleLine(string particle, int x1, int y1, int x2, in
 	}
 }
 
-func Definition(def)
-{
-	def["Name"] = "$Name$";
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Clouds.c4d/Script.c

@@ -15,6 +15,4 @@ protected func Initialize()
 	AdjustLightningFrequency(GetScenarioVal("Lightning"));
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Earthquake.c4d/Script.c

@@ -129,7 +129,4 @@ protected func FxIntEarthquakeTimer(object target, int fxnum, int time)
 
 /*-- Proplist --*/
 
-protected func Definition(def) 
-{
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Time.c4d/Moon.c4d/Script.c

@@ -47,6 +47,4 @@ public func SetPhase(int iphase)
 //only appears during the night
 public func IsCelestial() { return true; }
 
-func Definition(def) {
-	SetProperty("Name","$Name$",def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Time.c4d/Script.c

@@ -184,6 +184,4 @@ global func FxRealTimeTimer(object target, int num, int time)
 	UpdateTime();
 }
 
-func Definition(def) {
-	SetProperty("Name","Time",def);
-}
+local Name = "Time";

planet/Objects.c4d/Environment.c4d/Time.c4d/Star.c4d/Script.c

@@ -14,6 +14,4 @@ protected func Initialize()
 
 public func IsCelestial() { return true; }
 
-func Definition(def) {
-	SetProperty("Name","$Name$",def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Vegetation.c4d/Fern.c4d/Script.c

@@ -17,6 +17,4 @@ public func Incineration()
 	RemoveObject();
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Vegetation.c4d/Grass.c4d/Script.c

@@ -31,6 +31,4 @@ global func PlaceGrass(int iAmount, int start, int end)
 	}
 }
 
-func Definition(def) {
-	SetProperty("Name","Grass",def);
-}
+local Name = "Grass";

planet/Objects.c4d/Environment.c4d/Vegetation.c4d/Mushroom.c4d/Script.c

@@ -17,6 +17,4 @@ protected func ControlUse(object clonk, int iX, int iY)
 	RemoveObject();
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Environment.c4d/Vegetation.c4d/Trees.c4d/Coniferous.c4d/Script.c

@@ -10,6 +10,4 @@ private func Initialize()
 	SetProperty("MeshTransformation", Trans_Rotate(RandomX(0,359),0,1,0));
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/KingOfTheHill.c4d/KingOfTheHillLocation.c4d/KingOfTheHillMarker.c4d/Script.c

@@ -3,10 +3,6 @@ Marker for King of the Hill
 Author: Zapper
 */
 
-func Definition(def) {
-	def["Name"] = "$Name$";
-}
-
 func Initialize()
 {
 	AddEffect("Timer", this, 10, 1, this);
@@ -42,3 +38,5 @@ func FxTimerTimer()
 	
 	this->SetClrModulation(origin->GetStarColor(Sin(this->GetActTime(), 50)));
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/KingOfTheHill.c4d/KingOfTheHillLocation.c4d/KingOfTheHillStar.c4d/Script.c

@@ -6,10 +6,6 @@
 local origin;
 local number;
 
-func Definition(def) {
-	def["Name"] = "$Name$";
-}
-
 func Init(o, n)
 {
 	this->SetObjectBlitMode(GFX_BLIT_Mod2);
@@ -29,3 +25,5 @@ func FxTimerTimer()
 {
 	this->SetClrModulation(origin->GetStarColor(number));
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/KingOfTheHill.c4d/KingOfTheHillLocation.c4d/Script.c

@@ -12,10 +12,6 @@ local color;
 local king;
 local timer;
 
-func Definition(def) {
-	def["Name"] = "$Name$";
-}
-
 func Initialize() {
 	
  	ScheduleCall(this, "PostInitialize", 1, 0);
@@ -146,3 +142,5 @@ func CreateStarCircle()
 		stars[GetLength(stars)]=star;
 	}
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/KingOfTheHill.c4d/Script.c

@@ -235,6 +235,4 @@ public func GetShortDescription(int plr)
 	return ""; // TODO
 }
 
-func Definition(def) {
-  SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/LastManStanding.c4d/Relaunch.c4d/Script.c

@@ -73,7 +73,4 @@ private func RelaunchClonk()
 	return;
 }
 
-
-func Definition(def) {
-	SetProperty("Name", "relaunch", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/LastManStanding.c4d/Script.c

@@ -154,7 +154,4 @@ private func LogKill(int killer, int victim)
 	return;
 }
 
-protected func Definition(def)
-{
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/Melee.c4d/Script.c

@@ -76,6 +76,4 @@ public func GetShortDescription(int plr)
 	return ""; // TODO
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/Parkour.c4d/Arrow.c4d/Script.c

@@ -8,10 +8,7 @@ protected func Initialize()
 
 /*-- Proplist --*/
 
-protected func Definition(def) 
-{
-	SetProperty("Name", "$Name$", def);
-	SetProperty("ActMap", {
+local ActMap = {
 		Show = {
 			Prototype = Action,
 			Name = "Show",
@@ -24,5 +21,5 @@ protected func Definition(def)
 			Hgt = 20,
 			NextAction = "Show",
 		},  
-	}, def);
-}
+};
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/Parkour.c4d/CheckPoint.c4d/Script.c

@@ -277,8 +277,4 @@ protected func GetColorByAngle(int angle)
 }
 
 /*-- Proplist --*/
-
-protected func Definition(def)
-{
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/Parkour.c4d/Script.c

@@ -469,8 +469,4 @@ private func AddEvalData(int plr)
 }
 
 /*-- Proplist --*/
-
-protected func Definition(def)
-{
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Goals.c4d/ScriptGoal.c4d/Script.c

@@ -33,8 +33,4 @@ protected func Activate(int plr)
 }
 
 /*-- Proplist --*/
-
-func Definition(def)
-{
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/HUD.c4d/Ringmenu.c4d/Script.c

@@ -230,8 +230,4 @@ func Close()
 	RemoveObject(); 
 }
 
-
-
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/BlackPowder.c4d/Script.c

@@ -5,7 +5,5 @@ protected func Incineration()
 	Schedule("Explode(20)", 90);
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Coal.c4d/Script.c

@@ -12,7 +12,5 @@ protected func Hit()
 	Sound("RockHit");
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Earth.c4d/Script.c

@@ -15,7 +15,5 @@ protected func Hit()
 	return 1;
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Firestone.c4d/Script.c

@@ -12,7 +12,5 @@ func Hit()
 	Explode(20);
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Gold.c4d/Script.c

@@ -13,7 +13,5 @@ protected func Hit()
 	return 1;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-	SetProperty("Collectible", 1, def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Ice.c4d/Script.c

@@ -30,7 +30,5 @@ private func Freeze()
 	}
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Loam.c4d/Script.c

@@ -12,11 +12,6 @@ protected func Construction()
 		SetGraphics(Format("%d",graphic));
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
-
 // Impact sound
 func Hit()
 {
@@ -132,3 +127,6 @@ private func LoamDone(object clonk)
 	// Remove Effect
 	RemoveEffect("IntBridge", clonk);
 }
+
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Metal.c4d/Script.c

@@ -12,6 +12,4 @@ protected func Hit()
 	return 1;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Ore.c4d/Script.c

@@ -12,7 +12,5 @@ protected func Hit()
 	Sound("RockHit");
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Rock.c4d/Script.c

@@ -13,7 +13,5 @@ protected func Hit()
 	return 1;
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Snow.c4d/Script.c

@@ -24,7 +24,5 @@ private func Hit()
 	RemoveObject();
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Sulphur.c4d/Script.c

@@ -12,7 +12,5 @@ protected func Hit()
 	Sound("CrystalHit*");
 }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Resources.c4d/Wood.c4d/Script.c

@@ -14,7 +14,5 @@ func Incineration()
 public func IsFuel() { return 1; }
 public func GetFuelAmount() { return 30; }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Axe.c4d/Script.c

@@ -24,7 +24,5 @@ public func IsTool() { return 1; }
 
 public func IsToolProduct() { return 1; }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Balloon.c4d/BalloonDeployed.c4d/Script.c

@@ -114,8 +114,7 @@ private func FxFloatTimer(object target, int num, int time)
 	}
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 
 Float = {
 	Prototype = Action,
@@ -150,6 +149,5 @@ Deflate = {
 	EndCall = "Pack",
 	Animation = "Deflate",
 },
-}, def);
-	SetProperty("Name", "$Name$",def);
-}
+};
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Balloon.c4d/Script.c

@@ -26,7 +26,5 @@ func FxNoDropTimer(object target, int num, int timer)
 	}
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$" ,def);
-	SetProperty("Collectible", 1, def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Barrel.c4d/Script.c

@@ -108,7 +108,6 @@ protected func Collection(object obj, bool put)
 
 public func IsToolProduct() { return 1; }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";
+

planet/Objects.c4d/Items.c4d/Tools.c4d/Boompack.c4d/Script.c

@@ -206,8 +206,7 @@ func GetFuel()
 }
 
 func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-	SetProperty("Collectible",1, def);
 	SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(30,0,0,1),Trans_Rotate(-30,1,0,0),Trans_Scale(1300)),def);
 }
-
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/PowerLine.c4d/Script.c

@@ -44,8 +44,7 @@ private func BreakMessage()
 	pLine->Message("$TxtLinebroke$");
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 Connect = {
 Prototype = Action,
 Name = "Connect",
@@ -53,6 +52,6 @@ Length = 0,
 Delay = 0,
 Procedure = DFA_CONNECT,
 NextAction = "Connect",
-},  }, def);
-	SetProperty("Name", "$Name$", def);
-}
+},
+};
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/Script.c

@@ -65,6 +65,4 @@ private func Find_PowerLine(object pObject)
 	return [C4FO_Func, "IsConnectedTo", pObject];
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Dynamite.c4d/Script.c

@@ -121,28 +121,26 @@ public func DoExplode()
 	Explode(18);
 }
 
-protected func Definition(def) {
-	def["Name"] = "Dynamite";
-	def["ActMap"] = {
-			Fuse = {
-				Prototype = Action,
-				Name = "Fuse",
-				Procedure = DFA_NONE,
-				NextAction = "Fuse",
-				Delay = 1,
-				Length = 1,
-				FacetBase = 1,
-				Sound = "Fusing",
-				StartCall = "Fusing"
-			},
-			Ready = {
-				Prototype = Action,
-				Name = "Ready",
-				Procedure = DFA_NONE,
-				NextAction = "Ready",
-				Delay = 1,
-				Length = 1,
-				FacetBase = 1,
-			}
-		};
-}
+local ActMap = {
+	Fuse = {
+		Prototype = Action,
+		Name = "Fuse",
+		Procedure = DFA_NONE,
+		NextAction = "Fuse",
+		Delay = 1,
+		Length = 1,
+		FacetBase = 1,
+		Sound = "Fusing",
+		StartCall = "Fusing"
+	},
+	Ready = {
+		Prototype = Action,
+		Name = "Ready",
+		Procedure = DFA_NONE,
+		NextAction = "Ready",
+		Delay = 1,
+		Length = 1,
+		FacetBase = 1,
+	}
+};
+local Name = "Dynamite";

planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Fuse.c4d/Script.c

@@ -96,8 +96,7 @@ func FxIntFusingTimer()
 
 public func IsFuse() { return true; }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 		Connect = {
 		Prototype = Action,
 		Name = "Connect",
@@ -113,6 +112,6 @@ func Definition(def) {
 		Delay = 0,
 		Procedure = DFA_NONE,//CONNECT,
 		NextAction = "Fusing",
-	},  }, def);
-	SetProperty("Name", "$Name$", def);
-}
+	},
+};
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Igniter.c4d/Script.c

@@ -74,7 +74,8 @@ public func ResetClonk(clonk)
 }
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Scale(), def); // Hide it TODO: Remove if the mesh isn't shown if there is a picture set
 }
+local Collectible = 1;
+local Name = "$Name$";
+

planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Script.c

@@ -157,7 +157,7 @@ func FxIntLengthStop(pTarget, iNumber, iReason, fTmp)
 }
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Scale(), def); // Hide it TODO: Remove if the mesh isn't shown if there is a picture set
 }
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Hook.c4d/Script.c

@@ -131,6 +131,4 @@ public func OnRopeBreak()
 	return;
 }
 
-protected func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Rope.c4d/Script.c

@@ -179,10 +179,11 @@ public func BreakRope()
 	return;
 }
 
-protected func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-	SetProperty("LineColors", [RGB(66,33,00) , RGB(66,33,00)], def);
-	SetProperty("ActMap", {
+func Definition(def)
+{
+	def.LineColors = [RGB(66,33,00), RGB(66,33,00)];
+}
+local ActMap = {
 		ConnectFree = {
 			Prototype = Action,
 			Name = "ConnectFree",
@@ -200,5 +201,5 @@ protected func Definition(def) {
 			NextAction = "ConnectPull",
 			StartCall = "PullObjects",
 		},
-	}, def);
-}
+};
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Script.c

@@ -170,6 +170,6 @@ public func Reset(clonk)
 }
 
 func Definition(def) {
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(-700,400),Trans_Scale(1150),Trans_Rotate(180,0,1,0),Trans_Rotate(-30,-1,0,-1)),def);
-}
+}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Hammer.c4d/Script.c

@@ -77,7 +77,7 @@ public func IsTool() { return 1; }
 public func IsToolProduct() { return 1; }
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Rotate(20,1,0,1),def);
 }
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/JarOfWinds.c4d/Script.c

@@ -143,6 +143,4 @@ private func FireWeapon(object pClonk,iX,iY)
 	}
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/OrbOfTelekinesis.c4d/Script.c

@@ -94,6 +94,4 @@ protected func FxChargeTimer(object pTarget, int iEffectNumber, int iEffectTime)
 	}
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Pickaxe.c4d/Script.c

@@ -26,8 +26,6 @@ public func GetCarryTransform()
 //wants to make that, good luck! :)
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Mul(Trans_Rotate(40, 0, 0, 1),Trans_Rotate(150, 0, 1, 0), Trans_Scale(900), Trans_Translate(600, 400, 1000)),def);
 }
 
@@ -207,3 +205,6 @@ public func Reset(clonk)
 public func IsTool() { return 1; }
 
 public func IsToolProduct() { return 1; }
+
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/PowderKeg.c4d/Script.c

@@ -122,7 +122,5 @@ public func OnProjectileHit()
 func IsAlchemyProduct() { return 1; }
 func AlchemyProcessTime() { return 100; }
 
-func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
-}
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/LadderGrabber.c4d/Script.c

@@ -19,13 +19,11 @@ func GetInteractionMetaInfo(object clonk)
 	return { Description = "$GrabLadder$", IconName = nil, IconID = nil, Selected = false };
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 		Attach = {
 			Prototype = Action,
 			Name = "Attach",
 			Procedure = DFA_ATTACH,
-		},},
-	def);
-	SetProperty("Name", "$Name$", def);
-}
+		},
+};
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/Script.c

@@ -399,5 +399,5 @@ Hanging = {
 	Prototype = Action,
 	Name = "Hanging"
 },}, def);
-	SetProperty("Name", "$Name$", def);
-}
+}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Tools.c4d/Shovel.c4d/Script.c

@@ -145,7 +145,8 @@ public func IsTool() { return 1; }
 public func IsToolProduct() { return 1; }
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(135, 0, 0, 1),Trans_Rotate(30, 0, 1, 0)),def);
 }
+
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c

@@ -149,6 +149,4 @@ func RejectEntrance()
 	return _inherited(...);
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Script.c

@@ -224,6 +224,7 @@ func Deselection()
 }
 */
 func Definition(def) {
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(-2000,-3000,-2000),Trans_Rotate(180,0,1,0),Trans_Rotate(-25,1,0,1)),def);
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Weapons.c4d/Club.c4d/Script.c

@@ -111,7 +111,8 @@ public func IsTool() { return 1; }
 public func IsToolProduct() { return 1; }
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Rotate(-30,0,0,1),def);
 }
+
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Weapons.c4d/Javelin.c4d/Script.c

@@ -215,7 +215,8 @@ protected func FxFlightStop(object pTarget,int iEffectNumber)
 }
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation", Trans_Mul(Trans_Rotate(40,0,0,1),Trans_Rotate(-10,1,0,0)),def);
 }
+
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Ammo.c4d/Script.c

@@ -107,8 +107,7 @@ public func TrailColor(int time)
 	return RGBa(255,255,255,240*Max(0,FlightTime()-time)/FlightTime());
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 
 	Travel = {
 		Prototype = Action,
@@ -119,6 +118,6 @@ func Definition(def) {
 		Delay = 1,
 		FacetBase = 1,
 		StartCall = "Traveling"
-	}}, def);
-	SetProperty("Name", "$Name$", def);
-}
+	},
+};
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/BulletTrail.c4d/Script.c

@@ -113,8 +113,7 @@ public func DrawTransform() {
 	);
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 
 Travel = {
 	Prototype = Action,
@@ -130,5 +129,5 @@ Travel = {
 	OffX = 0,
 	OffY = 2,
 	StartCall = "Traveling"
-}}, def);
-}
+},
+};

planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Script.c

@@ -168,6 +168,7 @@ func RejectCollect(id shotid, object shot)
 }
 
 func Definition(def) {
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(1500,0,-1500),Trans_Rotate(170,0,1,0),Trans_Rotate(30,0,0,1)),def);
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Items.c4d/Weapons.c4d/Shield.c4d/Script.c

@@ -143,7 +143,8 @@ public func GetCarryTransform(clonk, sec, back)
 local mTrans;
 
 func Definition(def) {
-	SetProperty("Collectible", 1, def);
-	SetProperty("Name", "$Name$", def);
 	SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(1000,-500),Trans_Rotate(20,1,1,-1),Trans_Scale(1200)),def);
 }
+
+local Collectible = 1;
+local Name = "$Name$";

planet/Objects.c4d/Libraries.c4d/Animal.c4d/Script.c

@@ -86,6 +86,4 @@ protected func RejectEntrance(object pContainer)
 	return 1;// !Library_Animal_IsCollectible(pContainer); TODO create this rule :-)
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Libraries.c4d/Base.c4d/BaseMaterial.c4d/Script.c

@@ -3,10 +3,6 @@
 // Author: Randrian
 // TODO -> torough explanation how to use it
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
-
 func Initialize()
 {
 	var iPlrNumber = GetOwner()%4+1;
@@ -176,4 +172,6 @@ public func DoDoHomebaseProduction (id idID, int iChange)
 		iIndex++;
 	}
 	return false;
-}
+}
+
+local Name = "$Name$";

planet/Objects.c4d/Libraries.c4d/Base.c4d/Script.c

@@ -6,10 +6,6 @@
 local fIsBase;
 local iEnergy;
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
-
 // ---------------- Settings for base funcionallity --------------------
 // --- these functions can be overloaded for vendors or special bases ---
 
@@ -440,3 +436,5 @@ global func GetBase ()
 	if(!(this->~IsBase())) return NO_OWNER;
 	return GetOwner();
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Libraries.c4d/DoorControl.c4d/Script.c

@@ -61,6 +61,4 @@ func Collection2(obj)
 	return _inherited (obj);
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Libraries.c4d/HasExtraSlot.c4d/Script.c

@@ -19,7 +19,4 @@ func Collection2() { NotifyHUD(); return _inherited(...); }
 func Ejection() { NotifyHUD(); return _inherited(...); }
 func Departure() { if (Contents(0)) Contents(0)->Exit(); return _inherited(...); }
 
-func Definition(def) 
-{
-	SetProperty("Name", "ExtraSlot", def);
-}
+local Name = "ExtraSlot";

planet/Objects.c4d/Libraries.c4d/ItemContainer.c4d/Script.c

@@ -116,7 +116,4 @@ private func Exchange(object chest_content, object clonk_content, object clonk,
 		clonk_content->Enter(this);
 }
 
-protected func Definition(def) 
-{
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Libraries.c4d/Scoreboard.c4d/Death.c4d/Script.c

@@ -71,7 +71,4 @@ public func GetDeathCol()
 	return 101;
 }
 
-protected func Definition(def)
-{
-	SetProperty("Name", "Scoreboard Deaths", def);
-}
+local Name = "Scoreboard Deaths";

planet/Objects.c4d/Libraries.c4d/Scoreboard.c4d/Kill.c4d/Script.c

@@ -83,8 +83,5 @@ public func GetKillCol()
 	//return ScoreboardCol(Scoreboard_Kill);
 	return 107;
 }
-	
-protected func Definition(def)
-{
-	SetProperty("Name", "Scoreboard Kills", def);
-}
+
+local Name = "Scoreboard Kills";

planet/Objects.c4d/Libraries.c4d/Scoreboard.c4d/KillStreak.c4d/Script.c

@@ -87,8 +87,5 @@ public func GetKillStreakCol()
 	//return ScoreboardCol(Scoreboard_KillStreak);
 	return 109;
 }
-	
-protected func Definition(def)
-{
-	SetProperty("Name", "Scoreboard Kill streaks", def);
-}
+
+local Name = "Scoreboard Kill streaks";

planet/Objects.c4d/Libraries.c4d/Scoreboard.c4d/Player.c4d/Script.c

@@ -38,7 +38,4 @@ protected func RemovePlayer(int plr)
 
 /*-- Misc --*/
 
-protected func Definition(def)
-{
-	SetProperty("Name", "Scoreboard Players", def);
-}
+local Name = "Scoreboard Players";

planet/Objects.c4d/Libraries.c4d/Scoreboard.c4d/Relaunch.c4d/Script.c

@@ -83,8 +83,5 @@ public func RelaunchCount()
 {
 	return 5;
 }
-	
-protected func Definition(def)
-{
-	SetProperty("Name", "Scoreboard Relaunches", def);
-}
+
+local Name = "Scoreboard Relaunches";

planet/Objects.c4d/Rules.c4d/Energy.c4d/Script.c

@@ -6,6 +6,4 @@ protected func Activate(int iByPlayer)
 	return true;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Rules.c4d/Restart.c4d/Script.c

@@ -11,6 +11,4 @@ func Activate(int plr)
 		clonk->RemoveObject();
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Structures.c4d/Chest.c4d/Script.c

@@ -52,6 +52,7 @@ private func Close()
 
 protected func Definition(def) 
 {
-	SetProperty("Name", "$Name$", def);
-	SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(0,-3000,-5000),Trans_Rotate(-30,1,0,0),Trans_Rotate(30,0,1,0),Trans_Translate(1000,1,0)),def);
+		SetProperty("PictureTransformation", Trans_Mul(Trans_Translate(0,-3000,-5000), Trans_Rotate(-30,1,0,0), Trans_Rotate(30,0,1,0), Trans_Translate(1000,1,0)),def);
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Structures.c4d/SteamEngine.c4d/Script.c

@@ -66,8 +66,7 @@ func ConsumeFuel()
 	}
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 Work = {
 	Prototype = Action,
 	Name = "Work",
@@ -83,6 +82,6 @@ Work = {
 	NextAction = "Work",
 	Animation = "Work",
 	EndCall = "ConsumeFuel",
-},  }, def);
-	SetProperty("Name", "$Name$", def);
-}
+},
+};
+local Name = "$Name$";

planet/Objects.c4d/Structures.c4d/ToolsWorkshop.c4d/Script.c

@@ -200,8 +200,7 @@ private func FindIncompleteContents(idSearched)
 	return 0;
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 Build = {
 	Prototype = Action,
 	Name = "Build",
@@ -212,7 +211,10 @@ Build = {
 	NextAction = "Build",
 	//Animation = "Turn",
 	PhaseCall="Smoking",
-},  }, def);
-	SetProperty("Name", "$Name$", def);
+},
+};
+func Definition(def) {
 	SetProperty("PictureTransformation", Trans_Mul(Trans_Translate(2000,0,7000),Trans_Rotate(-20,1,0,0),Trans_Rotate(30,0,1,0)), def);
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Structures.c4d/WindGenerator.c4d/Script.c

@@ -53,6 +53,4 @@ func Wind2Turn()
 	}
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Objects.c4d/Structures.c4d/WoodenCabin.c4d/Script.c

@@ -12,8 +12,7 @@ protected func IsBuilt()
 	return GetCon() >= 100;
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {/*
+local ActMap = {/*
 Idle = {
 	Prototype = Action,
 	Name = "Idle",
@@ -54,8 +53,10 @@ CloseDoor = {
 	StartCall = "SoundCloseDoor",
 	Animation = "CloseDoor",
 },
-}, def);
-	SetProperty("Name", "$Name$", def);
+};
+func Definition(def) {
 	SetProperty("PictureTransformation", Trans_Mul(Trans_Translate(2000,0,7000),Trans_Rotate(-20,1,0,0),Trans_Rotate(30,0,1,0)), def);
 	SetProperty("MeshTransformation", Trans_Rotate(-8,0,1,0));
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Vehicles.c4d/Cannon.c4d/Script.c

@@ -315,8 +315,7 @@ func Timer()
 	olddir = GetDir();
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 Roll = {
 	Prototype = Action,
 	Name = "Roll",
@@ -330,7 +329,11 @@ Roll = {
 	Wdt = 22,
 	Hgt = 16,
 	NextAction = "Roll",
-},	}, def);
-	SetProperty("Name", "$Name$", def);
+},
+};
+func Definitio(def)
+{
 	SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(6000,0,0),Trans_Rotate(-20,1,0,0),Trans_Rotate(35,0,1,0),Trans_Scale(1350)),def);
 }
+
+local Name = "$Name$";

planet/Objects.c4d/Vehicles.c4d/Lorry.c4d/Script.c

@@ -94,8 +94,7 @@ func TurnWheels()
 	}
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 		Drive = {
 			Prototype = Action,
 			Name = "Drive",
@@ -111,7 +110,11 @@ func Definition(def) {
 			NextAction = "Drive",
 			//Animation = "Drive",
 		},  
-	}, def);
-	SetProperty("Name", "$Name$", def);
+};
+
+func Definition(def)
+{
 	SetProperty("PictureTransformation",Trans_Mul(Trans_Rotate(-25,1,0,0),Trans_Rotate(40,0,1,0)),def);
 }
+
+local Name = "$Name$";

planet/Tests.c4f/Clonk50.c4s/FireGlobe.c4d/Path.c4d/Script.c

@@ -28,8 +28,7 @@ public func Set(int sx, int sy, int ex, int ey) {
 
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 	
 Vis = {
 	Prototype = Action,
@@ -43,7 +42,6 @@ Vis = {
 	OffX = -16,
 	OffY = 0,
 	NextAction = "Hold"
-	},  }, def);
-	
-	SetProperty("Name", "Path", def);
-}
+	},
+};
+local Name = "Path";

planet/Tests.c4f/Clonk50.c4s/FireGlobe.c4d/Script.c

@@ -203,6 +203,4 @@ global func Intersect(int Ax, int Ay, int Bx, int By, int Px, int Py, int Qx, in
 	return true;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Tests.c4f/Lines.c4s/FireGlobe.c4d/Path.c4d/Script.c

@@ -28,8 +28,7 @@ public func Set(int sx, int sy, int ex, int ey) {
 
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 Vis = {
 	Prototype = Action,
 	Name = "Vis",
@@ -43,7 +42,5 @@ Vis = {
 	OffY = 0,
 	NextAction = "Hold"
 	},
-}, def);
-	
-	SetProperty("Name", "Path", def);
-}
+};
+local Name = "Path";

planet/Tests.c4f/Lines.c4s/FireGlobe.c4d/Script.c

@@ -203,6 +203,4 @@ global func Intersect(int Ax, int Ay, int Bx, int By, int Px, int Py, int Qx, in
 	return true;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Tests.c4f/RingmenuTest.c4s/FireGlobe.c4d/Path.c4d/Script.c

@@ -28,8 +28,7 @@ public func Set(int sx, int sy, int ex, int ey) {
 
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap = {
 	
 Vis = {
 	Prototype = Action,
@@ -43,7 +42,6 @@ Vis = {
 	OffX = -16,
 	OffY = 0,
 	NextAction = "Hold"
-	},  }, def);
-	
-	SetProperty("Name", "Path", def);
-}
+	},
+};
+local Name = "Path";

planet/Tests.c4f/RingmenuTest.c4s/FireGlobe.c4d/Script.c

@@ -203,6 +203,4 @@ global func Intersect(int Ax, int Ay, int Bx, int By, int Px, int Py, int Qx, in
 	return true;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Tests.c4f/RingmenuTest.c4s/ObjectFade.c4d/Script.c

@@ -61,6 +61,4 @@ public func FxIntFadeOutTimerEffect(string new_effect_name) {
 		return -1;
 }
 
-func Definition(def) {
-	SetProperty("Name", "$Name$", def);
-}
+local Name = "$Name$";

planet/Tests.c4f/RingmenuTest.c4s/Relaunch.c4d/Script.c

@@ -53,7 +53,4 @@ public func Selected(object menu, object selector)
 	return 0;
 }
 
-
-func Definition(def) {
-	SetProperty("Name", "relaunch", def);
-}
+local Name = "relaunch";

planet/Tests.c4f/Windmill.c4s/BigBoomattack.c4d/Script.c

@@ -98,8 +98,7 @@ func DoFireworks()
 	Explode(50);
 }
 
-func Definition(def) {
-	SetProperty("ActMap", {
+local ActMap =  {
 
 	Fly = {
 		Prototype = Action,
@@ -110,5 +109,4 @@ func Definition(def) {
 		Wdt = 60,
 		Hgt = 100
 	},
-	}, def);
-}
+};