@@ -3030,10 +3030,8 @@ function _RepConvGRC() {
3030
3030
}
3031
3031
var options = {
3032
3032
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
+ ) ,
3037
3035
icon : 'https://www.grcrt.net/img/octopus.png' ,
3038
3036
}
3039
3037
}
@@ -3051,11 +3049,7 @@ function _RepConvGRC() {
3051
3049
}
3052
3050
$ ( '#grcrtSound' ) . hide ( ) ;
3053
3051
}
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 ;
3059
3053
}
3060
3054
}
3061
3055
@@ -3477,21 +3471,12 @@ function _RepConvGRC() {
3477
3471
new _grcrtWindowGrcRT ( ) ;
3478
3472
new _grcrtWindowStats ( ) ;
3479
3473
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 ( ) ) ;
3495
3480
}
3496
3481
if ( RepConv . idleInterval == undefined ) {
3497
3482
getIdleData ( ) ;
0 commit comments