Finalized version 0.5.0

gandie · Jul 16, 2017 · da1b490 · da1b490
1 parent ed2d44a
commit da1b490
Show file tree

Hide file tree

Showing 74 changed files with 41 additions and 34 deletions.
diff --git a/buildozer.spec b/buildozer.spec
@@ -29,7 +29,7 @@ source.include_exts = py,png,jpg,kv,atlas,pyx,h,c
 #version.filename = %(source.dir)s/main.py
 
 # (str) Application versioning (method 2)
-version = 0.4.2
+version = 0.5.0
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy

diff --git a/game_modi.py b/game_modi.py
@@ -69,7 +69,7 @@ def trajectory_start(self, touch):
         with self.gamezone.parent.canvas:
             ud['lines'] = [
                 Line(points=(touch.x, touch.y, touch.x + 1, touch.y + 1),
-                     width=1, group=ud['group'])]
+                     width=1, dash_offset=12, group=ud['group'])]
 
     def trajectory_complex(self, touch):
 

diff --git a/main.py b/main.py
@@ -125,11 +125,10 @@ def load_settings(self):
         return settings
 
     def save_settings(self):
-        f = open('settings.json', 'w')
         D = copy.deepcopy(self.logic.settings)
         json_d = json.dumps(D)
-        f.write(json_d)
-        f.close()
+        with open('settings.json', 'w') as settingsfile:
+            settingsfile.write(json_d)
 
     def load_game(self, slot='current'):
         self.logic.reset_planets(self)

diff --git a/media/background/background.png b/media/background/background.png
diff --git a/media/background/background_menu.png b/media/background/background_menu.png
diff --git a/media/background/background_savegame.png b/media/background/background_savegame.png
diff --git a/media/background/background_settings.png b/media/background/background_settings.png
diff --git a/media/buttons/load.png b/media/buttons/load.png
diff --git a/media/buttons/save.png b/media/buttons/save.png
diff --git a/media/icons/Zoom Mode.png b/media/icons/Zoom Mode.png
diff --git a/media/icons/add sun pressed.png b/media/icons/add sun pressed.png
diff --git a/media/icons/add sun.png b/media/icons/add sun.png
diff --git a/media/icons/add_planet.png b/media/icons/add_planet.png
diff --git a/media/icons/add_planet_pressed.png b/media/icons/add_planet_pressed.png
diff --git a/media/icons/addsize.png b/media/icons/addsize.png
diff --git a/media/icons/addsize_pressed.png b/media/icons/addsize_pressed.png
diff --git a/media/icons/arrow.png b/media/icons/arrow.png
diff --git a/media/icons/arrow_pressed.png b/media/icons/arrow_pressed.png
diff --git a/media/icons/arrowleft.png b/media/icons/arrowleft.png
diff --git a/media/icons/arrowleft_pressed.png b/media/icons/arrowleft_pressed.png
diff --git a/media/icons/check.png b/media/icons/check.png
diff --git a/media/icons/checkpressed.png b/media/icons/checkpressed.png
diff --git a/media/icons/delete.png b/media/icons/delete.png
diff --git a/media/icons/delete_pressed.png b/media/icons/delete_pressed.png
diff --git a/media/icons/fix.png b/media/icons/fix.png
diff --git a/media/icons/fix_pressed.png b/media/icons/fix_pressed.png
diff --git a/media/icons/menu.png b/media/icons/menu.png
diff --git a/media/icons/menu_pressed.png b/media/icons/menu_pressed.png
diff --git a/media/icons/multipass.png b/media/icons/multipass.png
diff --git a/media/icons/multipass_pressed.png b/media/icons/multipass_pressed.png
diff --git a/media/icons/pause.png b/media/icons/pause.png
diff --git a/media/icons/pause_pressed.png b/media/icons/pause_pressed.png
diff --git a/media/icons/pick.png b/media/icons/pick.png
diff --git a/media/icons/pick_pressed.png b/media/icons/pick_pressed.png
diff --git a/media/icons/reset.png b/media/icons/reset.png
diff --git a/media/icons/reset_pressed.png b/media/icons/reset_pressed.png
diff --git a/media/icons/rund.png b/media/icons/rund.png
diff --git a/media/icons/settings icon.png b/media/icons/settings icon.png
diff --git a/media/icons/settings pressed.png b/media/icons/settings pressed.png
diff --git a/media/icons/slider.png b/media/icons/slider.png
diff --git a/media/icons/subsize.png b/media/icons/subsize.png
diff --git a/media/icons/subsize_pressed.png b/media/icons/subsize_pressed.png
diff --git a/media/icons/sunmode.png b/media/icons/sunmode.png
diff --git a/media/icons/sunmode_pressed.png b/media/icons/sunmode_pressed.png
diff --git a/media/icons/timer_panel.png b/media/icons/timer_panel.png
diff --git a/media/icons/view.png b/media/icons/view.png
diff --git a/media/icons/view_pressed.png b/media/icons/view_pressed.png
diff --git a/media/icons/zoom pressed.png b/media/icons/zoom pressed.png
diff --git a/media/icons/zoom.png b/media/icons/zoom.png
diff --git a/media/icons/zoom_pressed.png b/media/icons/zoom_pressed.png
diff --git a/media/textures/bigsuns/blue_sun.png b/media/textures/bigsuns/blue_sun.png
diff --git a/media/textures/bigsuns/bluesun.png b/media/textures/bigsuns/bluesun.png
diff --git a/media/textures/blackholes/blackhole.png b/media/textures/blackholes/blackhole.png
diff --git a/media/textures/gasgiants/juppie.png b/media/textures/gasgiants/juppie.png
diff --git a/media/textures/gasgiants/juppieone.png b/media/textures/gasgiants/juppieone.png
diff --git a/media/textures/giantsuns/bigsun.png b/media/textures/giantsuns/bigsun.png
diff --git a/media/textures/giantsuns/redgiant.png b/media/textures/giantsuns/redgiant.png
diff --git a/media/textures/moons/moon.png b/media/textures/moons/moon.png
diff --git a/media/textures/picked/picked.png b/media/textures/picked/picked.png
diff --git a/media/textures/picked/scope.png b/media/textures/picked/scope.png
diff --git a/media/textures/planets/cliffy.png b/media/textures/planets/cliffy.png
diff --git a/media/textures/planets/cliffyone.png b/media/textures/planets/cliffyone.png
diff --git a/media/textures/planets/icyone.png b/media/textures/planets/icyone.png
diff --git a/media/textures/planets/mercurial.png b/media/textures/planets/mercurial.png
diff --git a/media/textures/planets/rock.png b/media/textures/planets/rock.png
diff --git a/media/textures/planets/sandyone.png b/media/textures/planets/sandyone.png
diff --git a/media/textures/planets/wetplanet.png b/media/textures/planets/wetplanet.png
diff --git a/media/textures/suns/sun.png b/media/textures/suns/sun.png
diff --git a/menupanel.py b/menupanel.py
@@ -128,13 +128,13 @@ def build_interface(self):
         )
 
         self.add_sun_button = RealMenuToggleButton(
-            './media/icons/add_sun.png',
-            './media/icons/add_sun_pressed.png',
+            './media/icons/sunmode.png',
+            './media/icons/sunmode_pressed.png',
             'add_sun',
             pos_hint={'x': 0, 'y': self.iconratio * 4},
             size_hint=(None, None),
             size=(self.iconsize, self.iconsize),
-            source='./media/icons/add_sun.png',
+            source='./media/icons/sunmode.png',
             group='menu',
             allow_no_selection=False
         )
@@ -153,15 +153,15 @@ def build_interface(self):
         )
 
         self.zoom_button = RealMenuToggleButton(
+            './media/icons/zoom.png',
             './media/icons/zoom_mode.png',
-            './media/icons/zoom_mode_pressed.png',
             'zoom',
             size_hint=(None, None),
             size=(self.iconsize, self.iconsize),
             pos_hint={'x': 0, 'y': self.iconratio * 6},
             group='menu',
             allow_no_selection=False,
-            source='./media/icons/zoom_mode.png'
+            source='./media/icons/zoom.png'
         )
 
         self.multi_button = RealMenuToggleButton(

diff --git a/menuscreen.py b/menuscreen.py
@@ -54,8 +54,8 @@ def build_interface(self):
             './media/buttons/play.png',
             './media/buttons/play_pressed.png',
             self.switchto_main,
-            size_hint=(0.4, 0.3),
-            pos_hint={'x': 0, 'y': 0.6},
+            size_hint=(0.3, 0.2),
+            pos_hint={'x': 0, 'y': 0.7},
             source='./media/buttons/play.png',
             always_release=True
         )
@@ -64,8 +64,8 @@ def build_interface(self):
             './media/buttons/settings.png',
             './media/buttons/settings_pressed.png',
             self.switchto_settings,
-            size_hint=(0.4, 0.3),
-            pos_hint={'x': 0.6, 'y': 0.6},
+            size_hint=(0.3, 0.2),
+            pos_hint={'x': 0.7, 'y': 0.7},
             source='./media/buttons/settings.png',
             always_release=True
         )
@@ -74,7 +74,7 @@ def build_interface(self):
             './media/buttons/saves.png',
             './media/buttons/saves_pressed.png',
             self.switchto_savegames,
-            size_hint=(0.4, 0.3),
+            size_hint=(0.3, 0.2),
             pos_hint={'x': 0, 'y': 0.1},
             source='./media/buttons/saves.png',
             always_release=True
@@ -84,8 +84,8 @@ def build_interface(self):
             './media/buttons/credits.png',
             './media/buttons/credits_pressed.png',
             self.switchto_credits,
-            size_hint=(0.4, 0.3),
-            pos_hint={'x': 0.6, 'y': 0.1},
+            size_hint=(0.3, 0.2),
+            pos_hint={'x': 0.7, 'y': 0.1},
             source='./media/buttons/credits.png',
             always_release=True
         )

diff --git a/planet.kv b/planet.kv
@@ -1,5 +1,5 @@
 <Slider>
-    cursor_image: './media/icons/delete.png'
+    cursor_image: './media/icons/slider.png'
 
 <Mainscreen>:
     canvas:

diff --git a/planet.py b/planet.py
@@ -27,9 +27,9 @@ def __init__(self, **kwargs):
         )
 
         self.select_overlay = Image(
-            size_hint=(None, None),
-            pos_hint={'x': -0.25, 'y': -0.25},
-            source='./media/textures/picked/picked.png',
+            size_hint=(1.25, 1.25),
+            pos_hint={'x': -0.125, 'y': -0.125},
+            source='./media/textures/picked/scope.png',
             allow_stretch=True
         )
 
@@ -39,13 +39,13 @@ def on_size(self, instance, value):
         if self.base_image:
             self.base_image.size = value
             if self.select_overlay:
-                newsize = (self.base_image.size[0] * 1.5, self.base_image.size[1] * 1.46)
+                newsize = (self.base_image.size[0] * 1.5, self.base_image.size[1] * 1.5)
                 self.select_overlay.size = newsize
                 self.select_overlay.center = self.center
 
     def select(self):
-        newsize = (self.base_image.size[0] * 1.5, self.base_image.size[1] * 1.46)
-        self.select_overlay.size = newsize
+        #newsize = (self.base_image.size[0] * 10, self.base_image.size[1] * 10)
+        #self.select_overlay.size = newsize
         self.select_overlay.center = self.center
         self.add_widget(self.select_overlay)
 

diff --git a/settingsscreen.py b/settingsscreen.py
@@ -49,13 +49,14 @@ def on_enter(self):
 
     def on_leave(self):
         '''
-        write setting to logic
+        write setting to logic and save to file
         '''
         logic_settings = self.logic.settings
         for key in logic_settings.keys():
             if key in self.setting_items:
                 logic_settings[key] = self.setting_items[key].value
         self.logic.apply_settings()
+        App.get_running_app().save_settings()
 
     def build_interface(self):
         self.mainlayout = FloatLayout()

diff --git a/slot.py b/slot.py
@@ -9,7 +9,7 @@
 from kivy.uix.gridlayout import GridLayout
 
 # CUSTOM
-from realbutton import RealToggleButton
+from realbutton import RealToggleButton, RealButton
 
 '''
 Slot = widget to show savegame-slot
@@ -49,18 +49,25 @@ def build_interface(self):
             size_hint=(0.5, 1),
             pos_hint={'x': 0, 'y': 0}
         )
-        self.loadbutton = Button(
-            text='Load',
+
+        self.loadbutton = RealButton(
+            './media/buttons/load.png',
+            './media/buttons/load.png',
+            self.load,
             size_hint=(0.25, 1),
-            pos_hint={'x': 0.5, 'y': 0},
-            on_press=self.load
+            pos_hint={'x': 0.75, 'y': 0},
+            source='./media/buttons/load.png',
+            always_release=True
         )
 
-        self.savebutton = Button(
-            text='Save',
+        self.savebutton = RealButton(
+            './media/buttons/save.png',
+            './media/buttons/save.png',
+            self.save,
             size_hint=(0.25, 1),
-            pos_hint={'x': 0.75, 'y': 0},
-            on_press=self.save
+            pos_hint={'x': 0.5, 'y': 0},
+            source='./media/buttons/save.png',
+            always_release=True
         )
 
         self.add_widget(self.label)