From ba82f5c3ac46ddaea2e9dc94cb71a4a956e5de42 Mon Sep 17 00:00:00 2001 From: Sven Eberhardt Date: Fri, 15 Jan 2016 19:09:06 -0500 Subject: [PATCH] Raid: Fix goal descroptions and buckets in Mave's foundry. --- planet/Missions.ocf/Raid.ocs/Objects.c | 4 +++- planet/Missions.ocf/Raid.ocs/System.ocg/StringTblDE.txt | 2 +- planet/Missions.ocf/Raid.ocs/System.ocg/StringTblUS.txt | 2 +- planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/planet/Missions.ocf/Raid.ocs/Objects.c b/planet/Missions.ocf/Raid.ocs/Objects.c index f0f0d641b..80154a4e5 100644 --- a/planet/Missions.ocf/Raid.ocs/Objects.c +++ b/planet/Missions.ocf/Raid.ocs/Objects.c @@ -352,8 +352,10 @@ func InitializeObjects() Crate001->CreateContents(Hammer); ToolsWorkshop001->CreateContents(Hammer, 2); - Foundry002->CreateContents(Bucket, 3); CreateObjectAbove(Bucket, 435, 1271); + CreateObjectAbove(Bucket, 943, 775); + CreateObjectAbove(Bucket, 944, 775); + CreateObjectAbove(Bucket, 946, 775); CreateObjectAbove(Crate, 2849, 607); CreateObjectAbove(Crate, 444, 1271); diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblDE.txt b/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblDE.txt index 9b6a44587..daed81876 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblDE.txt +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblDE.txt @@ -114,7 +114,7 @@ Mave7=Wie komme ich über den See? Mave8=Du könntest meinen Hochofen nutzen, um Lehm zu bauen. Mave9=Wie funktioniert das mit dem Lehm? Mave10=Oh, das ist ganz einfach: Fülle einen Eimer{{Bucket}} mit Erde und ein Fass{{Barrel}} mit Wasser, lege beides in den Hochofen und starte die Lehmproduktion. -Mave11=Die Werkzeuge im Hochofen kannst du benutzen. +Mave11=Die Werkzeuge beim Hochofen kannst du benutzen. Mave12=Wohin führt der Fahrstuhlschacht? Mave13=Das ist der Fahrstuhl zur Kammer mit unseren Ölreserven. Leider ist der Weg von einem Vulkan geflutet. Hm. Vielleicht könnte man das Wasser aus dem See benutzen, um die Lava abzukühlen. MaveBye=Tschüss. diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblUS.txt b/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblUS.txt index 6d74eb4bd..3e0530f43 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblUS.txt +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/StringTblUS.txt @@ -114,7 +114,7 @@ Mave7=How do I cross the lake? Mave8=You could use my foundry to build some loam. Mave9=How do I build loam? Mave10=Oh, that is easy: Fill a bucket{{Bucket}} with earth and fill a barrel{{Barrel}} with water. Then put both into the foundry and produce loam. -Mave11=You can find the necessary tools in my foundry. +Mave11=You can find the necessary tools in and in front of my foundry. Mave12=Where does this elevator shaft lead? Mave13=This elevator leads to the chamber with our oil reserves. Unfortunately, the path got flooded by the volcano. Maybe water from the lake can be used to extinguish the lava? MaveBye=Bye. diff --git a/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c index 7fb8b4a5b..cf4148d91 100644 --- a/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c @@ -128,14 +128,14 @@ public func IsFulfilled() { return true; } // Overload: return the current description for this goal. public func GetDescription(int plr) { - return "WARNING: GetDescription(int plr) not overloaded by goal"; + return this.Description ?? "WARNING: GetDescription(int plr) not overloaded by goal"; } protected func Activate(plr) { if (IsFulfilled()) return(MessageWindow("$MsgGoalFulfilled$", plr)); - return MessageWindow(GetProperty("Description"), plr); + return MessageWindow(this->GetDescription(plr)); } // Scenario sacing