Skip to content
Snippets Groups Projects
Commit 403cc99b authored by stefan's avatar stefan
Browse files

dokk (the docking game):

- Make sensitivity of SpaceExplorer lower (BZDNG-105)
- highscore when entering name (BZDNG-118)

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2145 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent 0a8f309a
Branches
Tags
No related merge requests found
[10]
score = 32.7570391734
score = 2.80041636229
name = AAA
[1]
......@@ -7,34 +7,34 @@ score = 1.06508742174
name = AAA
[3]
score = 1.22069145838
score = 1.08804896275
name = STU
[2]
score = 1.08804896275
score = 1.08776344856
name = STU
[5]
score = 1.34045518637
score = 1.26454350948
name = STU
[4]
score = 1.26454350948
score = 1.22069145838
name = STU
[7]
score = 1.87384883563
name = BIO
score = 1.57162377437
name = STU
[6]
score = 1.57162377437
score = 1.34045518637
name = STU
[9]
score = 2.80041636229
name = AAA
[8]
score = 2.58003196716
name = STU
[8]
score = 1.87384883563
name = BIO
[1]
score = 30.0449929992
name = STU
[2]
score = 30.0515190323
name = AAA
......@@ -68,7 +68,7 @@ class HighScore(QtCore.QObject):
text += "\n%-2s%5s%-6s%5s%+6s"%(str("%-2i"%i), "", data[0],"", str("%3.2f"%float(data[1])))
i += 1
data = self.topten.GetData(i)
rect = QtCore.QRect(QtCore.QPoint(60, 200), QtCore.QSize(24*20, (i+2)*30))
rect = QtCore.QRect(QtCore.QPoint(60, 300), QtCore.QSize(24*20, (i+2)*30))
self.hud_bg = RectHUDObject(-1,rect, bg_color=QtGui.QColor(128,128,128,200))
dokk.Dokk().gl_win.AddHUDObject(self.hud_bg)
self.hud_text = RectTextHUDObject(text, rect=rect, time=-1, font=QtGui.QFont("Courier",20))
......@@ -122,7 +122,7 @@ class LevelDescr(QtCore.QObject):
def Start(self):
descr_len = len(self.descr)
xpos = dokk.Dokk().gl_win.Width()/2 - (descr_len*30)/2
rect = QtCore.QRect(QtCore.QPoint(xpos, dokk.Dokk().gl_win.Height()-400), QtCore.QSize(descr_len*30, 105))
rect = QtCore.QRect(QtCore.QPoint(xpos, dokk.Dokk().gl_win.Height()-105), QtCore.QSize(descr_len*30, 105))
self.hud_bg = RectHUDObject(-1,rect, bg_color=QtGui.QColor(128,128,128,200))
dokk.Dokk().gl_win.AddHUDObject(self.hud_bg)
self.hud_descr_text = RectTextHUDObject(self.descr, rect=rect, time=-1, font=QtGui.QFont("Verdana",20))
......
......@@ -2,7 +2,7 @@ import dokk
from PyQt4 import QtCore, QtGui
from hud import *
from ost import gui
from level_info import HighScore
ALPHABET = ['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','0','1','2','3','4','5','6','7','8','9']
LETTER_BREAK = 3000
......@@ -15,9 +15,7 @@ class NameEnter(QtCore.QObject):
self._spnav = gui.SpnavInput.GetQThread()
self._spnav.start()
except AttributeError:
self._spnav = None
self._spnav = None
self.Reset()
def Reset(self):
......@@ -108,11 +106,13 @@ class HUDNameInput(QtCore.QObject):
self.connect(self.ne,QtCore.SIGNAL("Changed()"),self.Update)
self.connect(self.ne,QtCore.SIGNAL("Finished()"),self.Finish)
self.huds = list()
self.high_score = HighScore(None)
self.hud_text = None
self.bg = None
def Start(self):
self.high_score.topten = dokk.Dokk().GetLevel().topten
self.high_score.Start()
self.ne.Start()
del(self.huds[:])
rect = QtCore.QRect(QtCore.QPoint(60, 60), QtCore.QSize(dokk.Dokk().gl_win.Width()-120, 220))
......@@ -145,6 +145,7 @@ class HUDNameInput(QtCore.QObject):
self.huds[i].color = QtGui.QColor(255,255,255)
def Stop(self):
self.high_score.Finish()
self.ne.Stop()
for hud in self.huds:
dokk.Dokk().gl_win.RemoveHUDObject(hud)
......
......@@ -22,7 +22,7 @@ class SpnavInputDevice(QtCore.QObject):
self.rot = True
self._lock_input = False
self._trans_factor = 0.5
self._trans_factor = 0.125
self.score_scip = 0
def SetLevel(self, level):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment