Michatec/wk_wars2x
1
1
Fork 0
mirror of https://github.com/Michatec/wk_wars2x.git synced 2026-04-01 00:16:27 +02:00
Code Issues Packages Projects Releases Activity

Key lock label now says enabled/disabled instead of toggled

Browse Source
This commit is contained in:
Dan
2020-01-09 10:00:36 +00:00
parent 995d2f8ff4
commit 4e88a4ff34
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cl_radar.lua
View File

@@ -207,7 +207,7 @@ RADAR.sorting = {
--[[---------------------------------------------------------------------------------- --[[----------------------------------------------------------------------------------
Radar essentials functions Radar essentials functions
----------------------------------------------------------------------------------]]-- ----------------------------------------------------------------------------------]]--
-- Returns if the radar's power is on or ff -- Returns if the radar's power is on or off
function RADAR:IsPowerOn() function RADAR:IsPowerOn()
return self.vars.power return self.vars.power
end end
@@ -402,7 +402,7 @@ function RADAR:ToggleKeyLock()
self.vars.keyLock = not self.vars.keyLock self.vars.keyLock = not self.vars.keyLock
-- Tell the NUI side to display the key lock message -- Tell the NUI side to display the key lock message
SendNUIMessage( { _type = "displayKeyLock" } ) SendNUIMessage( { _type = "displayKeyLock", state = self:GetKeyLockState() } )
end end
end end

5
nui/radar.css
View File

@@ -736,4 +736,7 @@ button:focus { outline: none; }
text-shadow: 3px 2px 5px rgb( 0, 0, 0 ); text-shadow: 3px 2px 5px rgb( 0, 0, 0 );
z-index: 4; z-index: 4;
} }
#keyLockLabel span {
font-size: 30px;
}

2
nui/radar.html
View File

@@ -200,7 +200,7 @@
<button id="closeUiSettings" class="close">CLOSE</button> <button id="closeUiSettings" class="close">CLOSE</button>
</div> </div>
<p id="keyLockLabel">Radar key lock toggled</p> <p id="keyLockLabel">Radar key lock <span id="keyLockStateLabel"></span></p>
<!-- Load JavaScript files --> <!-- Load JavaScript files -->
<!-- <script src="nui://game/ui/jquery.js"></script> --> <!-- <script src="nui://game/ui/jquery.js"></script> -->

17
nui/radar.js
View File

@@ -69,7 +69,10 @@ const elements =
safezoneSlider: $( "#safezone" ), safezoneSlider: $( "#safezone" ),
safezoneDisplay: $( "#safezoneDisplay" ), safezoneDisplay: $( "#safezoneDisplay" ),
keyLock: $( "#keyLockLabel" ), keyLock: {
label: $( "#keyLockLabel" ),
stateLabel: $( "#keyLockStateLabel" )
},
patrolSpeed: $( "#patrolSpeed" ), patrolSpeed: $( "#patrolSpeed" ),
@@ -144,7 +147,7 @@ const dirs =
elements.radar.hide(); elements.radar.hide();
elements.remote.hide(); elements.remote.hide();
elements.uiSettingsBox.hide(); elements.uiSettingsBox.hide();
elements.keyLock.hide(); elements.keyLock.label.hide();
elements.uiSettingsBtn.click( function() { elements.uiSettingsBtn.click( function() {
setUISettingsVisible( true, true ); setUISettingsVisible( true, true );
@@ -373,12 +376,14 @@ function settingUpdate( ants )
} }
} }
function displayKeyLock() function displayKeyLock( state )
{ {
elements.keyLock.fadeIn(); elements.keyLock.stateLabel.html( state ? "enabled" : "disabled" );
elements.keyLock.label.fadeIn();
setTimeout( function() { setTimeout( function() {
elements.keyLock.fadeOut(); elements.keyLock.label.fadeOut();
}, 2000 ); }, 2000 );
} }
@@ -670,7 +675,7 @@ window.addEventListener( "message", function( event ) {
playLockAudio( item.ant, item.dir, item.vol ); playLockAudio( item.ant, item.dir, item.vol );
break; break;
case "displayKeyLock": case "displayKeyLock":
displayKeyLock(); displayKeyLock( item.state );
break; break;
default: default:
break; break;