Merge branch 'release/0.2.6'

fabio-t · Feb 25, 2018 · b481215 · b481215
2 parents 38c203c + 808f420
commit b481215
Show file tree

Hide file tree

Showing 126 changed files with 342 additions and 6,612 deletions.
diff --git a/README.md b/README.md
@@ -61,8 +61,7 @@ After selecting a new game you have to generate the world, just before choosing
 NB: trees cannot be seen here, but they are generated (as individual obstacles) with varying probability
 depending on terrain type.
 
-The rivers and lakes are upcoming in release `0.3.0`. The terrain types are currently fixed. Ordered by
-height, they are:
+The terrain types are currently fixed. Ordered by height, they are:
 
 * Deep water
 * Shallow water
@@ -74,9 +73,15 @@ height, they are:
 * Mountain
 * High Mountain
 
+Rivers and lakes are present, and they simply have Shallow or Deep water type. As of `0.2.6`, rivers
+don't have a "coast".
+
 Some terrains are harder to move through: more stamina will be consumed, and a higher delay is to be expected.
 
-All this should be completely configurable by the user by release `0.4.0`, hopefully.
+Some creatures prefer some terrains, but the differences are not huge.
+
+All this should be completely configurable by the user by release `0.4.0` - so that one could mod
+different terrain types, map generation parameters, biome details and so on.
 
 ## Features
 
@@ -89,7 +94,7 @@ Pathfinding is both precise and efficient thanks to an AStar implementation that
 to plan a course to a target position.
 
 What this means for the end user is that the game doesn't cheat. It doesn't magically make creatures see you
-if they shouldn't. The other creatures can only do what *you* can also do.
+if they shouldn't (eg, if you are hidden by a boulder). Other creatures can only do what *you* can also do.
 
 ### Simple Ecology
 

diff --git a/alone-rl.iml b/alone-rl.iml
@@ -11,14 +11,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.github.trystan:AsciiPanel:e0c4372" level="project" />
+    <orderEntry type="library" name="Maven: com.github.trystan:AsciiPanel:372dfbae98" level="project" />
     <orderEntry type="library" name="Maven: net.onedaybeard.artemis:artemis-odb:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: net.mostlyoriginal.artemis-odb:contrib-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.fabioticconi:rlforj-alt:0.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.fabioticconi:terrain-generator:0.0.1" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fabio-t:rlforj-alt:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fabio-t:terrain-generator:0.1.0" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.3.0-alpha4" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.3.0-alpha4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.8.0-beta1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.mail:javax.mail:1.6.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.3" level="project" />

diff --git a/data/items.yml b/data/items.yml
@@ -12,6 +12,7 @@ stone:
       red: 88
       green: 88
       blue: 88
+      alpha: 255
 
 branch:
   name: a sturdy branch
@@ -26,6 +27,7 @@ branch:
       red: 141
       green: 104
       blue: 21
+      alpha: 255
 
 vine:
   name: a thin, flexible branch
@@ -35,6 +37,7 @@ vine:
       red: 36
       green: 122
       blue: 7
+      alpha: 255
 
 trunk:
   name: a fallen tree
@@ -44,6 +47,7 @@ trunk:
       red: 141
       green: 104
       blue: 21
+      alpha: 255
 
 boulder:
   name: a big boulder
@@ -53,6 +57,7 @@ boulder:
       red: 88
       green: 88
       blue: 88
+      alpha: 255
     shadowView: true
   obstacle: {}
   crushable: {}
@@ -65,6 +70,7 @@ tree:
       red: 77
       green: 168
       blue: 59
+      alpha: 255
     shadowView: true
   obstacle: {}
   cuttable: {}
@@ -82,6 +88,7 @@ sharp-stone:
       red: 88
       green: 88
       blue: 88
+      alpha: 255
 
 small-sharp-stone:
   name: a small, sharp stone
@@ -96,6 +103,7 @@ small-sharp-stone:
       red: 88
       green: 88
       blue: 88
+      alpha: 255
 
 stone-hammer:
   name: a stone hammer
@@ -110,6 +118,7 @@ stone-hammer:
       red: 141
       green: 104
       blue: 21
+      alpha: 255
 
 stone-axe:
   name: a stone axe
@@ -124,6 +133,7 @@ stone-axe:
       red: 141
       green: 104
       blue: 21
+      alpha: 255
 
 stone-spear:
   name: a stone spear
@@ -138,3 +148,4 @@ stone-spear:
       red: 141
       green: 104
       blue: 21
+      alpha: 255
diff --git a/data/map/elevation.data b/data/map/elevation.data
diff --git a/data/map/terrain.yml b/data/map/terrain.yml
@@ -5,6 +5,7 @@ deep-water:
     red: 51
     green: 102
     blue: 153
+    alpha: 255
   theight: 0.01
   type: WATER
 
@@ -14,6 +15,7 @@ shallow-water:
     red: 20
     green: 152
     blue: 204
+    alpha: 255
   theight: 0.05
   type: WATER
 
@@ -23,6 +25,7 @@ sand:
     red: 170
     green: 170
     blue: 0
+    alpha: 255
   theight: 0.08
   type: LAND
 
@@ -32,6 +35,7 @@ ground:
     red: 184
     green: 134
     blue: 11
+    alpha: 255
   theight: 0.1
   type: LAND
 
@@ -41,6 +45,7 @@ grass:
     red: 31
     green: 138
     blue: 19
+    alpha: 255
   theight: 0.4
   type: GRASS
 
@@ -50,6 +55,7 @@ hill-grass:
     red: 74
     green: 105
     blue: 4
+    alpha: 255
   theight: 0.7
   type: GRASS
 
@@ -59,6 +65,7 @@ hill:
     red: 119
     green: 93
     blue: 61
+    alpha: 255
   theight: 0.8
   type: LAND
 
@@ -68,6 +75,7 @@ mountain:
     red: 76
     green: 70
     blue: 50
+    alpha: 255
   theight: 0.9
   type: LAND
 
@@ -77,5 +85,6 @@ high-mountain:
     red: 255
     green: 240
     blue: 220
+    alpha: 255
   theight: 1.1 # must be strictly greater than 1
   type: ICE
diff --git a/map_scripts/cols.png b/map_scripts/cols.png
diff --git a/map_scripts/elevation.data b/map_scripts/elevation.data
diff --git a/map_scripts/map.png b/map_scripts/map.png
diff --git a/map_scripts/map.xml b/map_scripts/map.xml
diff --git a/map_scripts/map2.png b/map_scripts/map2.png
diff --git a/map_scripts/moisture.data b/map_scripts/moisture.data
diff --git a/map_scripts/overrides.data b/map_scripts/overrides.data
diff --git a/map_scripts/print_cols.py b/map_scripts/print_cols.py
diff --git a/map_scripts/print_elev.py b/map_scripts/print_elev.py
diff --git a/map_scripts/show_map.py b/map_scripts/show_map.py