Skip to content

Commit 0ebca57

Browse files
Potusektomaski
authored andcommitted
fix: revolt report conversion
fixes a bug, where conversion of the report with revolt being stirred up did not work
1 parent d36cf98 commit 0ebca57

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

modules/GRCRTConverterCtrl.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,6 @@ function _GRCRTConverterCtrl(wnd) {
862862
max_row = Math.max(max_row, elem.length);
863863
}),
864864
report.title = GameData.buildings.academy.name+' ('+RepConvTool.Adds((GRCRTtpl.rct.outside) ? Game.townName : Game.townId.toString(), GRCRTtpl.rct.town)+')',
865-
//report.title = _window.find($('.title')).html().replace(/(.*)\(.*\)/,'$1('+RepConvTool.Adds((GRCRTtpl.rct.outside) ? Game.townName : Game.townId.toString(), GRCRTtpl.rct.town)+')'),
866865
report.time = '',
867866
report.linia = {},
868867
$.each(tech_tree, function(ind,elem){
@@ -927,7 +926,7 @@ function _GRCRTConverterCtrl(wnd) {
927926
return ITowns.getCurrentTown().getResearches()
928927
}
929928
function getTownBuildings() {
930-
return ITowns.getCurrentTown().getBuildings() //this.getCollection("towns").getCurrentTown().getBuildings()
929+
return ITowns.getCurrentTown().getBuildings()
931930
}
932931
function getTownResources() {
933932
return ITowns.getCurrentTown().resources()
@@ -971,15 +970,7 @@ function _GRCRTConverterCtrl(wnd) {
971970
function getAvailableResearchPoints() {
972971
return getCurrentResearchPoints() - getSpentResearchPoints()
973972
}
974-
// var
975-
// tech_tree = getResearchesInColumns(),
976-
// max_row = 0,
977-
// academy_lvl = getAcademyLevel();
978-
// $.each(tech_tree, function(ind,elem){
979-
// max_row = Math.max(max_row, elem.length);
980-
// }),
981973
report.title = GameData.buildings.main.name+' ('+RepConvTool.Adds((GRCRTtpl.rct.outside) ? Game.townName : Game.townId.toString(), GRCRTtpl.rct.town)+')',
982-
//report.title = _window.find($('.title')).html().replace(/(.*)\(.*\)/,'$1('+RepConvTool.Adds((GRCRTtpl.rct.outside) ? Game.townName : Game.townId.toString(), GRCRTtpl.rct.town)+')'),
983974
report.time = '',
984975
report.linia = {},
985976
$.each(tech_tree, function(ind,elem){
@@ -1260,14 +1251,9 @@ function _GRCRTConverterCtrl(wnd) {
12601251

12611252
report.attacker = getPlayerInfo2(report.attacker, _content.find($('#report_sending_town')));
12621253
report.defender = getPlayerInfo2(report.defender, _content.find($('#report_receiving_town')));
1263-
//report.attacker = getPlayerInfo(_content.find($('#report_sending_town')));
1264-
//report.defender = getPlayerInfo(_content.find($('#report_receiving_town')));
12651254
report.power = (_content.find($('div.report_power')).length == 0) ? ''
12661255
: RepConvTool.Adds(RepConv.Const.staticImg + _content.find($('div.report_power')).attr('id') + '_30x30.png', "img");
12671256

1268-
//report.attacker.unit_img = '';
1269-
//report.attacker.unit_send = '';
1270-
//report.attacker.unit_list = '';
12711257

12721258
if ( cAttUnit.isChecked() ) {// $('#MSGATTUNIT').attr('checked')) {
12731259
__getUnitDetail1Way('attacker', 'div.report_unit', 10);
@@ -1287,8 +1273,6 @@ function _GRCRTConverterCtrl(wnd) {
12871273
report.nightbonus = '';
12881274
report.attacker = getPlayerInfo2(report.attacker, _content.find($('#report_sending_town')));
12891275
report.defender = getPlayerInfo2(report.defender, _content.find($('#report_receiving_town')));
1290-
//report.attacker = getPlayerInfo(_content.find($('#report_sending_town')));
1291-
//report.defender = getPlayerInfo(_content.find($('#report_receiving_town')));
12921276
var town = _content.find($('#report_game_body p a.gp_town_link')).length == 0
12931277
? ''
12941278
: RepConvTool.Adds((JSON.parse(RepConvTool.Atob((_content.find($('#report_game_body p a.gp_town_link')).attr('href')))))[GRCRTtpl.rct.getTown].toString(), GRCRTtpl.rct.town);

0 commit comments

Comments
 (0)