container

Author: PXshadow

notes.txt

@@ -1,3 +1,5 @@
+SlotVert handles rotation of slotted objects
+
 Animations
 xOscPerSec= move left and right over the x-axis (speed)
 xAmp = distance moved

src/Main.hx

@@ -312,10 +312,10 @@ class Main #if openfl extends Sprite #end
         }
         if (Bind.playerUse.bool)
         {
-            //program.use(selectX,selectY);
-            //player.hold();
+            program.use(selectX,selectY);
+            player.hold();
             //animation section
-            var tile:Tile = null;
+            /*var tile:Tile = null;
             var animation = objects.objectMap.get(player.instance.po_id).animation;
             trace(" map " + animation);
             if (animation != null)
@@ -330,7 +330,7 @@ class Main #if openfl extends Sprite #end
                         i++;
                     }
                 }
-            }
+            }*/
             //var record = map.animation.record;
             /*for (i in 0...record.params.length)
             {
@@ -347,6 +347,11 @@ class Main #if openfl extends Sprite #end
     {
         //fix crash
         if (player == null) return;
+        if (Bind.command)
+        {
+            mouseRightDown(null);
+            return;
+        }
         if (Bind.playerMove.bool)
         {
             program.path(selectX,selectY);
@@ -486,20 +491,22 @@ class Main #if openfl extends Sprite #end
     //add object arraqy
     public function add(array:Array<Int>,x:Int,y:Int,container:Bool=false,push:Bool=true)
     {
-        var sub:TileContainer = null;
         if (array != null) 
         {
             objects.add(array[0],x,y,array.length > 1 ? true : container,push);
             objects.containing = array.length > 1 ? array[0] : 0;
+            var index:Int = 0;
             for (i in 1...array.length)
             {
                 if (array[i] < 0)
                 {
                     //sub container
-                    objects.add(array[i] * -1,x,y,true,push);
+                    objects.add(array[i] * -1,x,y,true,push,index);
+                    index++;
                 }else{
                     //container
                     objects.add(array[i],x,y,container,push);
+                    index = 0;
                 }
             }
         }

src/game/Objects.hx

@@ -90,7 +90,7 @@ class Objects extends TileDisplay
         }
         return data;
     }
-    public function add(id:Int,x:Int=0,y:Int=0,container:Bool=false,push:Bool=true):Bool
+    public function add(id:Int,x:Int=0,y:Int=0,container:Bool=false,push:Bool=true,index:Int=0):Bool
     {
         //return false;
         if(id <= 0) return false;
@@ -184,7 +184,8 @@ class Objects extends TileDisplay
                     }else{
                         p.x = x * Static.GRID;
                         p.y = (Static.tileHeight - y) * Static.GRID;
-                        group.addTileAt(p,0);
+                        //group.addTileAt(p,0);
+                        group.addTile(p);
                     }
                 }
                 p.addTile(sprite);
@@ -200,14 +201,17 @@ class Objects extends TileDisplay
                     if (containing > 0)
                     {
                         //pos
-                        getObjectData(containing).
+                        var pos = getObjectData(containing).slotPos[index];
+                        sprite.x += pos.x;
+                        sprite.y += pos.y;
                     }
                     object.addTile(sprite);
                     sprites.push(sprite);
                 }else{
                     sprite.x += x * Static.GRID;
                     sprite.y += (Static.tileHeight - y) * Static.GRID;
-                    group.addTileAt(sprite,0);
+                    group.addTile(sprite);
+                    //group.addTileAt(sprite,0);
                     sprites.push(sprite);
                 }
             }

src/settings/Bind.hx

@@ -30,10 +30,15 @@ class Bind
     public static var settings:Action = new Action([Keyboard.ESCAPE]);
 
     public static var start:Action = new Action([Keyboard.ENTER]);
+
+    //command for right click without a mouse on mac
+    public static var command:Bool = false;
 
 
     public static function keys(e:KeyboardEvent,bool:Bool)
     {
+        if (e.keyCode == Keyboard.COMMAND) command = bool;
+        
         zoomIn.set(e,bool);
         zoomOut.set(e,bool);