Merge pull request #1487 from Catrobat/release-0.6.16

Release 0.6.16

src/Catty/Condition/WhenBackgroundChangesScript+Condition.swift

@@ -0,0 +1,42 @@
+/**
+ *  Copyright (C) 2010-2020 The Catrobat Team
+ *  (http://developer.catrobat.org/credits)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  An additional term exception under section 7 of the GNU Affero
+ *  General Public License, version 3, is available at
+ *  (http://developer.catrobat.org/license_additional_term)
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see http://www.gnu.org/licenses/.
+ */
+
+extension WhenBackgroundChangesScript: CBConditionProtocol {
+
+    func checkCondition(formulaInterpreter: FormulaInterpreterProtocol) -> Bool {
+        guard let backgroundObject = self.object.scene.objects().first else { return false }
+        guard let currentLook = backgroundObject.spriteNode.currentLook else { return false }
+
+        if currentLook.isEqual(to: self.look) {
+            return true
+        }
+        return false
+    }
+
+    func resetCondition() {
+        // nothing to do
+    }
+
+    func conditionFormulas() -> [Formula] {
+        []
+    }
+}

src/Catty/Condition/WhenConditionScript+Condition.swift

@@ -0,0 +1,44 @@
+/**
+ *  Copyright (C) 2010-2020 The Catrobat Team
+ *  (http://developer.catrobat.org/credits)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  An additional term exception under section 7 of the GNU Affero
+ *  General Public License, version 3, is available at
+ *  (http://developer.catrobat.org/license_additional_term)
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see http://www.gnu.org/licenses/.
+ */
+
+extension WhenConditionScript: CBConditionProtocol {
+
+    func checkCondition(formulaInterpreter: FormulaInterpreterProtocol) -> Bool {
+        let condition = formulaInterpreter.interpretBool(self.condition, for: self.object)
+
+        if condition && !self.preCondition {
+            return false
+        } else if !condition && !self.preCondition {
+            self.preCondition = true
+        }
+
+        return condition
+    }
+
+    func resetCondition() {
+        self.preCondition = false
+    }
+
+    func conditionFormulas() -> [Formula] {
+        self.getFormulas()
+    }
+}

src/Catty/DataModel/Array/SynchronizedArray.swift

@@ -83,6 +83,18 @@ public class SynchronizedArray<Element> {
         }
     }
 
+    public func removeAll() {
+        queue.async(flags: .barrier) {
+            self.array.removeAll()
+        }
+    }
+
+    public func removeSubrange(_ bounds: Range<Int>) {
+        queue.async(flags: .barrier) {
+            self.array.removeSubrange(bounds)
+        }
+    }
+
     public func insert(_ element: Element, at index: Int) {
         queue.async(flags: .barrier) {
             self.array.insert(element, at: index)
@@ -97,6 +109,14 @@ public class SynchronizedArray<Element> {
         return result
     }
 
+    public func enumerated() -> EnumeratedSequence<[Element]> {
+        var result: EnumeratedSequence<[Element]>?
+        queue.sync {
+            result = self.array.enumerated()
+        }
+        return result!
+    }
+
     public func contains(where predicate: (Element) throws -> Bool) rethrows -> Bool {
         var result = false
          do {

src/Catty/DataModel/Bricks/Control/BroadcastBrick.m

@@ -22,6 +22,7 @@
 
 #import "BroadcastBrick.h"
 #import "Util.h"
+#import "Pocket_Code-Swift.h"
 
 @implementation BroadcastBrick
 
@@ -43,9 +44,9 @@ - (id)initWithMessage:(NSString *)message
 - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
 {
     if(spriteObject) {
-        NSArray *messages = [Util allMessagesForProject:spriteObject.project];
+        NSOrderedSet *messages = [Util allMessagesForProject:spriteObject.scene.project];
         if([messages count] > 0)
-            self.broadcastMessage = [messages objectAtIndex:0];
+            self.broadcastMessage = [messages firstObject];
         else
             self.broadcastMessage = @"";
     }

src/Catty/DataModel/Bricks/Control/BroadcastWaitBrick.m

@@ -45,9 +45,9 @@ - (id)initWithMessage:(NSString*)message
 - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
 {
     if(spriteObject) {
-        NSArray *messages = [Util allMessagesForProject:spriteObject.project];
+        NSOrderedSet *messages = [Util allMessagesForProject:spriteObject.scene.project];
         if([messages count] > 0)
-            self.broadcastMessage = [messages objectAtIndex:0];
+            self.broadcastMessage = [messages firstObject];
         else
             self.broadcastMessage = @"";
     }

src/Catty/DataModel/Bricks/Data/AddItemToUserListBrick.m

@@ -24,7 +24,6 @@
 #import "AddItemToUserListBrick.h"
 #import "Formula.h"
 #import "Project.h"
-#import "UserDataContainer.h"
 #import "Script.h"
 
 @implementation AddItemToUserListBrick

src/Catty/DataModel/Bricks/Data/DeleteItemOfUserListBrick.m

@@ -24,7 +24,6 @@
 #import "DeleteItemOfUserListBrick.h"
 #import "Formula.h"
 #import "Project.h"
-#import "UserDataContainer.h"
 #import "Script.h"
 
 @implementation DeleteItemOfUserListBrick

src/Catty/DataModel/Bricks/Data/InsertItemIntoUserListBrick.m

@@ -24,7 +24,6 @@
 #import "InsertItemIntoUserListBrick.h"
 #import "Formula.h"
 #import "Project.h"
-#import "UserDataContainer.h"
 #import "Script.h"
 
 @implementation InsertItemIntoUserListBrick

src/Catty/DataModel/Bricks/Data/ReplaceItemInUserListBrick.m

@@ -24,7 +24,6 @@
 #import "ReplaceItemInUserListBrick.h"
 #import "Formula.h"
 #import "Project.h"
-#import "UserDataContainer.h"
 #import "Script.h"
 
 @implementation ReplaceItemInUserListBrick

src/Catty/DataModel/Bricks/Look/ChangeBrightnessByNBrick.m

@@ -65,7 +65,7 @@ - (NSString*)description
 
 - (NSString*)pathForLook:(Look*)look
 {
-    return [NSString stringWithFormat:@"%@images/%@", [self.script.object projectPath], look.fileName];
+    return [look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Resources

src/Catty/DataModel/Bricks/Look/ChangeColorByNBrick.m

@@ -65,7 +65,7 @@ - (NSString*)description
 
 - (NSString*)pathForLook:(Look*)look
 {
-    return [NSString stringWithFormat:@"%@images/%@", [self.script.object projectPath], look.fileName];
+    return [look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Resources

src/Catty/DataModel/Bricks/Look/ClearGraphicEffectBrick.m

@@ -34,7 +34,7 @@ - (kBrickCategoryType)category
 
 - (NSString*)pathForLook:(Look*)look
 {
-    return [NSString stringWithFormat:@"%@images/%@", [self.script.object projectPath], look.fileName];
+    return [look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Description

src/Catty/DataModel/Bricks/Look/NextLookBrick.m

@@ -30,7 +30,7 @@ @implementation NextLookBrick
 
 - (NSString*)pathForLook:(Look*)look
 {
-    return [NSString stringWithFormat:@"%@%@/%@", [self.script.object projectPath], kProjectImagesDirName, look.fileName];
+    return [look pathForScene:self.script.object.scene];
 }
 
 - (NSString*)brickTitle

src/Catty/DataModel/Bricks/Look/PreviousLookBrick.m

@@ -39,7 +39,7 @@ - (NSString *)brickTitle {
 
 - (NSString*)pathForLook:(Look*)look
 {
-    return [NSString stringWithFormat:@"%@%@/%@", [self.script.object projectPath], kProjectImagesDirName, look.fileName];
+    return [look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Description

src/Catty/DataModel/Bricks/Look/SetBackgroundBrick.m

@@ -33,7 +33,7 @@ - (kBrickCategoryType)category
 
 - (NSString*)pathForLook
 {
-    return [NSString stringWithFormat:@"%@%@/%@", [self.script.object projectPath], kProjectImagesDirName, self.look.fileName];
+    return [self.look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Description

src/Catty/DataModel/Bricks/Look/SetBrightnessBrick.m

@@ -60,7 +60,7 @@ - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
 
 - (NSString*)pathForLook:(Look*)look
 {
-  return [NSString stringWithFormat:@"%@images/%@", [self.script.object projectPath], look.fileName];
+  return [look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Description

src/Catty/DataModel/Bricks/Look/SetColorBrick.m

@@ -60,7 +60,7 @@ - (void)setDefaultValuesForObject:(SpriteObject*)spriteObject
 
 - (NSString*)pathForLook:(Look*)look
 {
-    return [NSString stringWithFormat:@"%@images/%@", [self.script.object projectPath], look.fileName];
+    return [look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Description

src/Catty/DataModel/Bricks/Look/SetLookBrick.m

@@ -38,7 +38,7 @@ - (kBrickCategoryType)category
 
 - (NSString*)pathForLook
 {
-    return [NSString stringWithFormat:@"%@%@/%@", [self.script.object projectPath], kProjectImagesDirName, self.look.fileName];
+    return [self.look pathForScene:self.script.object.scene];
 }
 
 #pragma mark - Description

src/Catty/DataModel/Bricks/Motion/GoToBrick.h

@@ -0,0 +1,35 @@
+/**
+ *  Copyright (C) 2010-2020 The Catrobat Team
+ *  (http://developer.catrobat.org/credits)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  An additional term exception under section 7 of the GNU Affero
+ *  General Public License, version 3, is available at
+ *  (http://developer.catrobat.org/license_additional_term)
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see http://www.gnu.org/licenses/.
+ */
+
+#import "Brick.h"
+#import "BrickStaticChoiceProtocol.h"
+
+@class SpriteObject;
+
+@interface GoToBrick : Brick<BrickStaticChoiceProtocol>
+
+@property (nonatomic) int spinnerSelection;
+@property (nonatomic, weak) SpriteObject* goToObject;
+
+- (id)initWithChoice:(int)selection;
+
+@end