Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: maintenance changes
  • Loading branch information
Potusek committed Aug 20, 2018
1 parent 74022b5 commit 3555c74
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions modules/RepConvGRC.js
Expand Up @@ -3030,7 +3030,7 @@ function _RepConvGRC() {
}
var options = {
body: DM.getl10n('layout','toolbar_activities').incomming_attacks+" : "+(
require("data/features").isCommandsMenuBubbleWithIndividualPushables()
!require("data/features").isOldCommandVersion()
? require("helpers/commands").getTotalCountOfIncomingAttacks()
: MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).getIncommingAttacksCommandsCount()
),
Expand All @@ -3052,7 +3052,7 @@ function _RepConvGRC() {
$('#grcrtSound').hide();
}
RepConv.active.attack_count = _ai;/*(
require("data/features").isCommandsMenuBubbleWithIndividualPushables()
!require("data/features").isOldCommandVersion()
? require("helpers/commands").getTotalCountOfIncomingAttacks()
: MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).getIncommingAttacksCommandsCount()
);*/
Expand Down Expand Up @@ -3477,7 +3477,7 @@ function _RepConvGRC() {
new _grcrtWindowGrcRT();
new _grcrtWindowStats();
new _grcrtWindowAnalysis();
if(require("data/features").isCommandsMenuBubbleWithIndividualPushables()){
if(!require("data/features").isOldCommandVersion()){
$.Observer(require("data/events").attack.incoming)
.subscribe('GameEvents.grcrt.attackIncomming',function(a,b){
attackIncoming(b.count);
Expand Down Expand Up @@ -3810,3 +3810,6 @@ function _RepConvGRC() {
// ------------------------------


/*
<div class="ph_ratio" style="top: 38px;left: 345px;width: 35px;"></div>
*/

0 comments on commit 3555c74

Please sign in to comment.