sandbox: add english translations and clean up scripts

planet/Tutorials.ocf/Sandbox.ocs/DescDE.txt

@@ -1,3 +1,5 @@
+Sandkasten
+
 Eine Karte zum Unfug treiben, ohne wenn und aber. Hier kannst du dich nach Lust und Laune austoben und kannst hier alles ausprobieren, was du möchtest.
 
 Folgende Werkzeuge stehen dir hier zur Verfügung:

planet/Tutorials.ocf/Sandbox.ocs/DescUS.txt

@@ -1,3 +1,5 @@
+Sandbox
+
 A scenario to play around with all the cool stuff.
 
 The following tools can be used:

planet/Tutorials.ocf/Sandbox.ocs/DevilsHand.ocd/Script.c

@@ -1,34 +1,28 @@
-
-/*
-
-	Devils's Hand, a tool to remove objects.
+/**
+	Devils's Hand
+	A tool to remove objects.
 	
-	@author: K-Pone
-
+	@author K-Pone
 */
 
 
 local Name = "$Name$";
 local Description = "$Description$";
 
-func Initialize()
+public func ControlUse(object clonk, int x, int y)
 {
-	
-}
-
-func ControlUse(object clonk, x, y)
-{
-	var dummy = clonk->CreateObject(Dummy, x, y); // Dummy is only needed to have a reference point for Find_Distance
-	var remobj = dummy->FindObject(Find_Distance(5), Find_NoContainer(), Find_Not(Find_ID(Clonk)));
-	dummy->RemoveObject();
-	
+	var remobj = clonk->FindObject(Find_Distance(5, x, y), Find_NoContainer(), Find_Not(Find_ID(Clonk)));
 	if (!remobj)
 	{
 		Sound("UI::Error");
 		return;
 	}
-	
 	remobj->RemoveObject();
-	
 	Sound("UI::Click", true, nil, clonk->GetOwner());
+	return true;
+}
+
+public func QueryRejectDeparture(object clonk)
+{
+	return true;
 }

planet/Tutorials.ocf/Sandbox.ocs/GodsHand.ocd/Script.c

@@ -1,35 +1,32 @@
-
-/*
-
-	God's Hand, a tool to create objects.
+/**
+	God's Hand
+	A tool to create objects.
 	
-	@author: K-Pone
-
+	@author K-Pone
 */
 
 
 local Name = "$Name$";
 local Description = "$Description$";
 
-func Initialize()
-{
-	
-}
-
-func ControlUse(object clonk, x, y)
+public func ControlUse(object clonk, int x, int y)
 {
 	var objdef = clonk.ObjectSpawnDefinition;
-	
-	
 	if (objdef == Marker)
 	{
 		var marker = clonk->PlaceNewMarker();
-		if (marker) marker->SetPosition(clonk->GetX() + x, clonk->GetY() + y);
+		if (marker)
+			marker->SetPosition(clonk->GetX() + x, clonk->GetY() + y);
 	}
 	else
 	{
 		clonk->CreateObject(objdef, x, y);
 	}
-	
 	Sound("UI::Click", true, nil, clonk->GetOwner());
+	return true;
+}
+
+public func QueryRejectDeparture(object clonk)
+{
+	return true;
 }

planet/Tutorials.ocf/Sandbox.ocs/Map.c

@@ -1,4 +1,9 @@
+/**
+	Sandbox
+	Map drawing for sandbox scenario.
 
+	@author K_Pone
+*/
 
 func InitializeMap(proplist map)
 {

planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/Script.c

@@ -1,10 +1,7 @@
-
-/*
-
+/**
 	Marker
 	
-	@author: K-Pone
-
+	@author K-Pone
 */
 
 local Name = "$Name$";
@@ -13,13 +10,13 @@ local Description = "$Description$";
 local markerindex;
 local respawnmarker = false;
 
-func Initialize()
+public func Initialize()
 {
 	this.Visibility = VIS_Owner | VIS_God;
 	SetGraphics(nil, Dummy);
 }
 
-func SetIcon(number)
+public func SetIcon(number)
 {
 	markerindex = number;
 	SetGraphics(Format("%d", number), Icon_Number, 1, GFXOV_MODE_Base);
@@ -27,24 +24,24 @@ func SetIcon(number)
 	SetClrModulation(RGBa(255, 255, 255, 160) , 1);
 }
 
-func GetIndex()
+public func GetIndex()
 {
 	return markerindex;
 }
 
-func IsIndex(index)
+public func IsIndex(index)
 {
 	return index == markerindex;
 }
 
-func IsRespawnMarker() { return respawnmarker; }
+public func IsRespawnMarker() { return respawnmarker; }
 
-global func GetMarkerForIndex(index, plr)
+global func GetMarkerForIndex(int index, int plr)
 {
 	return FindObject(Find_ID(Marker), Find_Owner(plr), Find_Func("IsIndex", index));
 }
 
-global func GetNextFreeMarkerIndex(plr)
+global func GetNextFreeMarkerIndex(int plr)
 {
 	for (var i = 0; i <= 9; i++)
 	{

planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/StringTblDE.txt

@@ -1,2 +1,2 @@
 Name=Marker
-Description=Ein einfacher Marker oder Wegpunkt
+Description=Ein einfacher Marker oder Wegpunkt.

planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/StringTblUS.txt

@@ -1,2 +1,2 @@
 Name=Marker
-Description=A simple Marker or Waypoint
+Description=A simple marker or waypoint.

planet/Tutorials.ocf/Sandbox.ocs/Scenario.txt

@@ -1,5 +1,5 @@
 [Head]
-Title=Sandbox Reloaded
+Title=Sandbox
 Icon=17
 
 [Landscape]

planet/Tutorials.ocf/Sandbox.ocs/Script.c

@@ -1,20 +1,16 @@
-
-/*
-
-	Sandbox Reloaded
-	
-	@author: K-Pone
-
+/**
+	Sandbox	
+	Author: K-Pone
 */
 
-func Initialize()
+public func Initialize()
 {
 	if (!MapGenSizeWidth) MapGenSizeWidth = 80;
 	if (!MapGenSizeHeight) MapGenSizeHeight = 50;
 	if (!MapGenPreset) MapGenPreset = "FlatLand";
 }
 
-func InitializePlayer(int plr)
+public func InitializePlayer(int plr)
 {
 	var crew = GetCrew(plr);
 	crew->ShowSandboxUI();
@@ -29,7 +25,7 @@ func InitializePlayer(int plr)
 	crew.MaxContentsCount = 8;
 }
 
-func GiveAllKnowledge()
+public func GiveAllKnowledge()
 {
 	var i, id;
 	while (id = GetDefinition(i++))

planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/Script.c

@@ -1,4 +1,8 @@
-/* Spray can */
+/**
+	Spray can
+	
+	@author K-Pone, Sven2	
+*/
 
 local last_x, last_y, last_ldx, last_ldy;
 local paint_col;

planet/Tutorials.ocf/Sandbox.ocs/System.ocg/Clonk_SandboxUI.c

@@ -2126,6 +2126,6 @@ func RemoveMarker(marker)
 func GoToMarker(marker)
 {
 	this->SetPosition(marker->GetX(), marker->GetY());
-	this->Sound("warp");
+	this->Sound("Warp");
 	this->Fireworks();
 }

planet/Tutorials.ocf/Sandbox.ocs/System.ocg/StringTblUS.txt

@@ -0,0 +1,93 @@
+TooltipObjectspawn=Spawn objects
+TooltipLandscapeBrush=Draw landscape
+TooltipMarker=Marker
+TooltipMapGen=Map generator
+TooltipTweaks=Cheats and other cool stuff
+GodsHandDisplayTT=Dieses Objekt wird mit der Hand Gottes platziert (zum Ändern \"Objekte erzeugen\" aufrufen und \"Hand Gottes\" als Ziel auswählen)
+
+OSCatProductionResources=Resources
+OSCatFoodstuff=Nutrition
+OSCatLiquids=Liquids
+OSCatTools=Tools
+OSCatWeapons=Weapons
+OSCatExplosives=Explosives
+OSCatVehicles=Vehicles
+OSCatAnimals=Animals
+OSCatPlants=Plants
+OSCatGodTools=God's tools
+
+OSHintTarget=Tipp! Du kannst hiermit einstellen, wo du Objekte erzeugen möchtest. Stelle dies auf \"Hand Gottes\" um auszuwählen, welches Objekt du mit der Hand Gottes erzeugen möchtest.
+
+OSTargetClonk=Ziel: Clonk/Inventar
+OSTargetGodsHand=Ziel: Hand Gottes
+OSTargetClonkTT=Das Objekt wird (wenn möglich) im Inventar des Clonks erzeugt
+OSTargetGodsHandTT=Das Objekt kann mit der Hand Gottes erzeugt werden
+
+MatEarth=Earth
+MatEarthSpongy=Earth (spongy)
+MatEarthRoot=Earth (root)
+MatSand=Sand
+MatSandDry=Dry sand
+MatIce=Ice
+MatIce2=Ice (different)
+MatSnow=Snow
+MatRock=Rock
+MatRockSmooth=Rock (smooth)
+MatGranite=Granite
+MatOre=Ore
+MatGold=Gold
+MatCoal=Coal
+MatFirestone=Firestone
+MatRuby=Ruby
+MatAmethyst=Amethyst
+MatAshes=Ashes
+MatBrick=Brick
+MatBrickSoft=Brick (soft)
+MatEverrock=Everrock
+MatWater=Water
+MatAcid=Acid
+MatLava=Lava
+MatDuroLava=Magma
+MatOil=Oil
+MatTunnel=Tunnel (background)
+MatTunnelBrick=Brick tunnel (background)
+
+MatBgSky=Sky
+MatBgTunnel=Tunnel
+MatBgBricks=Brick
+
+MBMaterialFg=Material
+MBMaterialBg=Background material
+MBBrushSize=Brush size
+MBBrushMode=Brush mode
+
+MBBrushModeBrush=Brush
+MBBrushModeQuad=Square
+MBBrushModeErase=Eraser
+
+MarkerNotSet=Marker not set
+PlaceMarker=Set marker
+RemoveMarker=Remove marker
+GoToMarker=Teleport
+
+MapGenButtonGenerate=Generate map!
+MapGenSizeWidth=map width
+MapGenSizeHeight=map height
+MapGenMapType=map type
+
+MapGenTPCustom=Modify
+MapGenTPFlatLand=Flatland
+MapGenTPSkylands=Skylands
+MapGenTPCaves=Caves
+
+TweakInvincible=Invincibility (Gott-Modus)
+OptActivate=Activate
+OptDeactivate=Deactivate
+TweakInvincible_Activated=%s is now invincible
+TweakInvincible_Deactivated=%s is not invincible
+
+TweakSkinChoose=Choose skin
+OptSkin1=Adventurere
+OptSkin2=Steampunk
+OptSkin3=Alchemist
+OptSkin4=Farmer

planet/Tutorials.ocf/Sandbox.ocs/Teleporter.ocd/Script.c

@@ -1,34 +1,30 @@
-
-/*
-
+/**
 	Teleporter
 	
-	@Author: K-Pone
-
+	@author K-Pone
 */
 
 local Name = "$Name$";
 local Description = "$Description$";
 
-func Initialize()
-{
-	
-}
 
-func ControlUse(object clonk, x, y)
+public func ControlUse(object clonk, int x, int y)
 {
-	var gx, gy;
-	
-	gx = clonk->GetX() + x;
-	gy = clonk->GetY() + y;
+	var gx = clonk->GetX() + x;
+	var gy = clonk->GetY() + y;
 	
 	if (gx < 0 || gx >= LandscapeWidth() || gy < 0 || gy >= LandscapeHeight())
 	{
 		clonk->Sound("UI::Error");
-		return;
+		return true;
 	}
-	
 	clonk->SetPosition(gx, gy);
 	clonk->Fireworks();
-	clonk->Sound("warp");
+	clonk->Sound("Warp");
+	return true;
+}
+
+public func QueryRejectDeparture(object clonk)
+{
+	return true;
 }