cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

This should fix the issue with hotkeys causing regular typing not to focus on the input bar. There are now two macro-sets, "macro"(normal) and "hotkeymode"(the same but with WASD Q E R T F G and X hotkeys). Pressing Tab will toggle between these sets.

Browse Source 
Changed the default maptext colour to white.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4689 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-09-14 12:44:51 +00:00
parent f4ffe0141c
commit a33880854a
2 changed files with 255 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
interface/interface.dm
View File

@@ -88,41 +88,41 @@
set category = "OOC"
var/hotkey_mode = {"<font color='purple'>
Hotkey-Mode: (hotkey-mode must be on)\n
TAB = toggle hotkey-mode\n
a = left\n
s = down\n
d = east\n
w = up\n
q = drop\n
e = equip\n
r = throw\n
t = say\n
x = swap-hand\n
f = cycle-intents-left\n
g = cycle-intents-right\n
Hotkey-Mode: (hotkey-mode must be on)
\tTAB = toggle hotkey-mode
\ta = left
\ts = down
\td = east
\tw = up
\tq = drop
\te = equip
\tr = throw
\tt = say
\tx = swap-hand
\tf = cycle-intents-left
\tg = cycle-intents-right
</font>"}
var/other = {"<font color='purple'>
Any-Mode: (hotkey doesn't need to be on)\n
Ctrl+a = left\n
Ctrl+s = down\n
Ctrl+d = east\n
Ctrl+w = up\n
Ctrl+q = drop\n
Ctrl+e = equip\n
Ctrl+r = throw\n
Ctrl+x = swap-hand\n
Ctrl+f = cycle-intents-left\n
Ctrl+g = cycle-intents-right\n
Any-Mode: (hotkey doesn't need to be on)
\tCtrl+a = left
\tCtrl+s = down
\tCtrl+d = east
\tCtrl+w = up
\tCtrl+q = drop
\tCtrl+e = equip
\tCtrl+r = throw
\tCtrl+x = swap-hand
\tCtrl+f = cycle-intents-left
\tCtrl+g = cycle-intents-right
</font>"}
var/admin = {"<font color='purple'>
Admin:\n
F5 = toggle-admin-observe (WIP)
F6 = player-panel-new
F7 = admin-pm
F8 = (WIP)
Admin:
\tF5 = toggle-admin-observe (WIP)
\tF6 = player-panel-new
\tF7 = admin-pm
\tF8 = (WIP)
</font>"}
src << hotkey_mode

314
interface/skin.dmf
View File

@@ -1,7 +1,7 @@
macro "macro"
elem
name = "TAB"
command = ".winset \"hotkey_toggle.is-checked=true ? hotkey_toggle.is-checked=false input.focus=true a_key.is-disabled=true s_key.is-disabled=true d_key.is-disabled=true w_key.is-disabled=true q_key.is-disabled=true e_key.is-disabled=true r_key.is-disabled=true x_key.is-disabled=true t_key.is-disabled=true f_key.is-disabled=true g_key.is-disabled=true : hotkey_toggle.is-checked=true mapwindow.map.focus=true a_key.is-disabled=false s_key.is-disabled=false d_key.is-disabled=false w_key.is-disabled=false q_key.is-disabled=false e_key.is-disabled=false r_key.is-disabled=false x_key.is-disabled=false t_key.is-disabled=false f_key.is-disabled=false g_key.is-disabled=false\""
command = ".winset \"mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\""
is-disabled = false
elem
name = "CENTER+REP"
@@ -47,6 +47,46 @@ macro "macro"
name = "EAST+REP"
command = ".east"
is-disabled = false
elem
name = "CTRL+A+REP"
command = ".west"
is-disabled = false
elem
name = "CTRL+D+REP"
command = ".east"
is-disabled = false
elem
name = "CTRL+E"
command = "quick-equip"
is-disabled = false
elem
name = "CTRL+F"
command = "a-intent-left"
is-disabled = false
elem
name = "CTRL+G"
command = "a-intent-right"
is-disabled = false
elem
name = "CTRL+Q"
command = ".northwest"
is-disabled = false
elem
name = "CTRL+R"
command = ".southwest"
is-disabled = false
elem
name = "CTRL+S+REP"
command = ".south"
is-disabled = false
elem
name = "CTRL+W+REP"
command = ".north"
is-disabled = false
elem
name = "CTRL+X"
command = ".northeast"
is-disabled = false
elem
name = "CTRL+SOUTH"
command = "southface"
@@ -63,90 +103,6 @@ macro "macro"
name = "DELETE"
command = "delete-key-pressed"
is-disabled = false
elem "a_key"
name = "A+REP"
command = ".west"
is-disabled = true
elem
name = "CTRL+A+REP"
command = ".west"
is-disabled = false
elem "d_key"
name = "D+REP"
command = ".east"
is-disabled = true
elem
name = "CTRL+D+REP"
command = ".east"
is-disabled = false
elem "e_key"
name = "E"
command = "quick-equip"
is-disabled = true
elem
name = "CTRL+E"
command = "quick-equip"
is-disabled = false
elem "f_key"
name = "F"
command = "a-intent-left"
is-disabled = true
elem
name = "CTRL+F"
command = "a-intent-left"
is-disabled = false
elem "g_key"
name = "G"
command = "a-intent-right"
is-disabled = true
elem
name = "CTRL+G"
command = "a-intent-right"
is-disabled = false
elem "q_key"
name = "Q"
command = ".northwest"
is-disabled = true
elem
name = "CTRL+Q"
command = ".northwest"
is-disabled = false
elem "r_key"
name = "R"
command = ".southwest"
is-disabled = true
elem
name = "CTRL+R"
command = ".southwest"
is-disabled = false
elem "s_key"
name = "S+REP"
command = ".south"
is-disabled = true
elem
name = "CTRL+S+REP"
command = ".south"
is-disabled = false
elem "t_key"
name = "T"
command = "say"
is-disabled = true
elem "w_key"
name = "W+REP"
command = ".north"
is-disabled = true
elem
name = "CTRL+W+REP"
command = ".north"
is-disabled = false
elem "x_key"
name = "X"
command = ".northeast"
is-disabled = true
elem
name = "CTRL+X"
command = ".northeast"
is-disabled = false
elem
name = "F1"
command = "adminhelp"
@@ -180,6 +136,187 @@ macro "macro"
command = "F12"
is-disabled = false
macro "hotkeymode"
elem
name = "TAB"
command = ".winset \"mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true\""
is-disabled = false
elem
name = "CENTER+REP"
command = ".center"
is-disabled = false
elem
name = "NORTHEAST"
command = ".northeast"
is-disabled = false
elem
name = "SOUTHEAST"
command = ".southeast"
is-disabled = false
elem
name = "SOUTHWEST"
command = ".southwest"
is-disabled = false
elem
name = "NORTHWEST"
command = ".northwest"
is-disabled = false
elem
name = "CTRL+WEST"
command = "westface"
is-disabled = false
elem
name = "WEST+REP"
command = ".west"
is-disabled = false
elem
name = "CTRL+NORTH"
command = "northface"
is-disabled = false
elem
name = "NORTH+REP"
command = ".north"
is-disabled = false
elem
name = "CTRL+EAST"
command = "eastface"
is-disabled = false
elem
name = "EAST+REP"
command = ".east"
is-disabled = false
elem "a_key"
name = "A+REP"
command = ".west"
is-disabled = false
elem
name = "CTRL+A+REP"
command = ".west"
is-disabled = false
elem "d_key"
name = "D+REP"
command = ".east"
is-disabled = false
elem
name = "CTRL+D+REP"
command = ".east"
is-disabled = false
elem "e_key"
name = "E"
command = "quick-equip"
is-disabled = false
elem
name = "CTRL+E"
command = "quick-equip"
is-disabled = false
elem "f_key"
name = "F"
command = "a-intent-left"
is-disabled = false
elem
name = "CTRL+F"
command = "a-intent-left"
is-disabled = false
elem "g_key"
name = "G"
command = "a-intent-right"
is-disabled = false
elem
name = "CTRL+G"
command = "a-intent-right"
is-disabled = false
elem "q_key"
name = "Q"
command = ".northwest"
is-disabled = false
elem
name = "CTRL+Q"
command = ".northwest"
is-disabled = false
elem "r_key"
name = "R"
command = ".southwest"
is-disabled = false
elem
name = "CTRL+R"
command = ".southwest"
is-disabled = false
elem "s_key"
name = "S+REP"
command = ".south"
is-disabled = false
elem
name = "CTRL+S+REP"
command = ".south"
is-disabled = false
elem "t_key"
name = "T"
command = "say"
is-disabled = false
elem "w_key"
name = "W+REP"
command = ".north"
is-disabled = false
elem
name = "CTRL+W+REP"
command = ".north"
is-disabled = false
elem "x_key"
name = "X"
command = ".northeast"
is-disabled = false
elem
name = "CTRL+X"
command = ".northeast"
is-disabled = false
elem
name = "CTRL+SOUTH"
command = "southface"
is-disabled = false
elem
name = "SOUTH+REP"
command = ".south"
is-disabled = false
elem
name = "INSERT"
command = "insert-key-pressed"
is-disabled = false
elem
name = "DELETE"
command = "delete-key-pressed"
is-disabled = false
elem
name = "F1"
command = "adminhelp"
is-disabled = false
elem
name = "CTRL+SHIFT+F1+REP"
command = ".options"
is-disabled = false
elem
name = "F2+REP"
command = ".screenshot auto"
is-disabled = false
elem
name = "SHIFT+F2+REP"
command = ".screenshot"
is-disabled = false
elem
name = "F5"
command = "admin-observe"
is-disabled = false
elem
name = "F6"
command = "Player-Panel-New"
is-disabled = false
elem
name = "F7"
command = "Admin-PM"
is-disabled = false
elem
name = "F12"
command = "F12"
is-disabled = false
menu "menu"
elem
@@ -925,11 +1062,11 @@ window "mainwindow"
border = none
drop-zone = false
right-click = false
saved-params = "is-checked"
saved-params = ""
on-size = ""
text = "Hotkey Toggle"
image = ""
command = ".winset \"hotkey_toggle.is-checked=false ? input.focus=true a_key.is-disabled=true s_key.is-disabled=true d_key.is-disabled=true w_key.is-disabled=true q_key.is-disabled=true e_key.is-disabled=true r_key.is-disabled=true x_key.is-disabled=true t_key.is-disabled=true f_key.is-disabled=true g_key.is-disabled=true : mapwindow.map.focus=true a_key.is-disabled=false s_key.is-disabled=false d_key.is-disabled=false w_key.is-disabled=false q_key.is-disabled=false e_key.is-disabled=false r_key.is-disabled=false x_key.is-disabled=false t_key.is-disabled=false f_key.is-disabled=false g_key.is-disabled=false\""
command = ".winset \"mainwindow.macro!=macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\""
is-flat = false
stretch = false
is-checked = false
@@ -967,6 +1104,7 @@ window "mainwindow"
size = 517x20
anchor1 = 0,100
anchor2 = 100,100
focus = true
font-family = ""
font-size = 0
font-style = ""
@@ -1063,7 +1201,7 @@ window "mapwindow"
font-family = ""
font-size = 0
font-style = ""
text-color = #000000
text-color = #FFFFFF
background-color = none
is-visible = true
is-disabled = false