made all item templates (#12)

Author: fabio-t

data/items.yml

@@ -22,19 +22,28 @@ branch:
     damage: 1
   sprite:
     c: '/'
-    col: 5987163 # change
+    col:
+      red: 141
+      green: 104
+      blue: 21
 
 vine:
   name: a thin, flexible branch
   sprite:
     c: 239
-    col: 5987163 # change
+    col:
+      red: 36
+      green: 122
+      blue: 7
 
 trunk:
   name: a fallen tree
   sprite:
-    c: '-' # change
-    col: 5987163 # change
+    c: 22
+    col:
+      red: 141
+      green: 104
+      blue: 21
 
 boulder:
   name: a big boulder
@@ -45,7 +54,20 @@ boulder:
       green: 88
       blue: 88
     shadowView: true
-  obstacle: true
+  obstacle: {}
+  crushable: {}
+
+tree:
+  name: a mature tree
+  sprite:
+    c: T
+    col:
+      red: 0
+      green: 205
+      blue: 113
+    shadowView: true
+  obstacle: {}
+  cuttable: {}
 
 sharp-stone:
   name: a sharp stone
@@ -55,8 +77,11 @@ sharp-stone:
     damageType: SLASH
     damage: 2
   sprite:
-    c: 'o' # change
-    col: 5987163 # change
+    c: 4
+    col:
+      red: 88
+      green: 88
+      blue: 88
 
 small-sharp-stone:
   name: a small, sharp stone
@@ -66,8 +91,11 @@ small-sharp-stone:
     damageType: POINT
     damage: 2
   sprite:
-    c: 'o' # change
-    col: 5987163 # change
+    c: 17
+    col:
+      red: 88
+      green: 88
+      blue: 88
 
 stone-hammer:
   name: a stone hammer
@@ -77,8 +105,11 @@ stone-hammer:
     damageType: BLUNT
     damage: 4
   sprite:
-    c: 'o' # change
-    col: 5987163 # change
+    c: 209
+    col:
+      red: 141
+      green: 104
+      blue: 21
 
 stone-axe:
   name: a stone axe
@@ -88,8 +119,11 @@ stone-axe:
     damageType: SLASH
     damage: 4
   sprite:
-    c: 'o' # change
-    col: 5987163 # change
+    c: 184
+    col:
+      red: 141
+      green: 104
+      blue: 21
 
 stone-spear:
   name: a stone spear
@@ -99,5 +133,8 @@ stone-spear:
     damageType: POINT
     damage: 4
   sprite:
-    c: 'o' # change
-    col: 5987163 # change
+    c: 244
+    col:
+      red: 141
+      green: 104
+      blue: 21

src/main/java/com/github/fabioticconi/alone/components/Tree.java renamed to src/main/java/com/github/fabioticconi/alone/components/Cuttable.java

@@ -24,6 +24,6 @@
  * Author: Fabio Ticconi
  * Date: 07/10/17
  */
-public class Tree extends Component
+public class Cuttable extends Component
 {
 }

src/main/java/com/github/fabioticconi/alone/components/LightBlocker.java

@@ -22,12 +22,9 @@
 
 /**
  * Author: Fabio Ticconi
- * Date: 13/11/17
+ * Date: 10/09/17
  */
 public class Obstacle extends Component
 {
-    public Obstacle(final boolean state)
-    {
-
-    }
+    // TODO eventually, we might need a parameter to say: "this only blocks light, not movement"
 }

src/main/java/com/github/fabioticconi/alone/components/Obstacle.java

@@ -52,6 +52,7 @@ public class BootstrapSystem extends PassiveSystem
     MapSystem   sMap;
     TreeSystem  sTree;
     CrushSystem sCrush;
+    ItemSystem  sItems;
     MapSystem   map;
 
     PlayerManager pManager;
@@ -297,7 +298,7 @@ protected void initialize()
                     if (!map.obstacles.isEmpty(x, y))
                         continue;
 
-                    sTree.makeTree(x, y);
+                    sItems.makeItem("tree", x, y);
                 }
             }
         }
@@ -319,7 +320,7 @@ protected void initialize()
                     if (!map.obstacles.isEmpty(x, y))
                         continue;
 
-                    sCrush.makeBoulder(x, y);
+                    sItems.makeItem("boulder", x, y);
                 }
             }
         }
@@ -341,7 +342,7 @@ protected void initialize()
                     if (!map.items.isEmpty(x, y))
                         continue;
 
-                    sCrush.makeStone(x, y);
+                    sItems.makeItem("stone", x, y);
                 }
             }
         }
@@ -360,9 +361,9 @@ protected void initialize()
                     if (!map.items.isEmpty(x, y))
                         continue;
 
-                    sTree.makeTrunk(map.getFirstTotallyFree(x, y, -1));
-                    sTree.makeBranch(map.getFirstTotallyFree(x, y, -1));
-                    sTree.makeVine(map.getFirstTotallyFree(x, y, -1));
+                    sItems.makeItem("trunk", x, y);
+                    sItems.makeItem("branch", x, y);
+                    sItems.makeItem("vine", x, y);
                 }
             }
         }

src/main/java/com/github/fabioticconi/alone/systems/BootstrapSystem.java

@@ -38,7 +38,7 @@ public class BumpSystem extends PassiveSystem
     static final Logger log = LoggerFactory.getLogger(BumpSystem.class);
 
     ComponentMapper<Health>    mHealth;
-    ComponentMapper<Tree>      mTree;
+    ComponentMapper<Cuttable>  mCuttable;
     ComponentMapper<Pushable>  mPushable;
     ComponentMapper<Crushable> mCrushable;
     ComponentMapper<Position>  mPos;
@@ -83,7 +83,7 @@ public float bumpAction(final int actorId, final Side direction)
         // if we were path-moving, now, whatever happens next, we stop
         mPath.remove(actorId);
 
-        if (mPlayer.has(actorId) && mTree.has(targetId))
+        if (mPlayer.has(actorId) && mCuttable.has(targetId))
         {
             c = sTree.cut(actorId, targetId);
         }

src/main/java/com/github/fabioticconi/alone/systems/BumpSystem.java

@@ -19,7 +19,6 @@
 package com.github.fabioticconi.alone.systems;
 
 import com.artemis.ComponentMapper;
-import com.artemis.EntityEdit;
 import com.github.fabioticconi.alone.components.*;
 import com.github.fabioticconi.alone.components.actions.ActionContext;
 import com.github.fabioticconi.alone.components.attributes.Strength;
@@ -29,9 +28,7 @@
 import net.mostlyoriginal.api.system.core.PassiveSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import rlforj.math.Point;
 
-import java.awt.Color;
 import java.util.EnumSet;
 
 /**
@@ -42,10 +39,10 @@ public class CrushSystem extends PassiveSystem
 {
     static final Logger log = LoggerFactory.getLogger(CrushSystem.class);
 
-    ComponentMapper<Crushable> mCrushable;
+    ComponentMapper<Crushable> mCrush;
     ComponentMapper<Speed>     mSpeed;
-    ComponentMapper<Strength>  mStrength;
-    ComponentMapper<Position>  mPosition;
+    ComponentMapper<Strength>  mStr;
+    ComponentMapper<Position>  mPos;
     ComponentMapper<Weapon>    mWeapon;
 
     StaminaSystem sStamina;
@@ -64,38 +61,6 @@ public CrushAction crush(final int entityId, final int targetId)
         return c;
     }
 
-    public int makeStone(final Point p)
-    {
-        return makeStone(p.x, p.y);
-    }
-
-    public int makeStone(final int x, final int y)
-    {
-        return sItem.makeItem("stone", x, y);
-    }
-
-    public int makeBoulder(final Point p)
-    {
-        return makeBoulder(p.x, p.y);
-    }
-
-    public int makeBoulder(final int x, final int y)
-    {
-        final int        id   = world.create();
-        final EntityEdit edit = world.edit(id);
-
-        edit.create(Position.class).set(x, y);
-        edit.create(Sprite.class).set('#', Color.DARK_GRAY.brighter(), true);
-        edit.create(LightBlocker.class);
-        edit.create(Pushable.class);
-        edit.create(Crushable.class);
-        edit.add(new Name("A big boulder", "boulder"));
-
-        map.obstacles.set(id, x, y);
-
-        return id;
-    }
-
     public class CrushAction extends ActionContext
     {
         @Override
@@ -106,7 +71,7 @@ public boolean tryAction()
 
             final int targetId = targets.get(0);
 
-            if (targetId < 0 || !mCrushable.has(targetId))
+            if (targetId < 0 || !mCrush.has(targetId))
                 return false;
 
             final int hammerId = sItem.getWeapon(actorId, EnumSet.of(WeaponType.BLUNT), true);
@@ -131,7 +96,7 @@ public boolean tryAction()
 
             // FIXME further adjust delay and cost using the hammer power
             delay = mSpeed.get(actorId).value;
-            cost = delay / (mStrength.get(actorId).value + 3f);
+            cost = delay / (mStr.get(actorId).value + 3f);
 
             return true;
         }
@@ -146,15 +111,15 @@ public void doAction()
 
             msg.send(actorId, targetId, new CrushMsg());
 
-            final Position p = mPosition.get(targetId);
+            final Position p = mPos.get(targetId);
 
             // from a tree we get a trunk and two branches
             map.obstacles.del(p.x, p.y);
             world.delete(targetId);
 
             for (int i = 0; i < 3; i++)
             {
-                makeStone(map.getFirstTotallyFree(p.x, p.y, -1));
+                sItem.makeItem("stone", p.x, p.y);
             }
 
             // consume a fixed amount of stamina

src/main/java/com/github/fabioticconi/alone/systems/CrushSystem.java

@@ -18,7 +18,6 @@
 
 package com.github.fabioticconi.alone.systems;
 
-import com.artemis.Component;
 import com.artemis.ComponentMapper;
 import com.artemis.EntityEdit;
 import com.artemis.annotations.Wire;
@@ -177,6 +176,10 @@ public int makeItem(final String tag)
                 edit.add(template.sprite);
             if (template.obstacle != null)
                 edit.add(template.obstacle);
+            if (template.crushable != null)
+                edit.add(template.crushable);
+            if (template.cuttable != null)
+                edit.add(template.cuttable);
 
             return id;
         } catch (final IOException e)
@@ -192,10 +195,12 @@ public static class ItemTemplate
         public String name;
         public String tag;
 
-        public Wearable wearable;
-        public Weapon weapon;
-        public Sprite sprite;
-        public Obstacle obstacle;
+        public Wearable  wearable;
+        public Weapon    weapon;
+        public Sprite    sprite;
+        public Obstacle  obstacle;
+        public Crushable crushable;
+        public Cuttable  cuttable;
     }
 
     public GetAction get(final int actorId)