fix: island and radar playerlink formatting

grcrt · Oct 18, 2023 · e66c194 · e66c194
1 parent 0b24c6f
commit e66c194
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 27 deletions.
diff --git a/common/RepConvAdds.js b/common/RepConvAdds.js
@@ -168,9 +168,9 @@ function _RepConvAdds() {
             $('#ui_box')
                 .append(
                 $('<img/>', {
-                    'src':RepConv.grcrt_cdn+'img/octopus.png',
+                    'src':RepConv.grcrt_cdn+'/img/rip-64w.png',
                     'id': 'grcgrc',
-                    'style':'position:absolute;bottom:10px;left:10px;z-index:1000'})
+                    'style':'position:absolute;bottom:0px;left:0px;z-index:1000'})
                 );
             // this.addPlayerLedger();
             }

diff --git a/modules/GRCRT_Radar.js b/modules/GRCRT_Radar.js
@@ -819,14 +819,14 @@ if (RepConv.Debug) console.log("generateTime ___unitSpeed="+___unitSpeed+" vs _u
             __owner = (eeT.player_id == null)
                         ? DM.getl10n('common','ghost_town')
                         : '<img src="'+Game.img()+'/game/icons/player.png" />' + hCommon.player(
-                            btoa(
-                                JSON.stringify({"name":eeT.player_name,"id":eeT.player_id})
-                                    .replace(/[\u007f-\uffff]/g,
-                                        function(c) { 
-                                          return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
-                                        }
-                                    )
-                            ),
+                            // btoa(
+                            //     JSON.stringify({"name":eeT.player_name,"id":eeT.player_id})
+                            //         .replace(/[\u007f-\uffff]/g,
+                            //             function(c) { 
+                            //               return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
+                            //             }
+                            //         )
+                            // ),
                             eeT.player_name,
                             eeT.player_id
                         ),
@@ -906,14 +906,14 @@ if (RepConv.Debug) console.log("generateTime ___unitSpeed="+___unitSpeed+" vs _u
         if (__player != null) {
             return '<img src="' + Game.img() + '/game/icons/player.png" />' +
                     hCommon.player(
-                                    btoa(
-                                        JSON.stringify({"name":__player.name,"id":__player.id})
-                                            .replace(/[\u007f-\uffff]/g,
-                                                function(c) { 
-                                                  return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
-                                                }
-                                            )
-                                    ),
+                                    // btoa(
+                                    //     JSON.stringify({"name":__player.name,"id":__player.id})
+                                    //         .replace(/[\u007f-\uffff]/g,
+                                    //             function(c) { 
+                                    //               return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
+                                    //             }
+                                    //         )
+                                    // ),
                                     __player.name,
                                     __player.id
                                 );

diff --git a/modules/RepConvGRC.js b/modules/RepConvGRC.js
@@ -385,14 +385,14 @@ function _RepConvGRC() {
                         if(etown.player == $(elem).html()){
                             $(elem).html(
                                 hCommon.player(
-                                    btoa(
-                                        JSON.stringify({"name":etown.player,"id":etown.pid})
-                                            .replace(/[\u007f-\uffff]/g,
-                                                function(c) { 
-                                                  return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
-                                                }
-                                            )
-                                    ),
+                                    // btoa(
+                                    //     JSON.stringify({"name":etown.player,"id":etown.pid})
+                                    //         .replace(/[\u007f-\uffff]/g,
+                                    //             function(c) { 
+                                    //               return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
+                                    //             }
+                                    //         )
+                                    // ),
                                     etown.player,
                                     etown.pid
                                 )
@@ -3533,7 +3533,7 @@ function _RepConvGRC() {
             $('<img/>', {
                 'src':RepConv.grcrt_cdn+'img/mute.png',
                 'id' : 'grcrtSound',
-                'style': 'position:absolute; bottom: 45px; left: 15px;z-index: 1002;'
+                'style': 'position:absolute; bottom: 85px; left: 15px;z-index: 1002;'
             })
             .mousePopup(new MousePopup(RepConvTool.GetLabel('POPDISABLEALARM')))
             .click(function() {
@@ -3553,6 +3553,7 @@ function _RepConvGRC() {
             })
             .hide()
         );
+
     $('<div/>',{'id':'grcrtVideoContainers','style':'width:1px !important; height:1px !important'})
         .append($('<div/>',{'id':'grcrtVideoContainer'}))
         .append($('<div/>',{'id':'grcrtVideoContainerTest'}))
@@ -3660,6 +3661,12 @@ function _RepConvGRC() {
         // activity_commands_list();
         construction_queue_chg();
         addAttackObserver();
+        $('#grcgrc')
+            .css("cursor","pointer")
+            .mousePopup(new MousePopup("That's the end of GRCRTools"))
+            .click(function(){
+                RepConvGRC.openGRCRT('HELPTAB1');
+            })
     }
     // -- okienka
     function _grcrtWindowStats(){