[Orxonox-commit 1550] r6268 - code/branches/presentation2/data/gui/scripts

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-12-07 22:06:30 +0100 (Mon, 07 Dec 2009)
New Revision: 6268

Modified:
   code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
Log:
Added more Keybindings to the KeyBinMenu and the displayed names of the commands are now much more userfriendly.


Modified: code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua	2009-12-07 20:59:26 UTC (rev 6267)
+++ code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua	2009-12-07 21:06:30 UTC (rev 6268)
@@ -14,8 +14,41 @@
 function P:init()
     commandList = {}
     table.insert(commandList, "fire 0")
-    table.insert(commandList, "fire 1")
-    table.insert(commandList, "fire 2")
+    table.insert(commandList, "fire 1 | unfire")
+    table.insert(commandList, "onpress fire 2")
+    table.insert(commandList, "scale 1 moveRightLeft")
+    table.insert(commandList, "scale -1 moveRightLeft")
+    table.insert(commandList, "scale 1 moveFrontBack")
+    table.insert(commandList, "boost")
+    table.insert(commandList, "scale -1 moveFrontBack")
+    table.insert(commandList, "scale 1 rotateRoll")
+    table.insert(commandList, "scale -1 rotateRoll")
+    table.insert(commandList, "scale 1 moveUpDown")
+    table.insert(commandList, "scale -1 moveUpDown")
+    table.insert(commandList, "openConsole")
+    table.insert(commandList, "OverlayGroup toggleVisibility Debug")
+    table.insert(commandList, "OverlayGroup toggleVisibility Stats")
+    table.insert(commandList, "mouseLook")
+    table.insert(commandList, "pause")
+    
+    nameList = {}
+    table.insert(nameList, "Primary Fire")
+    table.insert(nameList, "Secondary Fire")
+    table.insert(nameList, "Fire Rocket")
+    table.insert(nameList, "Steer Right")
+    table.insert(nameList, "Steer Left")
+    table.insert(nameList, "Give Thrust")
+    table.insert(nameList, "Boost")
+    table.insert(nameList, "Hit Breaks")
+    table.insert(nameList, "Roll Right")
+    table.insert(nameList, "Roll Left")
+    table.insert(nameList, "Up")
+    table.insert(nameList, "Down")
+    table.insert(nameList, "Open Console")
+    table.insert(nameList, "Show Debug")
+    table.insert(nameList, "Show Stats")
+    table.insert(nameList, "mouseLook")
+    table.insert(nameList, "Pause")
 
     local lineHeight = 30
     
@@ -35,7 +68,7 @@
         line:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0),CEGUI.UDim(0, lineHeight*(k-1))))
         
         button:setText(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(v))
-        command:setText(v)
+        command:setText(nameList[k])
         
         orxonox.KeyBinderManager:getInstance():subscribeEventHelper(button, "Clicked", P.filename .. ".KeyBindButton_clicked")
         --button:subscribeScriptedEvent("EventClicked", P.filename .. ".KeyBindButton_clicked")