Skip to content

Commit 8f97bf0

Browse files
authored
Merge pull request #57 from grcrt/feature/temples
Feature/temples
2 parents 393cf8d + c12b580 commit 8f97bf0

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

GRCRTMain.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@ function _GRCRTMain(){
220220
"calydonian_boar" : "K3",
221221
"griffin" : "L3",
222222
"godsent" : "M3",
223+
"satyr" : "N3",
224+
"siren" : "O3",
225+
"spartoi" : "P3",
226+
"ladon" : "Q3",
223227
"militia" : "A4",
224228

225229
"atalanta" : "A5",
@@ -236,6 +240,7 @@ function _GRCRTMain(){
236240
"odysseus" : "L5",
237241
"iason" : "M5",
238242
"apheledes" : "N5",
243+
239244
"democritus" : "O5",
240245
"hector" : "P5",
241246

modules/GRCRTConverterCtrl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,7 @@ function _GRCRTConverterCtrl(wnd) {
18461846
report.power = RepConvTool.Adds(RepConv.Const.staticImg + _content.find($('div#report_power_symbol')).attr('class').replace(/power_icon86x86 (.*)/, '$1') + '_30x30.png', "img");
18471847

18481848
report.powerinfo = {};
1849-
report.powerinfo.id = _content.find($('div#report_power_symbol')).attr('class').replace(/power_icon86x86 (.*)/, '$1');
1849+
report.powerinfo.id = _content.find($('div#report_power_symbol')).attr('class').replace(/power_icon86x86 (.*)/, '$1').split(' ')[0];
18501850
switch (report.powerinfo.id) {
18511851
case "happiness" :
18521852
case "fertility_improvement" :

modules/GRCRTtpl.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ function _GRCRTtpl() {
1010
outside: false,
1111
town: "town",
1212
ghost_town: "town",
13+
farm_town: "town",
1314
player: "player",
1415
ally: "ally",
1516
island: "island",
@@ -65,6 +66,7 @@ function _GRCRTtpl() {
6566
outside: true,
6667
town: "b",
6768
ghost_town: "b",
69+
farm_town: "b",
6870
player: "b",
6971
ally: "b",
7072
island: "b",
@@ -120,6 +122,7 @@ function _GRCRTtpl() {
120122
outside: false,
121123
town: "town",
122124
ghost_town: "town",
125+
farm_town: "town",
123126
player: "player",
124127
ally: "ally",
125128
island: "island",

0 commit comments

Comments
 (0)