Skip to content

Commit 003da61

Browse files
committed
fix: maintenance changes
1 parent 068028f commit 003da61

File tree

1 file changed

+9
-24
lines changed

1 file changed

+9
-24
lines changed

modules/RepConvGRC.js

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3030,10 +3030,8 @@ function _RepConvGRC() {
30303030
}
30313031
var options = {
30323032
body: DM.getl10n('layout','toolbar_activities').incomming_attacks+" : "+(
3033-
!require("data/features").isOldCommandVersion()
3034-
? require("helpers/commands").getTotalCountOfIncomingAttacks()
3035-
: MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).getIncommingAttacksCommandsCount()
3036-
),
3033+
require("helpers/commands").getTotalCountOfIncomingAttacks()
3034+
),
30373035
icon: 'https://www.grcrt.net/img/octopus.png',
30383036
}
30393037
}
@@ -3051,11 +3049,7 @@ function _RepConvGRC() {
30513049
}
30523050
$('#grcrtSound').hide();
30533051
}
3054-
RepConv.active.attack_count = _ai;/*(
3055-
!require("data/features").isOldCommandVersion()
3056-
? require("helpers/commands").getTotalCountOfIncomingAttacks()
3057-
: MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).getIncommingAttacksCommandsCount()
3058-
);*/
3052+
RepConv.active.attack_count = _ai;
30593053
}
30603054
}
30613055

@@ -3477,21 +3471,12 @@ function _RepConvGRC() {
34773471
new _grcrtWindowGrcRT();
34783472
new _grcrtWindowStats();
34793473
new _grcrtWindowAnalysis();
3480-
if(!require("data/features").isOldCommandVersion()){
3481-
$.Observer(require("data/events").attack.incoming)
3482-
.subscribe('GameEvents.grcrt.attackIncomming',function(a,b){
3483-
attackIncoming(b.count);
3484-
});
3485-
if(require("helpers/commands").getTotalCountOfIncomingAttacks() > 0) {
3486-
attackIncoming(require("helpers/commands").getTotalCountOfIncomingAttacks());
3487-
}
3488-
} else {
3489-
MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).onIncomingAttackCountChange(function(){
3490-
attackIncoming(MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).getIncommingAttacksCommandsCount());
3491-
},MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}));
3492-
if (MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).getIncommingAttacksCommandsCount() > 0) {
3493-
attackIncoming(MM.checkAndPublishRawModel('CommandsMenuBubble', {id: Game.player_id}).getIncommingAttacksCommandsCount());
3494-
}
3474+
$.Observer(require("data/events").attack.incoming)
3475+
.subscribe('GameEvents.grcrt.attackIncomming',function(a,b){
3476+
attackIncoming(b.count);
3477+
});
3478+
if(require("helpers/commands").getTotalCountOfIncomingAttacks() > 0) {
3479+
attackIncoming(require("helpers/commands").getTotalCountOfIncomingAttacks());
34953480
}
34963481
if (RepConv.idleInterval == undefined) {
34973482
getIdleData();

0 commit comments

Comments
 (0)