Skip to content

Commit e66c194

Browse files
committed
fix: island and radar playerlink formatting
1 parent 0b24c6f commit e66c194

File tree

3 files changed

+34
-27
lines changed

3 files changed

+34
-27
lines changed

common/RepConvAdds.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ function _RepConvAdds() {
168168
$('#ui_box')
169169
.append(
170170
$('<img/>', {
171-
'src':RepConv.grcrt_cdn+'img/octopus.png',
171+
'src':RepConv.grcrt_cdn+'/img/rip-64w.png',
172172
'id': 'grcgrc',
173-
'style':'position:absolute;bottom:10px;left:10px;z-index:1000'})
173+
'style':'position:absolute;bottom:0px;left:0px;z-index:1000'})
174174
);
175175
// this.addPlayerLedger();
176176
}

modules/GRCRT_Radar.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -819,14 +819,14 @@ if (RepConv.Debug) console.log("generateTime ___unitSpeed="+___unitSpeed+" vs _u
819819
__owner = (eeT.player_id == null)
820820
? DM.getl10n('common','ghost_town')
821821
: '<img src="'+Game.img()+'/game/icons/player.png" />' + hCommon.player(
822-
btoa(
823-
JSON.stringify({"name":eeT.player_name,"id":eeT.player_id})
824-
.replace(/[\u007f-\uffff]/g,
825-
function(c) {
826-
return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
827-
}
828-
)
829-
),
822+
// btoa(
823+
// JSON.stringify({"name":eeT.player_name,"id":eeT.player_id})
824+
// .replace(/[\u007f-\uffff]/g,
825+
// function(c) {
826+
// return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
827+
// }
828+
// )
829+
// ),
830830
eeT.player_name,
831831
eeT.player_id
832832
),
@@ -906,14 +906,14 @@ if (RepConv.Debug) console.log("generateTime ___unitSpeed="+___unitSpeed+" vs _u
906906
if (__player != null) {
907907
return '<img src="' + Game.img() + '/game/icons/player.png" />' +
908908
hCommon.player(
909-
btoa(
910-
JSON.stringify({"name":__player.name,"id":__player.id})
911-
.replace(/[\u007f-\uffff]/g,
912-
function(c) {
913-
return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
914-
}
915-
)
916-
),
909+
// btoa(
910+
// JSON.stringify({"name":__player.name,"id":__player.id})
911+
// .replace(/[\u007f-\uffff]/g,
912+
// function(c) {
913+
// return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
914+
// }
915+
// )
916+
// ),
917917
__player.name,
918918
__player.id
919919
);

modules/RepConvGRC.js

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -385,14 +385,14 @@ function _RepConvGRC() {
385385
if(etown.player == $(elem).html()){
386386
$(elem).html(
387387
hCommon.player(
388-
btoa(
389-
JSON.stringify({"name":etown.player,"id":etown.pid})
390-
.replace(/[\u007f-\uffff]/g,
391-
function(c) {
392-
return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
393-
}
394-
)
395-
),
388+
// btoa(
389+
// JSON.stringify({"name":etown.player,"id":etown.pid})
390+
// .replace(/[\u007f-\uffff]/g,
391+
// function(c) {
392+
// return '\\u'+('0000'+c.charCodeAt(0).toString(16)).slice(-4);
393+
// }
394+
// )
395+
// ),
396396
etown.player,
397397
etown.pid
398398
)
@@ -3533,7 +3533,7 @@ function _RepConvGRC() {
35333533
$('<img/>', {
35343534
'src':RepConv.grcrt_cdn+'img/mute.png',
35353535
'id' : 'grcrtSound',
3536-
'style': 'position:absolute; bottom: 45px; left: 15px;z-index: 1002;'
3536+
'style': 'position:absolute; bottom: 85px; left: 15px;z-index: 1002;'
35373537
})
35383538
.mousePopup(new MousePopup(RepConvTool.GetLabel('POPDISABLEALARM')))
35393539
.click(function() {
@@ -3553,6 +3553,7 @@ function _RepConvGRC() {
35533553
})
35543554
.hide()
35553555
);
3556+
35563557
$('<div/>',{'id':'grcrtVideoContainers','style':'width:1px !important; height:1px !important'})
35573558
.append($('<div/>',{'id':'grcrtVideoContainer'}))
35583559
.append($('<div/>',{'id':'grcrtVideoContainerTest'}))
@@ -3660,6 +3661,12 @@ function _RepConvGRC() {
36603661
// activity_commands_list();
36613662
construction_queue_chg();
36623663
addAttackObserver();
3664+
$('#grcgrc')
3665+
.css("cursor","pointer")
3666+
.mousePopup(new MousePopup("That's the end of GRCRTools"))
3667+
.click(function(){
3668+
RepConvGRC.openGRCRT('HELPTAB1');
3669+
})
36633670
}
36643671
// -- okienka
36653672
function _grcrtWindowStats(){

0 commit comments

Comments
 (0)