- updated to python3 master
authorFrank DeMarco <if.self.end@gmail.com>
Fri, 28 Feb 2020 04:52:14 +0000 (23:52 -0500)
committerFrank DeMarco <if.self.end@gmail.com>
Fri, 28 Feb 2020 04:52:21 +0000 (23:52 -0500)
- removed original_volumes hack
- cut off dimensions to fit small resolution

HEAVENSlime.py
OPEN-GAME
config
lib/pgfw

index ae1a866..972f1fc 100644 (file)
@@ -26,7 +26,7 @@ class SoundEffect(GameChild, Sound):
         channel = Sound.play(self, loops, maxtime, fade_ms)
         if x is not None:
             position = float(x) / self.display_surface.get_width()
-       if position is not None and channel is not None:
+        if position is not None and channel is not None:
             channel.set_volume(*self.get_panning(position))
         return channel
 
@@ -239,7 +239,7 @@ class Arena(Animation):
             self.background = Surface(self.get_screen().get_size())
             rh = self.background.get_height() / self.GRADIENT_SPAN
             y = self.background.get_height() - rh
-            for hue in xrange(self.sky_hue, self.sky_hue + self.GRADIENT_SPAN, 1):
+            for hue in range(self.sky_hue, self.sky_hue + self.GRADIENT_SPAN, 1):
                 color = Color(0, 0, 0)
                 color.hsla = hue % 360, 60, 60, 100
                 self.background.fill(get_hsla_color(hue, 60, 60),
@@ -271,7 +271,7 @@ class Arena(Animation):
         if new_volume > self.saved_music_volume:
             self.halt(self.restore_volume)
         self.music.set_volume(new_volume)
-        self.get_audio().original_volumes[self.music] = new_volume
+        self.get_audio().original_volumes[self.music] = new_volume
 
     def unsuppress_input(self):
         self.suppressing_input = False
@@ -350,7 +350,7 @@ class Arena(Animation):
     def cut_music(self):
         self.saved_music_volume = self.music.get_volume()
         self.music.set_volume(0)
-        self.get_audio().original_volumes[self.music] = 0
+        self.get_audio().original_volumes[self.music] = 0
 
     def restart_game(self):
         self.reset()
index d447091..a9edd25 100755 (executable)
--- a/OPEN-GAME
+++ b/OPEN-GAME
@@ -1,8 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from os import environ, execvp, chdir, getcwd
 from os.path import exists, join, dirname
-from sys import version_info, argv, maxint
+# from sys import version_info, argv, maxint
+from sys import version_info, argv
 
 def can_import(module_name):
     try:
@@ -29,11 +30,11 @@ def launch_alternative(alternatives):
 def move_to_executable():
     chdir(dirname(argv[0]))
 
-if is_python_3():
-    launch_alternative(["python2", "python2.7", "python2.6"])
+if is_python_3():
+    launch_alternative(["python2", "python2.7", "python2.6"])
 
-if maxint >> 33:
-    launch_alternative(["python-32", "python2-32", "python2.7-32", "python2.6-32"])
+if maxint >> 33:
+    launch_alternative(["python-32", "python2-32", "python2.7-32", "python2.6-32"])
 
 if not can_import("pygame"):
     launch_alternative(["python2.7", "python2.6"])
diff --git a/config b/config
index 7e372cc..04ab5d5 100644 (file)
--- a/config
+++ b/config
@@ -10,7 +10,7 @@ data-exclude = local/, *.pyc
 [display]
 caption = HEAVEN Slime
 show-framerate = False
-dimensions = 480, 800
+dimensions = 480, 768
 fullscreen = yes
 
 [mouse]
index c6e2f85..987b154 160000 (submodule)
--- a/lib/pgfw
+++ b/lib/pgfw
@@ -1 +1 @@
-Subproject commit c6e2f85eddcc76594b36d6d368d800c252c79777
+Subproject commit 987b154b26faaae0eb2612809018a6d110d7c5cb