Merge branch 'release/0.2.8'

Author: fabio-t

.gitignore

@@ -1,4 +1,4 @@
-alone-the-roguelite.iml
+alone*.iml
 .idea/
 target/
 .classpath
@@ -11,4 +11,4 @@ pom.xml.next
 release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
-/map.png
+data/map/elevation.data

alone-rl.iml

@@ -1,4 +1,3 @@
-
 sharp-stone:
   sources: stone
   tools: stone
@@ -30,3 +29,11 @@ stone-arrow:
 bow:
   sources: [trunk, vine]
   tools: [stone-axe, stone-knife]
+
+bark:
+  sources: [trunk]
+  tools: [stone-axe, stone-knife]
+
+bark-armour:
+  sources: [bark, vine]
+  tools: [stone-knife]

data/crafting.yml

@@ -0,0 +1,112 @@
+player:
+  name: you
+  player: {}
+  inventory: {}
+  strength: 2
+  agility: 2
+  constitution: 2
+  skin: -2
+  sight: 18
+  #  herbivore: {}
+  carnivore: {}
+  sprite:
+    c: '@'
+    col:
+      red: 255
+      green: 255
+      blue: 255
+      alpha: 255
+
+buffalo:
+  name: a big buffalo
+  strength: 2
+  agility: -2
+  constitution: 2
+  skin: 2
+  sight: 6
+  herbivore: {}
+  group:
+    groupId: -1
+  ai:
+    behaviours: [flee, flock, graze, wander]
+  sprite:
+    c: 'b'
+    col:
+      red: 102
+      green: 51
+      blue: 0
+      alpha: 255
+
+fish:
+  name: a colorful fish
+  strength: -2
+  agility: 2
+  constitution: -2
+  skin: -2
+  sight: 5
+  underwater: {}
+  ai:
+    behaviours: [underwater, fleefromaction]
+  sprite:
+    c: 'p'
+    col:
+      red: 0
+      green: 255
+      blue: 255
+      alpha: 255
+
+puma:
+  name: a strong puma
+  strength: 2
+  agility: 2
+  constitution: 2
+  skin: 1
+  sight: 10
+  carnivore: {}
+  ai:
+    behaviours: [chase, scavenge, wander]
+  sprite:
+    c: 'p'
+    col:
+      red: 102
+      green: 51
+      blue: 0
+      alpha: 255
+
+wolf:
+  name: a ferocious wolf
+  strength: 1
+  agility: 1
+  constitution: 0
+  skin: 1
+  sight: 10
+  carnivore: {}
+  group:
+    groupId: -1
+  ai:
+    behaviours: [chase, flock, scavenge, wander]
+  sprite:
+    c: 'w'
+    col:
+      red: 64
+      green: 64
+      blue: 64
+      alpha: 255
+
+rabbit:
+  name: a cute rabbit
+  strength: -2
+  agility: 2
+  constitution: -1
+  skin: -1
+  sight: 12
+  herbivore: {}
+  ai:
+    behaviours: [flee, graze, wander]
+  sprite:
+    c: 'r'
+    col:
+      red: 192
+      green: 192
+      blue: 192
+      alpha: 255

data/creatures.yml

@@ -1,4 +1,3 @@
-
 stone:
   name: a round stone
   wearable:
@@ -171,7 +170,7 @@ stone-arrow:
     damageType: POINT
     damage: 3
   ammo:
-      usableBy: bow
+    usableBy: bow
   sprite:
     c: 26
     col:
@@ -194,3 +193,24 @@ bow:
       green: 104
       blue: 21
       alpha: 255
+
+bark:
+  name: tree bark
+  sprite:
+    c: '$'
+    col:
+      red: 141
+      green: 104
+      blue: 21
+      alpha: 255
+
+bark-armour:
+  name: bark armour
+  wearable:
+    where: BODY
+  armour:
+    defences:
+      SLASH: 2
+      BLUNT: 1
+      POINT: 1
+      NATURAL: 2

data/creatures/buffalo.yml

@@ -1,4 +1,3 @@
-
 deep-water:
   c: 247
   col:

data/creatures/fish.yml

@@ -1,4 +1,3 @@
-
 ## Arne64 from http://www.gridsagegames.com/rexpaint/palettes/Arne64.txt
 #
 #gray: [{0,0,0},{21,21,21},{52,52,52},{123,123,123},{168,168,168},{215,215,215},{255,255,255}]

data/creatures/puma.yml

@@ -1,4 +1,3 @@
-
 strength: 2
 agility: 2
 constitution: 2

data/creatures/rabbit.yml

@@ -22,7 +22,7 @@
 
     <groupId>com.github.fabio-t</groupId>
     <artifactId>alone-rl</artifactId>
-    <version>0.2.7</version>
+    <version>0.2.8</version>
     <packaging>jar</packaging>
 
     <name>AloneRL</name>
@@ -41,13 +41,13 @@
         <dependency>
             <groupId>net.onedaybeard.artemis</groupId>
             <artifactId>artemis-odb</artifactId>
-            <version>[2,3)</version>
+            <version>[2.2.0,3)</version>
         </dependency>
 
         <dependency>
             <groupId>net.mostlyoriginal.artemis-odb</groupId>
             <artifactId>contrib-core</artifactId>
-            <version>[2,3)</version>
+            <version>[2.2.0,3)</version>
         </dependency>
 
         <dependency>
@@ -78,19 +78,19 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.9.3</version>
+            <version>2.9.8</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.3</version>
+            <version>2.9.8</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-parameter-names</artifactId>
-            <version>2.9.3</version>
+            <version>2.9.8</version>
         </dependency>
 
     </dependencies>
@@ -100,7 +100,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.9.3</version>
+                <version>2.9.8</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -111,10 +111,10 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
 

data/creatures/wolf.yml

@@ -45,13 +45,13 @@
 
 public class Main extends JFrame implements KeyListener
 {
-    static final  Logger  log          = LoggerFactory.getLogger(Main.class);
-    public static boolean keepRunning  = true;
-    public static boolean paused       = false;
-    public static boolean realtime     = false;
-    private final int     fps          = 25;
-    private final long    deltaNanos   = Math.round(1000000000.0d / (double) fps);
-    private final float   deltaSeconds = 1.0f / (float) fps;
+    static final  Logger       log          = LoggerFactory.getLogger(Main.class);
+    public static boolean      keepRunning  = true;
+    public static boolean      paused       = false;
+    public static boolean      realtime     = false;
+    private final int          fps          = 25;
+    private final long         deltaNanos   = Math.round(1000000000.0d / (double) fps);
+    private final float        deltaSeconds = 1.0f / (float) fps;
     private final AsciiPanel   terminal;
     private final World        world;
     private final ScreenSystem screen;
@@ -78,6 +78,7 @@ public Main() throws IOException
 
         final WorldConfiguration config;
         config = new WorldConfiguration();
+        config.setAlwaysDelayComponentRemoval(true);
         // POJO
         config.register(new Random());
         config.register(properties);
@@ -92,6 +93,7 @@ public Main() throws IOException
         config.setSystem(MessageSystem.class);
         config.setSystem(screen);
         // actual game logic
+        config.setSystem(new TimeSystem(8, 60f));
         config.setSystem(new HealthSystem(5f));
         config.setSystem(new StaminaSystem(1f));
         config.setSystem(new HungerSystem(1f));

data/items.yml

@@ -27,7 +27,7 @@
 public abstract class AbstractBehaviour extends PassiveSystem implements Behaviour
 {
     @EntityId
-    protected int entityId = -1;
+    protected int    entityId = -1;
     protected Aspect aspect;
 
     public boolean interested(final int entityId)