From d8b5d3a78d916607c9f2054c9e7119999edcf078 Mon Sep 17 00:00:00 2001 From: MarkT Date: Mon, 2 Aug 2004 23:14:06 +0000 Subject: [PATCH] Directory structure shuffle. This was SVN commit r886. --- binaries/data/config/keys.txt | 144 ++++++++++++++++++ binaries/data/config/system.cfg | 32 ++-- .../{templates => gaia}/Deciduous Tree 1.xml | 1 + .../{templates => gaia}/Deciduous Tree 2.xml | 1 + .../Waypoint.xml => structures/House.xml} | 3 +- .../{templates => units}/Prometheus Dude.xml | 0 .../data/mods/official/gui/test/hello.xml | 7 + 7 files changed, 174 insertions(+), 14 deletions(-) create mode 100755 binaries/data/config/keys.txt rename binaries/data/mods/official/entities/{templates => gaia}/Deciduous Tree 1.xml (90%) rename binaries/data/mods/official/entities/{templates => gaia}/Deciduous Tree 2.xml (85%) rename binaries/data/mods/official/entities/{templates/Waypoint.xml => structures/House.xml} (74%) rename binaries/data/mods/official/entities/{templates => units}/Prometheus Dude.xml (100%) diff --git a/binaries/data/config/keys.txt b/binaries/data/config/keys.txt new file mode 100755 index 0000000000..73930ec509 --- /dev/null +++ b/binaries/data/config/keys.txt @@ -0,0 +1,144 @@ +Backspace, BkSp +Tab +Clear +Return, Ret +Pause +Escape, Esc +Space, Spc +!, Exclaim +", DoubleQuote +#, Hash +$, Dollar +&, Ampersand +', SingleQuote +(, LeftParen +), RightParen +*, Asterisk ++, Plus +,, Comma +-, Minus +., Period +/, ForwardSlash +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +:, Colon +;, Semicolon +<, LessThan +=, Equals +>, GreaterThan +?, Question +@, At +[, LeftBracket +\, BackSlash +], RightBracket +^, Caret +_, Underscore +`, BackQuote +A +B +C +D +E +F +G +H +I +J +K +L +M +N +O +P +Q +R +S +T +U +V +W +X +Y +Z +Delete, Del +Numpad 0, Num0 +Numpad 1, Num1 +Numpad 2, Num2 +Numpad 3, Num3 +Numpad 4, Num4 +Numpad 5, Num5 +Numpad 6, Num6 +Numpad 7, Num7 +Numpad 8, Num8 +Numpad 9, Num9 +Numpad ., NumPoint +Numpad /, NumDivide +Numpad *, NumMultiply +Numpad -, NumMinus +Numpad +, NumPlus +Numpad Enter, NumEnter +Numpad =, NumEquals + +Arrow Up, UpArrow +Arrow Down, DownArrow +Arrow Right, RightArrow +Arrow Left, LeftArrow +Insert, Ins +Home +End +Page Up, PgUp +Page Down, PgDn + +F1 +F2 +F3 +F4 +F5 +F6 +F7 +F8 +F9 +F10 +F11 +F12 +F13 +F14 +F15 + +Num Lock, NumLock +Caps Lock, CapsLock +Scroll Lock, ScrlLock +Right Shift, RightShift +Left Shift, LeftShift +Right Ctrl, RightCtrl +Left Ctrl, LeftCtrl +Right Alt, RightAlt +Left Alt, LeftAlt +Right Meta +Left Meta +Left Super, LeftWin +Right Super, RightWin +Alt Gr, AltGr +Compose + +Help +Print Screen, PrtSc +SysRq +Break +Menu +Power +Euro +Undo +Left Mouse Button, MouseLeft +Right Mouse Button, MouseRight +Middle Mouse Button, MouseMiddle +Mouse Wheel Up, WheelUp +Mouse Wheel Down, WheelDown diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg index ecd4764514..766a637dce 100755 --- a/binaries/data/config/system.cfg +++ b/binaries/data/config/system.cfg @@ -30,17 +30,19 @@ vsync=false ; The keys you can use are in source/lib/KeyNames.cpp. I realise this isn't particularly ; useful for people without access to said file. -hotkey.exit = Escape +hotkey.exit = Escape, "Ctrl+F4" hotkey.screenshot = PrtSc hotkey.wireframe = W -hotkey.camera.reset = H + +hotkey.camera.reset = "H" +hotkey.camera.reset.origin = "Ctrl+H" hotkey.camera.zoom.in = Plus, Equals, NumPlus hotkey.camera.zoom.out = Minus, NumMinus hotkey.camera.zoom.wheel.in = WheelDown hotkey.camera.zoom.wheel.out = WheelUp -hotkey.camera.rotate = "LeftCtrl+MouseMiddle", "RightCtrl+MouseMiddle" +hotkey.camera.rotate = "Ctrl+MouseMiddle" hotkey.camera.rotate.abouttarget = "MouseLeft+MouseRight" -hotkey.camera.pan = MouseMiddle +hotkey.camera.pan = MouseMiddle, ForwardSlash hotkey.camera.pan.left = LeftArrow hotkey.camera.pan.right = RightArrow hotkey.camera.pan.forward = UpArrow @@ -49,11 +51,15 @@ hotkey.camera.bookmark.0 = F5 hotkey.camera.bookmark.1 = F6 hotkey.camera.bookmark.2 = F7 hotkey.camera.bookmark.3 = F8 -hotkey.camera.bookmark.save = LeftCtrl, RightCtrl -hotkey.camera.bookmark.snap = LeftAlt, RightAlt -hotkey.console.toggle = BackQuote -hotkey.selection.add = LeftShift, RightShift -hotkey.selection.remove = LeftCtrl, RightCtrl +hotkey.camera.bookmark.save = Ctrl +hotkey.camera.bookmark.snap = Alt + +hotkey.console.toggle = F1 +hotkey.console.copy = "Ctrl+C" +hotkey.console.paste = Insert, "Ctrl+V" + +hotkey.selection.add = Shift +hotkey.selection.remove = Ctrl hotkey.selection.group.0 = 0 hotkey.selection.group.1 = 1 hotkey.selection.group.2 = 2 @@ -64,9 +70,9 @@ hotkey.selection.group.6 = 6 hotkey.selection.group.7 = 7 hotkey.selection.group.8 = 8 hotkey.selection.group.9 = 9 -hotkey.selection.group.add = LeftShift, RightShift -hotkey.selection.group.save = LeftCtrl, RightCtrl -hotkey.selection.group.snap = LeftAlt, RightAlt +hotkey.selection.group.add = Shift +hotkey.selection.group.save = Ctrl +hotkey.selection.group.snap = Alt hotkey.selection.snap = Home hotkey.contextorder.next = LeftBracket hotkey.contextorder.previous = RightBracket @@ -74,6 +80,6 @@ hotkey.highlightall = O hotkey.orbital.toggle = V hotkey.orbital.cheat = "LeftCtrl+Backslash" -hotkey.dudemachine.random=ForwardSlash +hotkey.dudemachine.random = "Ctrl+ForwardSlash" diff --git a/binaries/data/mods/official/entities/templates/Deciduous Tree 1.xml b/binaries/data/mods/official/entities/gaia/Deciduous Tree 1.xml similarity index 90% rename from binaries/data/mods/official/entities/templates/Deciduous Tree 1.xml rename to binaries/data/mods/official/entities/gaia/Deciduous Tree 1.xml index 0947933009..bc55e61962 100755 --- a/binaries/data/mods/official/entities/templates/Deciduous Tree 1.xml +++ b/binaries/data/mods/official/entities/gaia/Deciduous Tree 1.xml @@ -4,6 +4,7 @@ Deciduous Tree 1 Deciduous 1 0 + 5.0 diff --git a/binaries/data/mods/official/entities/templates/Deciduous Tree 2.xml b/binaries/data/mods/official/entities/gaia/Deciduous Tree 2.xml similarity index 85% rename from binaries/data/mods/official/entities/templates/Deciduous Tree 2.xml rename to binaries/data/mods/official/entities/gaia/Deciduous Tree 2.xml index a5b69b8d22..f1aab5235b 100755 --- a/binaries/data/mods/official/entities/templates/Deciduous Tree 2.xml +++ b/binaries/data/mods/official/entities/gaia/Deciduous Tree 2.xml @@ -4,6 +4,7 @@ Deciduous Tree 2 Deciduous 2 0 + 7.0 \ No newline at end of file diff --git a/binaries/data/mods/official/entities/templates/Waypoint.xml b/binaries/data/mods/official/entities/structures/House.xml similarity index 74% rename from binaries/data/mods/official/entities/templates/Waypoint.xml rename to binaries/data/mods/official/entities/structures/House.xml index 7edd2a5eed..80bef488ef 100755 --- a/binaries/data/mods/official/entities/templates/Waypoint.xml +++ b/binaries/data/mods/official/entities/structures/House.xml @@ -1,8 +1,9 @@ - Waypoint + House Greek House 0 + 20.0 \ No newline at end of file diff --git a/binaries/data/mods/official/entities/templates/Prometheus Dude.xml b/binaries/data/mods/official/entities/units/Prometheus Dude.xml similarity index 100% rename from binaries/data/mods/official/entities/templates/Prometheus Dude.xml rename to binaries/data/mods/official/entities/units/Prometheus Dude.xml diff --git a/binaries/data/mods/official/gui/test/hello.xml b/binaries/data/mods/official/gui/test/hello.xml index 86e62efea5..cec9bf0a71 100755 --- a/binaries/data/mods/official/gui/test/hello.xml +++ b/binaries/data/mods/official/gui/test/hello.xml @@ -15,6 +15,13 @@ writeConsole("Dude created at " + DudeSpawnPoint + "; " + ++dudes + " Dudes created this way." ); } + function selected() + { + if( selection.length > 0 ) + return( selection[0] ); + return( null ); + } + function updateOrbital() { if( !getGUIObjectByName( 'arena' ).hidden )