Skip to content

Commit 21ef8e3

Browse files
committed
fix(alarm): stop turning off on counter decrease
Alarm will no longer stop when attack counter decreases.
1 parent ec1b595 commit 21ef8e3

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

modules/RepConvGRC.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2562,7 +2562,7 @@ function _RepConvGRC() {
25622562
?
25632563
/*((RepConv.requests.player && RepConv.requests.player.url) ? JSON.parse(unescape(RepConv.requests.player.url).match(/({.*})/)[0]).player_id : RCGP.getOptions().player_id)*/
25642564
RepConvTool.getPlayerId4Name(RCGP.getJQElement().find($('#write_message_form input[name="recipients"]')).val())
2565-
: JSON.parse(atob(__tmp[1] || __tmp[0])).id,AQQ
2565+
: JSON.parse(atob(__tmp[1] || __tmp[0])).id,
25662566
_days = parseFloat(RepConvGRC.idle.JSON[_player]||'-1');
25672567
$(elem).addClass('grcrt_idle_days'),
25682568
$(elem).addClass('grcrt_idle_dg'),
@@ -3547,6 +3547,10 @@ function _RepConvGRC() {
35473547
});
35483548
});
35493549
observer_attack.observe(document.querySelector('div.activity.attack_indicator'), { attributes: true, childList: true, characterData: true });
3550+
if($('div.activity.attack_indicator').hasClass('active')){
3551+
attackIncoming(parseInt($('div.activity.attack_indicator div.count').html()))
3552+
}
3553+
35503554
}
35513555

35523556
}
@@ -3573,10 +3577,11 @@ function _RepConvGRC() {
35733577
new _grcrtWindowGrcRT();
35743578
new _grcrtWindowStats();
35753579
new _grcrtWindowAnalysis();
3576-
$.Observer(require("data/events").attack.incoming)
3577-
.subscribe('GameEvents.grcrt.attackIncomming',function(a,b){
3578-
attackIncoming(b.count);
3579-
});
3580+
// $.Observer(require("data/events").attack.incoming)
3581+
// .subscribe('GameEvents.grcrt.attackIncomming',function(a,b){
3582+
// console.log('GameEvents.grcrt.attackIncomming '+b.count) /* AQQ */
3583+
// attackIncoming(b.count);
3584+
// });
35803585
if(require("helpers/commands").getTotalCountOfIncomingAttacks() > 0) {
35813586
attackIncoming(require("helpers/commands").getTotalCountOfIncomingAttacks());
35823587
}

0 commit comments

Comments
 (0)