Update 23/06/2013

* Changed Galley with Trireme
Venerons · Jun 23, 2013 · 4c412a8 · 4c412a8
1 parent 86d872d
commit 4c412a8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,10 @@
 
 _Copyright (c) 2013 Daniele Veneroni. Released under GPLv3 License. See LICENSE.md for further information._
 
+### Update 23/06/2013
+
+* Changed Galley with Trireme
+
 ### Update 10/06/2013
 
 * Added LICENSE.md

diff --git a/docs/manual.md b/docs/manual.md
@@ -105,12 +105,12 @@ Scout              | 25    | 0     | 1     | 2     | 1            | -
 Warrior            | 40    | 1     | 1     | 1     | 1            | -                | Iron Working  
 Spearman           | 56    | 2     | 1     | 1     | 1            | Bronze Working   | Iron Working 
 Archer             | 40    | 1     | 2     | 1     | 1            | Archery          | Gunpowder  
-Galley             | 45    | 1     | 1     | 1     | 1            | Sailing          | Optics  
+Trireme            | 45    | 1     | 1     | 1     | 1            | Sailing          | Optics  
 _CLASSICAL ERA_    |       |       |       |       |              |                  |  
 Catapult           | 75    | 4     | 1     | 1     | 1            | Engineering      | Gunpowder  
 Swordsman          | 75    | 2     | 2     | 1     | 1            | Iron Working     | Metal Casting  
 Horseman           | 75    | 2     | 1     | 2     | 1            | Horse Riding     | Code of Chivalry  
-Trireme            | 75    | 2     | 2     | 2     | 1            | Optics           | Astronomy  
+Galley             | 75    | 2     | 2     | 2     | 1            | Optics           | Astronomy  
 _MEDIEVAL ERA_     |       |       |       |       |              |                  |  
 Knight             | 120   | 4     | 2     | 2     | 1            | Code of Chivalry | Metal Casting  
 Galleon            | 120   | 3     | 3     | 3     | 1            | Astronomy        | Steam Energy  
@@ -279,14 +279,14 @@ Wheel              | 40    | Agriculture                     | -
 Mining             | 40    | Agriculture                     | -  
 Breeding           | 40    | Agriculture, Hunting            | -  
 Archery            | 40    | Hunting                         | Unlock Archer  
-Sailing            | 40    | Fishing                         | Unlock Galley  
+Sailing            | 40    | Fishing                         | Unlock Trireme  
 Divine Right       | 80    | Theology                        | Unlock Monarchy  
 Education          | 80    | Theology, Mathematics           | Unlock Republic, University  
 Currency           | 80    | Mathematics                     | -  
 Masonry            | 80    | Mining                          | -  
 Bronze Working     | 80    | Mining                          | Unlock Barracks, Spearman  
 Horse Riding       | 80    | Breeding                        | Unlock Horseman  
-Optics             | 80    | Archery, Sailing                | Unlock Trireme  
+Optics             | 80    | Archery, Sailing                | Unlock Galley  
 Art                | 160   | Divine Right, Education         | -  
 Literature         | 160   | Education                       | -  
 Engineering        | 160   | Mathematics, Masonry            | Unlock Aqueduct, Catapult  

diff --git a/docs/roadmap.md b/docs/roadmap.md
@@ -10,6 +10,7 @@ This document outlines the general goals for CivJS ongoing development.
 
 * New main menu screen
 * New License (from MIT License to GNU GPLv3)
+* Changed Galley with Trireme
 
 **Todo**
 

diff --git a/index.html b/index.html
@@ -119,7 +119,7 @@
 
                     <p>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 General Public License for more details.</p><br/>
 
-                    <p>Read the complete license at <a href="LICENSE.txt" target="_blank">LICENSE.txt</a></p>
+                    <p>Read the complete license at <a href="LICENSE.md" target="_blank">LICENSE.md</a></p>
                 </li>
             </ul>
         </article>

diff --git a/js/database.js b/js/database.js
@@ -64,7 +64,7 @@ var unitsDB = {
             "techrequired": "Archery",
             "obsolete": "Gunpowder"
         },
-    "galley": 
+    "trireme": 
         {
             "atk": 1,
             "def": 1,
@@ -124,7 +124,7 @@ var unitsDB = {
             "techrequired": "Iron Working",
             "obsolete": "Metal Casting"
         },
-    "trireme": 
+    "galley": 
         {
             "atk": 2,
             "def": 2,