1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
|
Some source changes accumulated over time to keep the software up to
the status of the archive
Index: ghextris-0.9.0/ghextris.py
===================================================================
--- ghextris-0.9.0.orig/ghextris.py 2009-11-11 13:38:39.000000000 +0100
+++ ghextris-0.9.0/ghextris.py 2009-11-11 13:39:05.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
+#!/usr/bin/python
# Gnome-hextris; a free rewrite of the xhextris game in Python for Gnome
# Copyright 2004 Mikko Rauhala <mjr@iki.fi>
@@ -29,14 +29,15 @@
pygtk.require("2.0")
import gtk
-import gnome.canvas
+import gnomecanvas
import gnome
+import gnome.ui
import gobject
import gtk.glade
import gettext
-import whrandom
+import random
class Hextris:
def __init__(self):
@@ -119,17 +120,17 @@
self.speed_orig = 400
self.speed = 400
self.speed_ratio = 0.99
- self.speed_reset = gtk.FALSE
- self.paused = gtk.FALSE
- self.lost = gtk.TRUE
+ self.speed_reset = False
+ self.paused = False
+ self.lost = True
self.score = 0
self.hiscore = 0
self.nextnum = 0
- self.running = gtk.FALSE
+ self.running = False
- self.nextpiece = gtk.FALSE
- self.board = gtk.FALSE
+ self.nextpiece = False
+ self.board = False
self.rowgroups = []
def draw_hexagon(self, group, color):
@@ -196,12 +197,12 @@
self.speed = self.speed_orig
self.score = 0
self.attitude = 0
- self.lost = gtk.FALSE
- self.paused = gtk.FALSE
+ self.lost = False
+ self.paused = False
self.update_appbar()
- if self.board != gtk.FALSE:
+ if self.board != False:
self.board.destroy()
self.board = self.canvas.root().add("GnomeCanvasGroup", x = 0, y = 0)
@@ -216,32 +217,32 @@
self.rowgroups.append(self.board.add("GnomeCanvasGroup", x = 0,
y = i * self.pieceheight))
- self.nextnum = whrandom.randint(0, 9)
+ self.nextnum = random.randint(0, 9)
self.next_piece()
- if self.running == gtk.FALSE:
+ if self.running == False:
gobject.timeout_add(self.speed, self.timer_handler)
- self.running = gtk.TRUE
+ self.running = True
else:
- self.speed_reset = gtk.TRUE
+ self.speed_reset = True
- return gtk.TRUE
+ return True
def on_about_activate(self, event):
aTree = gtk.glade.XML(self.glade, "about")
about = aTree.get_widget("about")
about.set_property("name", "Ghextris")
about.set_property("version", VERSION)
- return gtk.TRUE
+ return True
def on_pause_game_activate(self, event):
- if self.lost == gtk.TRUE:
- return gtk.FALSE
- if self.paused == gtk.TRUE:
- self.paused = gtk.FALSE
+ if self.lost == True:
+ return False
+ if self.paused == True:
+ self.paused = False
else:
- self.paused = gtk.TRUE
- return gtk.TRUE
+ self.paused = True
+ return True
def on_quit_activate(self, event):
gtk.main_quit()
@@ -277,7 +278,7 @@
win.connect("key-press-event", self.key_handler)
self.init_board()
- whrandom.seed()
+ random.seed()
self.update_appbar()
@@ -285,7 +286,7 @@
def next_piece(self):
self.piecenum = self.nextnum
- self.nextnum = whrandom.randint(0, 9)
+ self.nextnum = random.randint(0, 9)
self.attitude = 0
self.piece_x = (self.cols/2)-1 + self.deltax[self.piecenum]
self.piece_y = -3 + self.deltax[self.piecenum]
@@ -293,7 +294,7 @@
self.colors[self.piecenum%(len(self.colors)+1)],
self.piece_x, self.piece_y)
- if self.nextpiece != gtk.FALSE:
+ if self.nextpiece != False:
self.nextpiece.destroy()
self.nextpiece = self.place_piece(self.preview,
self.pieces[self.nextnum][0],
@@ -302,35 +303,35 @@
self.deltay[self.nextnum])
def timer_handler(self):
- if self.lost == gtk.TRUE:
- self.running = gtk.FALSE
- return gtk.FALSE
+ if self.lost == True:
+ self.running = False
+ return False
- if self.paused == gtk.TRUE:
- return gtk.TRUE
+ if self.paused == True:
+ return True
self.piece_y += 1
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
self.piece_y -= 1
self.update_field()
- if self.top_occupied() != gtk.TRUE:
+ if self.top_occupied() != True:
self.next_piece()
else:
- self.lost = gtk.TRUE
+ self.lost = True
if self.hiscore < self.score:
self.hiscore = self.score
self.update_appbar()
- self.running = gtk.FALSE
- return gtk.FALSE
+ self.running = False
+ return False
else:
self.piece.move(0, self.pieceheight)
- if self.speed_reset == gtk.TRUE:
- self.speed_reset = gtk.FALSE
+ if self.speed_reset == True:
+ self.speed_reset = False
gobject.timeout_add(int(self.speed), self.timer_handler)
- return gtk.FALSE
+ return False
- return gtk.TRUE
+ return True
def update_appbar(self):
self.appbar.set_text("%s: %d | %s: %d" % (_("Score"), self.score,
@@ -338,18 +339,18 @@
self.hiscore))
def key_handler(self, widget, event=None):
- if self.lost == gtk.TRUE:
- return gtk.FALSE
+ if self.lost == True:
+ return False
- if event.keyval == gtk.keysyms.p and self.lost == gtk.FALSE:
- if self.paused == gtk.TRUE:
- self.paused = gtk.FALSE
+ if event.keyval == gtk.keysyms.p and self.lost == False:
+ if self.paused == True:
+ self.paused = False
else:
- self.paused = gtk.TRUE
- return gtk.TRUE
+ self.paused = True
+ return True
- if self.paused == gtk.TRUE:
- return gtk.FALSE
+ if self.paused == True:
+ return False
if event.keyval == gtk.keysyms.Up or event.keyval == gtk.keysyms.Down:
if event.keyval == gtk.keysyms.Up:
@@ -360,16 +361,16 @@
self.attitude = ((self.attitude + attitude_change +
len(self.pieces[self.piecenum])) %
len(self.pieces[self.piecenum]))
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
self.attitude = old_attitude
- return gtk.TRUE
+ return True
self.piece.destroy()
self.piece = self.place_piece(self.board,
self.pieces[self.piecenum][self.attitude],
self.colors[self.piecenum%(len(self.colors)+1)],
self.piece_x, self.piece_y);
- return gtk.TRUE
+ return True
if event.keyval == gtk.keysyms.Left or event.keyval == gtk.keysyms.Right:
if event.keyval == gtk.keysyms.Left:
@@ -384,23 +385,23 @@
else:
deltay -= self.pieceheight/2
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
if deltay > 0:
self.piece_x -= deltax
- return gtk.TRUE
+ return True
self.piece_y += 1
deltay += self.pieceheight
- if self.check_collisions() == gtk.TRUE:
+ if self.check_collisions() == True:
self.piece_x -= deltax
self.piece_y -= 1
- return gtk.TRUE
+ return True
self.piece.move(deltax*(self.piecewidth+self.piecenarrow)/2, deltay)
- return gtk.TRUE
+ return True
if event.keyval == gtk.keysyms.space:
orig_piece_y = self.piece_y
- while self.check_collisions() == gtk.FALSE:
+ while self.check_collisions() == False:
self.piece_y += 1
self.piece_y -= 1
self.piece.move(0, self.pieceheight*(self.piece_y - orig_piece_y))
@@ -408,17 +409,17 @@
if self.score > self.hiscore:
self.hiscore = self.score
self.update_field()
- if self.top_occupied() != gtk.TRUE:
+ if self.top_occupied() != True:
self.next_piece()
else:
- self.lost = gtk.TRUE
+ self.lost = True
if self.hiscore < self.score:
self.hiscore = self.score
self.update_appbar()
- return gtk.TRUE
+ return True
- return gtk.FALSE
+ return False
def check_collisions(self):
for i in range(len(self.pieces[self.piecenum][self.attitude])):
@@ -429,12 +430,12 @@
else:
deltay = 0
if j + self.piece_x < 0 or j + self.piece_x >= self.cols:
- return gtk.TRUE
+ return True
if ((i + self.piece_y + deltay > 0) and
(i + self.piece_y + deltay >= self.rows or
self.field[i + self.piece_y + deltay][j + self.piece_x] != 0)):
- return gtk.TRUE
- return gtk.FALSE
+ return True
+ return False
def update_field(self):
for i in range(len(self.pieces[self.piecenum][self.attitude])):
@@ -456,16 +457,16 @@
def collapse_rows(self):
row_points = 50
for i in range(self.rows):
- row_full = gtk.TRUE
+ row_full = True
for j in range(self.cols):
if self.field[i][j] == 0:
- row_full = gtk.FALSE
+ row_full = False
break
- if row_full == gtk.TRUE:
+ if row_full == True:
row_points *= 2
self.speed *= self.speed_ratio
- self.speed_reset = gtk.TRUE
+ self.speed_reset = True
self.rowgroups[i].destroy()
for j in range(i-1, -1, -1):
self.rowgroups[j].move(0, self.pieceheight)
@@ -485,8 +486,8 @@
def top_occupied(self):
for i in range(self.cols):
if self.field[0][i] != 0:
- return gtk.TRUE
- return gtk.FALSE
+ return True
+ return False
if __name__ == '__main__':
h = Hextris()
|
