Merge pull request #58 from grcrt/development

Development

Author: tomaski

GRCRTMain.js

@@ -220,6 +220,10 @@ function _GRCRTMain(){
         "calydonian_boar" : "K3",
         "griffin" : "L3",
         "godsent" : "M3",
+        "satyr" : "N3",
+        "siren" : "O3",
+        "spartoi" : "P3",
+        "ladon" : "Q3",
         "militia" : "A4",
 
         "atalanta" : "A5",
@@ -236,6 +240,7 @@ function _GRCRTMain(){
         "odysseus" : "L5",
         "iason" : "M5",
         "apheledes" : "N5",
+
         "democritus" : "O5",
         "hector" : "P5",
 

modules/GRCRTConverterCtrl.js

@@ -1846,7 +1846,7 @@ function _GRCRTConverterCtrl(wnd) {
         report.power = RepConvTool.Adds(RepConv.Const.staticImg + _content.find($('div#report_power_symbol')).attr('class').replace(/power_icon86x86 (.*)/, '$1') + '_30x30.png', "img");
 
         report.powerinfo = {};
-        report.powerinfo.id = _content.find($('div#report_power_symbol')).attr('class').replace(/power_icon86x86 (.*)/, '$1');
+        report.powerinfo.id = _content.find($('div#report_power_symbol')).attr('class').replace(/power_icon86x86 (.*)/, '$1').split(' ')[0];
         switch (report.powerinfo.id) {
             case "happiness"		        :
             case "fertility_improvement"        :

modules/GRCRTtpl.js

@@ -10,6 +10,7 @@ function _GRCRTtpl() {
             outside: false,
             town: "town",
             ghost_town: "town",
+            farm_town: "town",
             player: "player",
             ally: "ally",
             island: "island",
@@ -65,6 +66,7 @@ function _GRCRTtpl() {
             outside: true,
             town: "b",
             ghost_town: "b",
+            farm_town: "b",
             player: "b",
             ally: "b",
             island: "b",
@@ -120,6 +122,7 @@ function _GRCRTtpl() {
             outside: false,
             town: "town",
             ghost_town: "town",
+            farm_town: "town",
             player: "player",
             ally: "ally",
             island: "island",