diff --git a/planet/Tutorial.c4f/DescUS.rtf b/planet/Tutorial.c4f/DescUS.rtf new file mode 100644 index 000000000..a64c4880c Binary files /dev/null and b/planet/Tutorial.c4f/DescUS.rtf differ diff --git a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/DescDE.txt b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/DescDE.txt deleted file mode 100644 index 9bb279104..000000000 --- a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/DescDE.txt +++ /dev/null @@ -1 +0,0 @@ -Erste Schritte in der Welt von OpenClonk. \ No newline at end of file diff --git a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/DescUS.txt b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/DescUS.txt deleted file mode 100644 index 566874cd9..000000000 --- a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/DescUS.txt +++ /dev/null @@ -1 +0,0 @@ -The scenario is completed if all crew members have reached the flag. \ No newline at end of file diff --git a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Script.c b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Script.c index a7fdd8237..abe9c9c07 100644 --- a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Script.c +++ b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Script.c @@ -34,7 +34,7 @@ public func CreateGoalFlag(int x, int y) protected func Activate(int plr) { - return MessageWindow(GetDesc(), plr); + return MessageWindow(GetProperty("Description", this), plr); } /*-- Proplist --*/ @@ -42,4 +42,5 @@ protected func Activate(int plr) func Definition(def) { SetProperty("Name", "$Name$", def); + SetProperty("Description", "$Description$", def); } diff --git a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblDE.txt b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblDE.txt index 3db89f6bc..aa8039f18 100644 --- a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblDE.txt +++ b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblDE.txt @@ -1 +1,2 @@ Name=Reach the flag +Description=The scenario is completed if all crew members have reached the flag. diff --git a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblUS.txt b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblUS.txt index 61f14db4e..647f12b35 100644 --- a/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblUS.txt +++ b/planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/StringTblUS.txt @@ -1,2 +1,3 @@ Name=Reach the flag +Description=The scenario is completed if all crew members have reached the flag. diff --git a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/DescDE.txt b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/DescDE.txt deleted file mode 100644 index 70d566475..000000000 --- a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/DescDE.txt +++ /dev/null @@ -1 +0,0 @@ -Setzt ein Objekt zu sein vorherigen Position oder Container zurück. \ No newline at end of file diff --git a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/DescUS.txt b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/DescUS.txt deleted file mode 100644 index f9823286d..000000000 --- a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/DescUS.txt +++ /dev/null @@ -1 +0,0 @@ -Restores a lost object to its original location or container. \ No newline at end of file diff --git a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/Script.c b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/Script.c index a59b4c7a8..7a4735619 100644 --- a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/Script.c +++ b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/Script.c @@ -171,4 +171,5 @@ global func FxRestoreModeStop(object target, int num, int reason, bool temporar func Definition(def) { SetProperty("Name", "$Name$", def); + SetProperty("Description", "$Description$", def); } diff --git a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblDE.txt b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblDE.txt index 9987f2423..20d89f48a 100644 --- a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblDE.txt +++ b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblDE.txt @@ -1 +1,2 @@ Name=Objektregenerierung +Description=Setzt ein Objekt zu sein vorherigen Position oder Container zurück. diff --git a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblUS.txt b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblUS.txt index 12cfb9157..2b8d9193b 100644 --- a/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblUS.txt +++ b/planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/StringTblUS.txt @@ -1 +1,2 @@ Name=Object restorer +Description=Restores a lost object to its original location or container. diff --git a/planet/Tutorial.c4f/Tutorial01.c4s/DescUS.rtf b/planet/Tutorial.c4f/Tutorial01.c4s/DescUS.rtf new file mode 100644 index 000000000..966e180fc Binary files /dev/null and b/planet/Tutorial.c4f/Tutorial01.c4s/DescUS.rtf differ diff --git a/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/FlagGoal.c b/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/FlagGoal.c index 6ec2dd694..d3618aa05 100644 --- a/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/FlagGoal.c +++ b/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/FlagGoal.c @@ -2,6 +2,12 @@ #appendto Goal_ReachFlag +protected func Initialize() +{ + SetProperty("Description", "$NewGoalDescription$", this); + return _inherited(...); +} + public func IsFulfilled() { // No flag, goal fulfilled. @@ -12,10 +18,20 @@ public func IsFulfilled() { var balloon_count = ObjectCount(Find_ID(PracticeTarget)); if (balloon_count == 0) + { + // Balloon_count zero, hence goal fulfilled. return true; + } else - flag->Message("$MsgTargetsLeft$", balloon_count); + { + // Notify the player. + if (balloon_count == 1) + flag->Message("$MsgOneTargetLeft$"); + else + flag->Message("$MsgTargetsLeft$", balloon_count); + } } // Otherwise unfulfilled. return false; -} \ No newline at end of file +} + diff --git a/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblDE.txt b/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblDE.txt index b72322c75..c5c3a2e8a 100644 --- a/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblDE.txt +++ b/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblDE.txt @@ -1 +1,3 @@ -MsgTargetsLeft=Noch %d Ziele zum vernichten übrig. \ No newline at end of file +MsgOneTargetLeft=Noch ein Ziel zum vernichten übrig. +MsgTargetsLeft=Noch %d Ziele zum vernichten übrig. +NewGoalDescription=The scenario is completed if all targets are destroyed and your crew member has reached the flag on the far right side. \ No newline at end of file diff --git a/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblUS.txt b/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblUS.txt index cf7f0f467..a213f26c6 100644 --- a/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblUS.txt +++ b/planet/Tutorial.c4f/Tutorial03.c4s/System.c4g/StringTblUS.txt @@ -1 +1,3 @@ -MsgTargetsLeft=Still %d targets left to destroy. \ No newline at end of file +MsgOneTargetLeft=Still one target left to destroy. +MsgTargetsLeft=Still %d targets left to destroy. +NewGoalDescription=The scenario is completed if all targets are destroyed and your crew member has reached the flag on the far right side. \ No newline at end of file