[SCM] krank is a game of dexterity where you match stones together branch, master, updated. debian/0.7+dfsg2-3
Dmitry E. Oboukhov
unera at debian.org
Mon Jul 2 20:54:42 UTC 2012
The following commit has been merged in the master branch:
commit 25c8feed51777b45ea4b2b586d53a20fa6127586
Author: Dmitry E. Oboukhov <unera at debian.org>
Date: Tue Jul 3 00:47:42 2012 +0400
drop old patches
diff --git a/debian/patches/fix_index_out_of_range_on_level_extreme.patch b/debian/patches/fix_index_out_of_range_on_level_extreme.patch
deleted file mode 100644
index 76e5b53..0000000
--- a/debian/patches/fix_index_out_of_range_on_level_extreme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Config.py 2009-03-08 02:16:36.000000000 +0300
-+++ src/Config.py 2009-03-08 02:11:10.000000000 +0300
-@@ -32,7 +32,7 @@
- #-------------------------------------------------------------------------------------------
- def score (self, level):
- si = k.level.isBonus() and 4 or self.stage-1
-- li = k.level.isBonus and self.stage-1 or level-1
-+ li = k.level.isBonus() and self.stage-1 or level-1
-
- # stats
- self['totalTime'] += k.level.time/1000
diff --git a/debian/patches/fixed_changing_level_by_level.patch b/debian/patches/fixed_changing_level_by_level.patch
deleted file mode 100644
index 782b5b6..0000000
--- a/debian/patches/fixed_changing_level_by_level.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/Config.py 2009-03-09 15:03:30.000000000 +0300
-+++ src/Config.py 2009-03-09 15:36:35.000000000 +0300
-@@ -75,12 +75,8 @@
-
- #-------------------------------------------------------------------------------------------
- def makeLevelAvailable (self):
-- for i in range(2):
-- for stage_index in range(3):
-- scores = self['scores'][stage_index]
-- if len(scores) < levels.numLevels:
-- scores.append({'time': sys.maxint, 'score': sys.maxint})
-- break
-+ if len(self['scores'][self.stage - 1]) < levels.numLevels:
-+ self['scores'][self.stage - 1].append({'time': sys.maxint, 'score': sys.maxint})
-
- #-------------------------------------------------------------------------------------------
- def apply(self):
diff --git a/debian/patches/fullscreen.patch b/debian/patches/fullscreen.patch
deleted file mode 100644
index ed2b6e2..0000000
--- a/debian/patches/fullscreen.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- src/Config.py 2008-06-17 13:32:42.000000000 +0000
-+++ src/Config.py 2008-06-17 13:35:44.000000000 +0000
-@@ -24,6 +24,7 @@
- self['stageTime'] = [0,0,0,0]
- self['totalSolved'] = [0,0,0,0]
- self.stage = 1
-+ self.fullscreen = 0
-
- k.config = self
-
---- src/Main.py 2008-06-17 13:32:42.000000000 +0000
-+++ src/Main.py 2008-06-17 13:36:34.000000000 +0000
-@@ -17,15 +17,17 @@
- k.debug = 0
- startlevel = k.debug and 24
- startstage = 1
--fullscreen = not k.debug or 0
-
- pygame.init()
- pygame.font.init()
-
- Config()
-
-+fullscreen = k.config.fullscreen
-+
- if k.debug:
- k.config.stage = startstage
-+ fullscreen = 0
-
- #-------------------------------------------------------------------------------------------
-
---- src/World.py 2008-07-28 20:32:09.000000000 +0200
-+++ src/World.py 2008-07-28 23:37:22.000000000 +0200
-@@ -39,6 +39,7 @@
- def initScreen (self, size, flags):
- k.screen = pygame.display.set_mode(size, flags)
- self.rect = pygame.Rect(0, 0, size[0], size[1])
-+ self.screen_flags = flags
- self.postInit()
-
- #-------------------------------------------------------------------------------------------
-@@ -46,7 +47,7 @@
- if size <> self.rect.size:
- self.image = None
- k.sound.play('exit')
-- k.screen = pygame.display.set_mode(size, pygame.FULLSCREEN)
-+ k.screen = pygame.display.set_mode(size, self.screen_flags)
- self.rect = pygame.Rect(0, 0, size[0], size[1])
- self.postInit()
- Level('menu_screen')
-
---- src/Config.py 2009-03-12 13:49:34.000000000 +0300
-+++ src/Config.py 2009-03-12 14:49:33.000000000 +0300
-@@ -98,6 +98,8 @@
- self['music_volume'] = k.sound.musicVolume
- self['sound_volume'] = k.sound.soundVolume
- self['screen'] = k.world.rect.size
-+ self['stage'] = k.config.stage
-+ self['fullscreen'] = k.config.fullscreen
- try:
- config_file = self.getConfigFilePath()
- log('writing config to', config_file, log='config')
-@@ -116,6 +117,7 @@
- file = open(config_file, 'r')
- self.update(cPickle.load(file))
- self.stage = self['stage']
-+ k.config.fullscreen=self['fullscreen']
- while len(self['scores']) < 4: self['scores'].append([])
- log(self, log='config')
- except Exception, e:
---- src/Main.py 2009-03-12 13:49:34.000000000 +0300
-+++ src/Main.py 2009-03-12 14:52:10.000000000 +0300
-@@ -58,7 +58,11 @@
- width, height = modes[0]
- flags = pygame.FULLSCREEN
- else:
-- width, height, flags = 800, 600, pygame.RESIZABLE
-+ if k.config['screen']:
-+ width, height = k.config['screen']
-+ else:
-+ width, height=800, 600
-+ flags = pygame.RESIZABLE
-
- k.clock = pygame.time.Clock()
-
-@@ -152,4 +156,4 @@
- stats.print_stats()
- else:
- loop()
--
-\ В конце файла нет новой строки
-+
---- src/World.py 2009-03-12 13:49:34.000000000 +0300
-+++ src/World.py 2009-03-12 15:04:07.000000000 +0300
-@@ -53,6 +53,29 @@
- Level('menu_screen')
- k.screen.blit(k.world.image, k.screen.get_rect())
- pygame.display.flip()
-+
-+ #-------------------------------------------------------------------------------------------
-+ def toggleFullscreen(self):
-+ if k.config.fullscreen:
-+ sx,sy=k.world.rect.size
-+ k.config.fullscreen = 0
-+ k.screen = pygame.display.set_mode((sx, sy), pygame.RESIZABLE);
-+ self.rect = pygame.Rect(0, 0, sx, sy)
-+ self.screen_flags = pygame.RESIZABLE
-+ self.postInit()
-+ Level('menu_screen')
-+ k.screen.blit(k.world.image, k.screen.get_rect())
-+ pygame.display.flip()
-+ else:
-+ sx,sy=k.world.rect.size
-+ k.config.fullscreen = 1
-+ k.screen = pygame.display.set_mode((sx, sy), pygame.FULLSCREEN);
-+ self.rect = pygame.Rect(0, 0, sx, sy)
-+ self.screen_flags = pygame.FULLSCREEN
-+ self.postInit()
-+ Level('menu_screen')
-+ k.screen.blit(k.world.image, k.screen.get_rect())
-+ pygame.display.flip()
-
- #-------------------------------------------------------------------------------------------
- # fonts
---- levels/menu_screen.py 2009-03-12 13:49:34.000000000 +0300
-+++ levels/menu_screen.py 2009-03-12 14:41:19.000000000 +0300
-@@ -17,7 +17,13 @@
- 'align': 'bottom',
- 'action': 'k.config.save() or k.level.menuExit()',
- 'size': 'small',
-- 'pos': pos(cx, h*7/8)}))
-+ 'pos': pos(cx-cx/3, h*7/8)}))
-+
-+ k.particles.add(Switch({ 'text': 'Fullscreen',
-+ 'align': 'bottom',
-+ 'action': 'k.world.toggleFullscreen()',
-+ 'size': 'small',
-+ 'pos': pos(cx+cx/3, h*7/8)}))
- modes = pygame.display.list_modes(32, pygame.FULLSCREEN)
- modes = [m for m in modes if (m[1] >= 600)]
- set = sets.Set()
-@@ -28,7 +34,7 @@
- m = modes[i]
- active = m==k.world.rect.size
- dirvec = vector.withAngle(-(i+1)*2*math.pi/(len(modes)+1)+math.pi/2, h*5/12)
-- dirvec.y *= 0.8
-+ dirvec.y *= 0.6
- k.particles.add(Switch({ 'text': "%dx%d" % m,
- 'size': 'small',
- 'align': 'bottom',
---- src/Config.py 2009-03-13 11:17:07.000000000 +0300
-+++ src/Config.py 2009-03-13 11:43:17.000000000 +0300
-@@ -1,6 +1,7 @@
- #
- # Config.py
-
-+import getopt, sys
- import k, levels
-
- from Krank import *
-@@ -30,6 +31,36 @@
-
- self.load()
-
-+ try:
-+ opts, args = getopt.getopt(sys.argv[1:], 'whfs:')
-+ except getopt.GetoptError, err:
-+ print str(err)
-+ self.usage_exit(-1)
-+
-+ for o, a in opts:
-+ if o == '-h': self.usage_exit(0)
-+ if o == '-w': self.fullscreen = 0
-+ if o == '-f': self.fullscreen = 1
-+ if o == '-s':
-+ try:
-+ w,h=a.split('x', 2)
-+ self['screen']=int(w),int(h)
-+ except ValueError, err:
-+ print "Invalid screen size:", a, "\n\t", str(err)
-+ self.usage_exit(-1)
-+
-+ #-------------------------------------------------------------------------------------------
-+ def usage_exit(self, retcode):
-+ print "Usage:"
-+ print "\tkrank -h for display this screen"
-+ print "\tkrank -f for start in fullscreen mode"
-+ print "\tkrank -w for start in windowed mode"
-+ print "\tkrank -s WxH for start in screen (-f or -w) with defined size"
-+ print "\nexamples:"
-+ print "\tkrank -f -s 800x600"
-+ print "\tkrank -w -s 921x652"
-+ sys.exit(retcode)
-+
- #-------------------------------------------------------------------------------------------
- def score (self, level):
- si = k.level.isBonus() and 4 or self.stage-1
diff --git a/debian/patches/krank-linux-config.patch b/debian/patches/krank-linux-config.patch
deleted file mode 100644
index bbddfbc..0000000
--- a/debian/patches/krank-linux-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/Config.py
-===================================================================
-RCS file: /cvsroot/krank/krank/src/Config.py,v
-retrieving revision 1.13
-diff -u -r1.13 Config.py
---- src/Config.py 28 Feb 2007 13:23:43 -0000 1.13
-+++ src/Config.py 14 Jun 2008 23:31:03 -0000
-@@ -91,6 +91,8 @@
- def getConfigFilePath(self):
- if os.sys.platform == 'darwin':
- return os.path.expanduser('~/Library/Preferences/krank.cfg')
-+ elif os.sys.platform == 'linux2':
-+ return os.path.expanduser('~/.krankcfg')
- else:
- return os.path.join(os.environ['APPDATA'], 'krank.cfg')
-
-@@ -185,4 +187,4 @@
- stage = self.stage
- return len([s for s in self['scores'][stage-1] if s['score'] < sys.maxint])
-
--
-\ No newline at end of file
-+
diff --git a/debian/patches/level002_hard_extreme_fix.patch b/debian/patches/level002_hard_extreme_fix.patch
deleted file mode 100644
index 66c2e26..0000000
--- a/debian/patches/level002_hard_extreme_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- levels/level002.py 2009-03-09 15:38:04.000000000 +0300
-+++ levels/level002.py 2009-03-09 15:59:43.000000000 +0300
-@@ -31,10 +31,5 @@
- k.particles.stoneCircle((w*1/3, cy), 'white', k.config.stage*2, 80)
- k.particles.stoneCircle((w*2/3, cy), 'white', k.config.stage*2, 80)
-
-- k.particles.ballCircle((w*1/3, cy), 'white', k.config.stage*2, 80, -math.pi/2)
-- k.particles.ballCircle((w*2/3, cy), 'white', k.config.stage*2, 80, -math.pi/2)
--
-- k.particles.ballCircle((w*2/3, cy), 'white', 5, 10)
--
- # simple player
- k.player.setPos((cx, cy-120))
diff --git a/debian/patches/level005_hard.patch b/debian/patches/level005_hard.patch
deleted file mode 100644
index e4288ed..0000000
--- a/debian/patches/level005_hard.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/levels/level005.py b/levels/level005.py
-index 5e22e02..afd9f31 100644
---- a/levels/level005.py
-+++ b/levels/level005.py
-@@ -19,7 +19,10 @@ def init():
- for i in range(len(parts)):
- k.particles.add(Particle({'pos': parts[i], 'color': i < 2 and 'blue' or 'white'}))
- else:
-- num = (k.config.stage-1)*3
-+ if k.config.stage == 2:
-+ num = 4
-+ else:
-+ num = (k.config.stage-1)*3
- k.particles.ballCircle((cx-xd, cy), 'white', num, 150)
- k.particles.ballCircle((cx+xd, cy), 'blue', num, 150)
-
diff --git a/debian/patches/pause.patch b/debian/patches/pause.patch
deleted file mode 100644
index aebf6f8..0000000
--- a/debian/patches/pause.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/Input.py 2008-06-13 04:44:00.000000000 +0400
-+++ src/Input.py 2009-03-14 22:47:23.000000000 +0300
-@@ -20,6 +20,7 @@
-
- self.exit = False
- self.pause = False
-+ self.unfocused_pause = False
-
- # target pos
- self.targetpos = k.world.rect.center
-@@ -61,14 +62,29 @@
- def handleEvents (self):
-
- for event in pygame.event.get():
-+ if event.type == pygame.ACTIVEEVENT:
-+ if event.state == 2:
-+ if event.gain:
-+ if self.unfocused_pause:
-+ self.pause = False
-+ self.unfocused_pause = False
-+ else:
-+ if not self.pause:
-+ self.pause = True
-+ self.unfocused_pause = True
-+
- if event.type == pygame.QUIT: sys.exit()
- # ---------------------------------------------------------------------- KEYS
- elif event.type == pygame.KEYDOWN:
- # ------------------------------------------------------------------ pause
-- if event.key == 32:
-+ if event.key in [ 32, 19, 112]:
-+ self.unfocused_pause = False
- self.pause = not self.pause
- else:
-- if self.pause: self.pause = False
-+ if event.key in [ 27, 113, 275, 276,
-+ 105, 114, 115, 49, 50, 51, 280, 281, 19, 112]:
-+ if self.pause:
-+ self.pause = False
- # ------------------------------------------------------------------ exit
- if event.key == 113 and event.mod == pygame.KMOD_LMETA:
- self.onExit()
-@@ -197,4 +212,4 @@
- self.targetpos = playerpos + playerToMouse.norm() * targetDistance
-
-
--
-\ No newline at end of file
-+
diff --git a/debian/patches/title_for_main_window.patch b/debian/patches/title_for_main_window.patch
deleted file mode 100644
index f49729d..0000000
--- a/debian/patches/title_for_main_window.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/k.py 2008-06-13 04:44:00.000000000 +0400
-+++ src/k.py 2009-03-14 14:52:09.000000000 +0300
-@@ -33,7 +33,8 @@
- #-----------------------------------------------------------------------------------------------
- # constants
-
--VERSION = "07"
-+VERSION = "0.7"
-+KRANK_TITLE = "Krank version %s (Debian revision)"%(VERSION)
-
--print "krank version", VERSION
-+print KRANK_TITLE
-
---- src/World.py 2009-03-14 14:55:35.000000000 +0300
-+++ src/World.py 2009-03-14 14:52:57.000000000 +0300
-@@ -38,6 +38,7 @@
- #-------------------------------------------------------------------------------------------
- def initScreen (self, size, flags):
- k.screen = pygame.display.set_mode(size, flags)
-+ pygame.display.set_caption(k.KRANK_TITLE)
- self.rect = pygame.Rect(0, 0, size[0], size[1])
- self.screen_flags = flags
- self.postInit()
diff --git a/debian/patches/use-dejavu-font.patch b/debian/patches/use-dejavu-font.patch
deleted file mode 100644
index 8aded26..0000000
--- a/debian/patches/use-dejavu-font.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/World.py 2008-06-13 04:44:00.000000000 +0400
-+++ src/World.py 2009-01-07 00:51:24.000000000 +0300
-@@ -65,11 +65,11 @@
- try:
- height = self.rect.height
- try:
-- fontfile = 'fonts/QUIGLEYW.TTF'
-- k.font['large'] = pygame.font.Font(fontfile, height/12)
-- k.font['normal'] = pygame.font.Font(fontfile, height/24)
-- k.font['small'] = pygame.font.Font(fontfile, 40)
-- k.font['tiny'] = pygame.font.Font(fontfile, 30)
-+ fontfile = '/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf'
-+ k.font['large'] = pygame.font.Font(fontfile, height/24)
-+ k.font['normal'] = pygame.font.Font(fontfile, height/36)
-+ k.font['small'] = pygame.font.Font(fontfile, 30)
-+ k.font['tiny'] = pygame.font.Font(fontfile, 20)
- except Exception, e:
- log(e)
- k.font['large'] = pygame.font.SysFont(pygame.font.get_default_font(), height/12)
diff --git a/debian/patches/use-unera-images.patch b/debian/patches/use-unera-images.patch
deleted file mode 100644
index fc04418..0000000
--- a/debian/patches/use-unera-images.patch
+++ /dev/null
@@ -1,710 +0,0 @@
-Только в orig/krank-07/levels: backgrounds
-diff -ru orig/krank-07/levels/bonus001.py orig/krank-07.new/levels/bonus001.py
---- levels/bonus001.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/bonus001.py 2009-01-22 01:49:41.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('water')
- k.sound.music()
-- k.world.setBackground('Big-E-Mr-G09')
-+ k.world.setBackground('bonus-01')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-Только в orig/krank-07/levels: icons
-Только в orig/krank-07.new/levels: __init__.pyc
-diff -ru orig/krank-07/levels/level001.py orig/krank-07.new/levels/level001.py
---- levels/level001.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level001.py 2009-01-21 23:33:12.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('nasirkhan02')
-+ k.world.setBackground('level-01')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level002.py orig/krank-07.new/levels/level002.py
---- levels/level002.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level002.py 2009-01-22 01:40:56.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('tanakawho04')
-+ k.world.setBackground('level-02')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level003.py orig/krank-07.new/levels/level003.py
---- levels/level003.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level003.py 2009-01-22 01:41:09.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('industry')
- k.sound.music()
-- k.world.setBackground('nasirkhan01')
-+ k.world.setBackground('level-03')
- k.level.linkColor = (0,0,0)
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-diff -ru orig/krank-07/levels/level004.py orig/krank-07.new/levels/level004.py
---- levels/level004.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level004.py 2009-01-22 01:41:21.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('Big-E-Mr-G02')
-+ k.world.setBackground('level-04')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level005.py orig/krank-07.new/levels/level005.py
---- levels/level005.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level005.py 2009-01-22 01:41:38.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('water')
- k.sound.music()
-- k.world.setBackground('GaryP03')
-+ k.world.setBackground('level-05')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
- xd = 170
-diff -ru orig/krank-07/levels/level006.py orig/krank-07.new/levels/level006.py
---- levels/level006.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level006.py 2009-01-22 01:41:48.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('tanakawho05')
-+ k.world.setBackground('level-06')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level007.py orig/krank-07.new/levels/level007.py
---- levels/level007.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level007.py 2009-01-22 01:42:02.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('tanakawho01')
-+ k.world.setBackground('level-07')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level008.py orig/krank-07.new/levels/level008.py
---- levels/level008.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level008.py 2009-01-22 01:42:12.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('industry')
- k.sound.music()
-- k.world.setBackground('somadjinn03')
-+ k.world.setBackground('level-08')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level009.py orig/krank-07.new/levels/level009.py
---- levels/level009.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level009.py 2009-01-22 01:42:21.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('water')
- k.sound.music()
-- k.world.setBackground('Big-E-Mr-G03')
-+ k.world.setBackground('level-09')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level010.py orig/krank-07.new/levels/level010.py
---- levels/level010.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level010.py 2009-01-22 01:42:32.000000000 +0300
-@@ -7,7 +7,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('IHP03')
-+ k.world.setBackground('level-10')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level011.py orig/krank-07.new/levels/level011.py
---- levels/level011.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level011.py 2009-01-22 01:42:52.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('industry')
- k.sound.music()
-- k.world.setBackground('IHP05')
-+ k.world.setBackground('level-11')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level012.py orig/krank-07.new/levels/level012.py
---- levels/level012.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level012.py 2009-01-22 01:43:02.000000000 +0300
-@@ -7,7 +7,7 @@
- def init():
- k.sound.loadTheme('water')
- k.sound.music()
-- k.world.setBackground('somadjinn01')
-+ k.world.setBackground('level-12')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-@@ -47,4 +47,4 @@
- pos += (w*3/24, h*3/24)
- k.player.setPos(pos)
-
--
-\ В конце файла нет новой строки
-+
-diff -ru orig/krank-07/levels/level013.py orig/krank-07.new/levels/level013.py
---- levels/level013.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level013.py 2009-01-22 01:43:12.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('industry')
- k.sound.music()
-- k.world.setBackground('tanakawho02')
-+ k.world.setBackground('level-13')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
- xd = 150
-diff -ru orig/krank-07/levels/level014.py orig/krank-07.new/levels/level014.py
---- levels/level014.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level014.py 2009-01-22 01:43:23.000000000 +0300
-@@ -6,7 +6,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('GaryP01')
-+ k.world.setBackground('level-14')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level015.py orig/krank-07.new/levels/level015.py
---- levels/level015.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level015.py 2009-01-22 01:43:34.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('industry')
- k.sound.music()
-- k.world.setBackground('kahanaboy06')
-+ k.world.setBackground('level-15')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level016.py orig/krank-07.new/levels/level016.py
---- levels/level016.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level016.py 2009-01-22 01:43:45.000000000 +0300
-@@ -6,7 +6,7 @@
- def init():
- k.sound.loadTheme('water')
- k.sound.music()
-- k.world.setBackground('OzBandit01')
-+ k.world.setBackground('level-16')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-@@ -27,4 +27,4 @@
- k.player.setPos((w/2, cy+yd))
-
-
--
-\ В конце файла нет новой строки
-+
-diff -ru orig/krank-07/levels/level017.py orig/krank-07.new/levels/level017.py
---- levels/level017.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level017.py 2009-01-22 01:43:55.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('somadjinn02')
-+ k.world.setBackground('level-17')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level018.py orig/krank-07.new/levels/level018.py
---- levels/level018.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level018.py 2009-01-22 01:44:04.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('water')
- k.sound.music()
-- k.world.setBackground('nasirkhan03')
-+ k.world.setBackground('level-18')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level019.py orig/krank-07.new/levels/level019.py
---- levels/level019.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level019.py 2009-01-22 01:44:13.000000000 +0300
-@@ -6,7 +6,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('tanakawho03')
-+ k.world.setBackground('level-19')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level020.py orig/krank-07.new/levels/level020.py
---- levels/level020.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level020.py 2009-01-22 01:44:28.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('industry')
- k.sound.music()
-- k.world.setBackground('GaryP04')
-+ k.world.setBackground('level-20')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level021.py orig/krank-07.new/levels/level021.py
---- levels/level021.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level021.py 2009-01-22 01:44:49.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('tanakawho07')
-+ k.world.setBackground('level-21')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level022.py orig/krank-07.new/levels/level022.py
---- levels/level022.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level022.py 2009-01-22 01:44:59.000000000 +0300
-@@ -6,7 +6,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('GaryP02')
-+ k.world.setBackground('level-22')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level023.py orig/krank-07.new/levels/level023.py
---- levels/level023.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level023.py 2009-01-22 01:45:07.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('darkmatter01')
-+ k.world.setBackground('level-23')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level024.py orig/krank-07.new/levels/level024.py
---- levels/level024.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level024.py 2009-01-22 01:45:18.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('Big-E-Mr-G05')
-+ k.world.setBackground('level-24')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level025.py orig/krank-07.new/levels/level025.py
---- levels/level025.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level025.py 2009-01-22 01:45:29.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('water')
- k.sound.music()
-- k.world.setBackground('Big-E-Mr-G08')
-+ k.world.setBackground('level-25')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level026.py orig/krank-07.new/levels/level026.py
---- levels/level026.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level026.py 2009-01-22 01:45:38.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('kahanaboy05')
-+ k.world.setBackground('level-26')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level027.py orig/krank-07.new/levels/level027.py
---- levels/level027.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level027.py 2009-01-22 01:45:46.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('industry')
- k.sound.music()
-- k.world.setBackground('IHP02')
-+ k.world.setBackground('level-27')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level028.py orig/krank-07.new/levels/level028.py
---- levels/level028.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level028.py 2009-01-22 01:45:57.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('Big-E-Mr-G04')
-+ k.world.setBackground('level-28')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level029.py orig/krank-07.new/levels/level029.py
---- levels/level029.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level029.py 2009-01-22 01:46:06.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('space')
- k.sound.music()
-- k.world.setBackground('kahanaboy07')
-+ k.world.setBackground('level-29')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/level030.py orig/krank-07.new/levels/level030.py
---- levels/level030.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/level030.py 2009-01-22 01:46:16.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('summer')
- k.sound.music()
-- k.world.setBackground('tanakawho06')
-+ k.world.setBackground('level-30')
-
- cx, cy, w, h = k.world.rect.centerx, k.world.rect.centery, k.world.rect.width, k.world.rect.height
-
-diff -ru orig/krank-07/levels/menu_credits.py orig/krank-07.new/levels/menu_credits.py
---- levels/menu_credits.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_credits.py 2009-01-22 01:07:46.000000000 +0300
-@@ -7,7 +7,7 @@
- def init():
- k.sound.loadTheme('menu')
- k.sound.music('water.ogg')
-- k.world.setBackground('IHP01')
-+ k.world.setBackground('menu-credits')
- # simple player
- k.player.setPos(k.world.rect.center)
- k.player.setTailNum(2)
-@@ -16,22 +16,16 @@
-
- c, h = k.world.rect.centerx, k.world.rect.height
- drawText('Credits', (c, h*4.0/24.0), color=(0,0,0), valign='center')
-- drawText('Code by monsterkodi', (c, h*6/28), color=(0,0,0), size='normal', valign='center')
-- drawText('Sound by legoluft', (c, h*7/28), color=(0,0,0), size='normal', valign='center')
-- drawText('Images', (c, h*8/24), color=(0,0,0), valign='center')
-- credits = ["Big-E-Mr-G", "darkmatter", "*GaryP*", "IHP", "kahanaboy", "nasirkhan", "OzBandit", "somadjinn", "tanakawho"]
--
-- index = 1
-- for text in credits:
--
-- drawText(text, (k.world.rect.centerx, h*(8/24.0+index/28.0)), size='normal', color=(0,0,0))
-- index += 1
-+ drawText('Code by monsterkodi', (c, h*6/20), color=(0,0,0), size='normal', valign='center')
-+ drawText('Sound by legoluft', (c, h*7/20), color=(0,0,0), size='normal', valign='center')
-+ drawText('Images by Slava Anishenko', (c, h*8/20), color=(0,0,0), size='normal', valign='center')
-+ drawText('Debianized by Dmitry E. Oboukhov', (c, h*9/20), color=(0,0,0), size='normal', valign='center')
-+ drawText('Thanks for Nata Karpenko', (c, h*10/20), color=(0,0,0), size='normal', valign='center')
-
-- drawText('Font by Nick Curtis', (c, h*21/28), color=(0,0,0), size='normal', valign='center')
-- drawText('Version ' + k.VERSION, (c, h*23/28), color=(220,209,180), size='tiny', valign='center')
-+ drawText('Version ' + k.VERSION, (c, h*23/20), color=(220,209,180), size='tiny', valign='center')
-
- k.particles.add(Switch({ 'text': 'Back',
- 'align': 'bottom',
- 'action': 'k.level.menuExit()',
- 'size': 'small',
-- 'pos': vector((c, h*7/8))}))
-\ В конце файла нет новой строки
-+ 'pos': vector((c, h*7/8))}))
-diff -ru orig/krank-07/levels/menu_levels2.py orig/krank-07.new/levels/menu_levels2.py
---- levels/menu_levels2.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_levels2.py 2009-01-22 02:35:36.000000000 +0300
-@@ -3,7 +3,7 @@
- from Part import *
-
- def init():
-- k.world.setBackground('IHP06')
-+ k.world.setBackground('menu-levels')
-
- cx, w, h = k.world.rect.centerx, k.world.rect.width, k.world.rect.height
-
-@@ -18,7 +18,7 @@
- row, col = math.floor((i%cols))+1.5, math.floor((i/cols))+0.8
- pos.append((row*w/(cols+2), col*h/4.7))
-
-- icon = pygame.image.load('levels/icons/level%03d.tga' % (10+i+1))
-+ icon = pygame.image.load('levels/unera-icons/level%03d.tga' % (10+i+1))
- if h < 768:
- icon = pygame.transform.scale(icon, (88, 66))
- icons.append(icon)
-@@ -52,4 +52,4 @@
-
- k.screen.blit(k.world.image, k.world.rect)
- pygame.display.update()
--
-\ В конце файла нет новой строки
-+
-Только в orig/krank-07.new/levels: menu_levels2.pyc
-diff -ru orig/krank-07/levels/menu_levels3.py orig/krank-07.new/levels/menu_levels3.py
---- levels/menu_levels3.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_levels3.py 2009-01-22 02:37:41.000000000 +0300
-@@ -3,7 +3,7 @@
- from Part import *
-
- def init():
-- k.world.setBackground('IHP06')
-+ k.world.setBackground('menu-levels')
-
- cx, w, h = k.world.rect.centerx, k.world.rect.width, k.world.rect.height
-
-@@ -17,7 +17,7 @@
- row, col = math.floor((i%cols))+1.5, math.floor((i/cols))+0.8
- pos.append((row*w/(cols+2), col*h/4.7))
-
-- icon = pygame.image.load('levels/icons/level%03d.tga' % (20+i+1))
-+ icon = pygame.image.load('levels/unera-icons/level%03d.tga' % (20+i+1))
- if h < 768:
- icon = pygame.transform.scale(icon, (88, 66))
- icons.append(icon)
-@@ -44,4 +44,4 @@
-
- k.screen.blit(k.world.image, k.world.rect)
- pygame.display.update()
--
-\ В конце файла нет новой строки
-+
-Только в orig/krank-07.new/levels: menu_levels3.pyc
-diff -ru orig/krank-07/levels/menu_levels.py orig/krank-07.new/levels/menu_levels.py
---- levels/menu_levels.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_levels.py 2009-01-22 02:36:52.000000000 +0300
-@@ -4,7 +4,7 @@
-
- def init():
- k.sound.loadTheme('menu')
-- k.world.setBackground('IHP06')
-+ k.world.setBackground('menu-levels')
-
- cx, w, h = k.world.rect.centerx, k.world.rect.width, k.world.rect.height
-
-@@ -20,7 +20,7 @@
- row, col = math.floor((i%cols))+1.5, math.floor((i/cols))+0.8
- pos.append((row*w/(cols+2), col*h/4.7))
-
-- icon = pygame.image.load('levels/icons/level%03d.tga' % (i+1))
-+ icon = pygame.image.load('levels/unera-icons/level%03d.tga' % (i+1))
- if h < 768:
- icon = pygame.transform.scale(icon, (88, 66))
- icons.append(icon)
-@@ -81,4 +81,4 @@
-
- k.screen.blit(k.world.image, k.world.rect)
- pygame.display.update()
--
-\ В конце файла нет новой строки
-+
-Только в orig/krank-07.new/levels: menu_levels.pyc
-diff -ru orig/krank-07/levels/menu_play.py orig/krank-07.new/levels/menu_play.py
---- levels/menu_play.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_play.py 2009-01-22 01:28:10.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('menu')
- k.sound.music('industry.ogg') #k.sound.music('space.ogg')
-- k.world.setBackground('Big-E-Mr-G13')
-+ k.world.setBackground('menu-play')
-
- # player
- k.player.setPos(k.world.rect.center)
-Только в orig/krank-07.new/levels: menu_play.pyc
-diff -ru orig/krank-07/levels/menu.py orig/krank-07.new/levels/menu.py
---- levels/menu.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu.py 2009-01-22 00:37:39.000000000 +0300
-@@ -5,7 +5,7 @@
- def init():
- k.sound.loadTheme('menu')
- k.sound.music('space.ogg')
-- k.world.setBackground('kahanaboy01')
-+ k.world.setBackground('menu')
- k.world.darken(70)
-
- # player
-Только в orig/krank-07.new/levels: menu.pyc
-diff -ru orig/krank-07/levels/menu_scores1.py orig/krank-07.new/levels/menu_scores1.py
---- levels/menu_scores1.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_scores1.py 2009-01-22 01:16:44.000000000 +0300
-@@ -9,9 +9,9 @@
- stage = 1
- numLevels = k.config.numAvailableLevels(stage)
- if numLevels > 20:
-- k.world.setBackground('darkmatter02b')
-+ k.world.setBackground('menu-scores1')
- else:
-- k.world.setBackground('darkmatter02')
-+ k.world.setBackground('menu-scores1')
- # simple player
- k.player.setPos(k.world.rect.center)
- k.player.setTailNum(2)
-@@ -35,4 +35,4 @@
- 'align': 'bottom',
- 'action': 'k.level.menuExit("menu_scores")',
- 'size': 'small',
-- 'pos': pos(c, h*7/8)}))
-\ В конце файла нет новой строки
-+ 'pos': pos(c, h*7/8)}))
-diff -ru orig/krank-07/levels/menu_scores2.py orig/krank-07.new/levels/menu_scores2.py
---- levels/menu_scores2.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_scores2.py 2009-01-22 01:16:58.000000000 +0300
-@@ -9,9 +9,9 @@
- stage = 2
- numLevels = k.config.numAvailableLevels(stage)
- if numLevels > 20:
-- k.world.setBackground('darkmatter02b')
-+ k.world.setBackground('menu-scores2')
- else:
-- k.world.setBackground('darkmatter02')
-+ k.world.setBackground('menu-scores2')
- # simple player
- k.player.setPos(k.world.rect.center)
- k.player.setTailNum(2)
-@@ -35,4 +35,4 @@
- 'align': 'bottom',
- 'action': 'k.level.menuExit("menu_scores")',
- 'size': 'small',
-- 'pos': pos(c, h*7/8)}))
-\ В конце файла нет новой строки
-+ 'pos': pos(c, h*7/8)}))
-diff -ru orig/krank-07/levels/menu_scores3.py orig/krank-07.new/levels/menu_scores3.py
---- levels/menu_scores3.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_scores3.py 2009-01-22 01:21:18.000000000 +0300
-@@ -9,9 +9,9 @@
- stage = 3
- numLevels = k.config.numAvailableLevels(stage)
- if numLevels > 20:
-- k.world.setBackground('darkmatter02b')
-+ k.world.setBackground('menu-scores3')
- else:
-- k.world.setBackground('darkmatter02')
-+ k.world.setBackground('menu-scores3')
- # simple player
- k.player.setPos(k.world.rect.center)
- k.player.setTailNum(2)
-@@ -35,4 +35,4 @@
- 'align': 'bottom',
- 'action': 'k.level.menuExit("menu_scores")',
- 'size': 'small',
-- 'pos': pos(c, h*7/8)}))
-\ В конце файла нет новой строки
-+ 'pos': pos(c, h*7/8)}))
-diff -ru orig/krank-07/levels/menu_scores.py orig/krank-07.new/levels/menu_scores.py
---- levels/menu_scores.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_scores.py 2009-01-22 00:57:33.000000000 +0300
-@@ -7,7 +7,7 @@
- def init():
- k.sound.loadTheme('menu')
- k.sound.music('summer.ogg')
-- k.world.setBackground('darkmatter02')
-+ k.world.setBackground('menu-scores')
-
- # simple player
- k.player.setPos(k.world.rect.center)
-@@ -58,4 +58,4 @@
- 'action': 'k.level.menuExit()',
- 'size': 'small',
- 'pos': pos(cx, h*7/8)}))
--
-\ В конце файла нет новой строки
-+
-diff -ru orig/krank-07/levels/menu_screen.py orig/krank-07.new/levels/menu_screen.py
---- levels/menu_screen.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_screen.py 2009-01-22 00:37:27.000000000 +0300
-@@ -6,7 +6,7 @@
- def init():
- k.sound.loadTheme('menu')
- k.sound.music('industry.ogg')
-- k.world.setBackground('kahanaboy04')
-+ k.world.setBackground('menu-screen')
- k.world.darken(60)
- # simple player
- k.player.setPos(k.world.rect.center)
-@@ -35,4 +35,4 @@
- 'action': 'k.world.setScreen((%d, %d))' % m,
- 'color': active and 'orange' or 'white',
- 'pos': vector(k.world.rect.center)+dirvec}))
--
-\ В конце файла нет новой строки
-+
-diff -ru orig/krank-07/levels/menu_sound.py orig/krank-07.new/levels/menu_sound.py
---- levels/menu_sound.py 2008-06-13 04:44:00.000000000 +0400
-+++ levels/menu_sound.py 2009-01-22 01:10:21.000000000 +0300
-@@ -6,7 +6,7 @@
- def init():
- k.sound.loadTheme('menu')
- k.sound.music('industry.ogg')
-- k.world.setBackground('kahanaboy04')
-+ k.world.setBackground('menu-sounds')
- k.world.darken(60)
- # simple player
- k.player.setPos(k.world.rect.center)
-@@ -40,4 +40,4 @@
- 'action': 'k.sound.setMusicVolumeIndex(%d) or k.config.save()' % i,
- 'group': 'music',
- 'color': i==k.sound.getMusicVolumeIndex() and 'orange' or 'white',
-- 'pos': vector(k.world.rect.center)+dirvec}))
-\ В конце файла нет новой строки
-+ 'pos': vector(k.world.rect.center)+dirvec}))
-diff -ru orig/krank-07/src/Level.py orig/krank-07.new/src/Level.py
---- src/Level.py 2008-06-13 04:44:00.000000000 +0400
-+++ src/Level.py 2009-01-22 02:38:11.000000000 +0300
-@@ -160,8 +160,8 @@
- #-------------------------------------------------------------------------------------------
- def saveIcon (self):
- image = pygame.transform.scale(k.screen, (120, 90))
-- pygame.image.save(image, 'levels/icons/level%03d.tga' % self.number)
-- log('icon saved to ', 'levels/icons/level%03d.tga' % self.number)
-+ pygame.image.save(image, 'levels/unera-icons/level%03d.tga' % self.number)
-+ log('icon saved to ', 'levels/unera-icons/level%03d.tga' % self.number)
-
- #-------------------------------------------------------------------------------------------
- def saveScreenshot (self):
-Только в orig/krank-07.new/src: Level.pyc
-Только в orig/krank-07.new/src: Math.pyc
-Только в orig/krank-07.new/src: Part.pyc
-Только в orig/krank-07.new/src: Player.pyc
-Только в orig/krank-07.new/src: Sound.pyc
-Только в orig/krank-07.new/src: Sprite.pyc
-Только в orig/krank-07.new/src: Tools.pyc
-diff -ru orig/krank-07/src/World.py orig/krank-07.new/src/World.py
---- src/World.py 2009-01-21 23:08:26.000000000 +0300
-+++ src/World.py 2009-01-21 23:30:19.000000000 +0300
-@@ -87,7 +87,7 @@
-
- self.resetCockpit()
-
-- path = os.path.join('levels/backgrounds', name + '.jpg')
-+ path = os.path.join('levels/unera-backgrounds', name + '.jpg')
- log(path, log='world')
- if os.path.isdir(path):
- for item in os.listdir(path):
-@@ -104,7 +104,6 @@
- xtiles, ytiles = self.rect.width/self.tilesize+1, self.rect.height/self.tilesize+1
- self.fadeTiles = range(xtiles*ytiles)
- random.shuffle(self.fadeTiles)
--
- self.image = quadMirrorSurface(pygame.image.load(file), self.rect.size).convert()
-
- #-------------------------------------------------------------------------------------------
-Только в orig/krank-07.new/src: World.pyc
diff --git a/debian/patches/yaml.patch b/debian/patches/yaml.patch
deleted file mode 100644
index 498520e..0000000
--- a/debian/patches/yaml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur src/Config.py /usr/lib/krank/Config.py
---- src/Config.py 2009-03-13 14:20:29.000000000 +0300
-+++ /usr/lib/krank/Config.py 2009-03-13 14:44:58.000000000 +0300
-@@ -1,6 +1,7 @@
- #
- # Config.py
-
-+import yaml
- import getopt, sys
- import k, levels
-
-@@ -132,10 +133,16 @@
- self['fullscreen'] = k.config.fullscreen
- try:
- config_file = self.getConfigFilePath()
-+ if os.access(config_file, os.R_OK|os.W_OK):
-+ os.unlink(config_file)
-+ print "Old config file has been converted in yaml format"
-+ print "\tnew config name is ", config_file+'.yaml'
-+ config_file += '.yaml'
- log('writing config to', config_file, log='config')
- log(self, log='config')
- file = open(config_file, 'w+')
-- cPickle.dump(self, file)
-+ file.write("# vim: filetype=yaml :\n")
-+ yaml.dump(self, file)
- except Exception, e:
- log(e)
-
-@@ -145,8 +152,16 @@
- config_file = self.getConfigFilePath()
- log('reading config from', config_file, log='config')
- log(self, log='config')
-- file = open(config_file, 'r')
-- self.update(cPickle.load(file))
-+ yaml_type=0
-+
-+ if not os.access(config_file, os.R_OK):
-+ config_file += '.yaml'
-+ file = open(config_file, 'r')
-+ self.update(yaml.load(file))
-+ else:
-+ file = open(config_file, 'r')
-+ self.update(cPickle.load(file))
-+
- self.stage = self['stage']
- k.config.fullscreen=self['fullscreen']
- while len(self['scores']) < 4: self['scores'].append([])
--
krank is a game of dexterity where you match stones together
More information about the Pkg-games-commits
mailing list