Merge pull request #4 from ljnath/release/1.0.5

Release/1.0.5

Author: ljnath

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "python.pythonPath": ".venv\\Scripts\\python.exe",
-    "python.jediEnabled": false
+    "python.jediEnabled": false,
+    "python.languageServer": "Microsoft"
 }

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.0.5] - 2021-06-10
+- changed default quit choice to No in ExitMenu
+- added support to hide the exit menu if ESCAPE key is pressed
+- code refactoring
+
 ## [1.0.4] - 2020-05-17
 - added exit prompt in the game, this also acts as a game pause feature
 - changed size of sam missile

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Lakhya Jyoti Nath
+Copyright (c) 2021 Lakhya Jyoti Nath
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,8 +1,6 @@
 # PyBluesky
-### Version : 1.0.4
+### Version : 1.0.5
 
-A simple python game to navigate your jet and fight though a massive missiles attack based on pygame framework</br>
-Based on https://realpython.com/blog/python/pygame-a-primer
 
 Author : Lakhya Jyoti Nath (ljnath)<br>
 Date : April 2020 - May 2020<br>
@@ -16,9 +14,48 @@ Website : https://www.ljnath.com
 
 [![Download PyBluesky](https://sourceforge.net/sflogo.php?type=13&group_id=3215162)](https://sourceforge.net/p/ljnath/)  
 
-## Development
+</br>
+</br>
+
+## INTRODUCTION
+PyBluesky is a simple 2D python game developed using the pygame framework.</br>
+Based on https://realpython.com/blog/python/pygame-a-primer
+</br></br>
+
+## GAME MECHANICS
+The game is simple where the objective is to navigate and shoot your way through the sky.
+There are enemy missiles which travels from right-to-left with varied speed. These enemy missiles can be destroyed by shooting at them. With increase in game level, SAM launchers also moves on the ground, which can fire targeted missile at the jet. These missiles cannot be destroyed, so user needs to evade them.
+
+The jet can be controlled both my keyboard and mouse. It can move in all directions viz. forward, backward, up and down. It can also be navigated diagonally with key combinations.
+For example, in order to move in north-east directory, you can press both the RIGHT and UP arrow key.
+
+While playing with keyboard, you can shoot bullets using the SPACEBAR and you can use your LEFT mouse button while playing with mouse.<br>
+
+The gameplay has levels, which changes every 20 seconds. A level increase results in increases of enemy missiles.
+It also gives 50 new ammo to the jet as well as the game score is bumped up by 10 points.
+
+The game also features a power-up star which falls across the sky at each level.
+Catching the power-up star will destroy all the enemy bullets in the current game frame.
+</br></br>
 
-### Dependencies
+## HOW TO PLAY
+You can either download these code and directly play from it. For this you need to have python3 and the dependencies  mentioned in the requirements.txt file needs to be installed.
+
+Alternately you can download and install the game binary from [sourceforge.com](https://sourceforge.net/p/ljnath/). This does not need any pre-requisite, as all the required pre-requisites are built into the binary package.
+</br></br>
+
+## LEADERBOARD
+The game also features a network-controlled leaderboard. User scores along with few other metadata are published to a remote server.
+
+During the game startup, the updated scores are download from the server and displayed as leaderboard.
+
+</br></br>
+
+## DEVELOPMENT
+
+Following are the required dependencies for building the binary of this game.
 
 - `pip install cx-Freeze==6.1` for creating distribution
-- `sudo apt install zlib1g-dev`  for cx-Freeze installaion in ubuntu
+- `sudo apt install zlib1g-dev`  for cx-Freeze installaion in ubuntu
+
+

game/data/static.py

@@ -12,13 +12,13 @@ def name(self):
 
     @property
     def version(self):
-        return '1.0.4'
+        return '1.0.5'
 
     @property
     def screen_width(self):
         # return 1024
         return self.__display_info.current_w                        # game resolution is same as monitor resolution
-        
+
 
     @property
     def screen_height(self):

game/handlers/network.py

@@ -24,7 +24,7 @@ async def check_game_update(self, game_env):
         try:
             get_parameters = {'action': 'getUpdate', 'apiKey': self.__api_key}
             async with aiohttp.ClientSession() as session:
-                async with session.get(self.__api_endpoint, params=get_parameters) as response:
+                async with session.get(self.__api_endpoint, params=get_parameters, timeout=aiohttp.ClientTimeout(total=10)) as response:
                     if response.status != 200:
                         raise Exception()
                     json_response = loads(await response.text())
@@ -41,7 +41,7 @@ async def get_leaders(self):
         try:
             get_parameters = {'action': 'getTopScores', 'apiKey': self.__api_key}
             async with aiohttp.ClientSession() as session:
-                async with session.get(self.__api_endpoint, params=get_parameters) as response:
+                async with session.get(self.__api_endpoint, params=get_parameters, timeout=aiohttp.ClientTimeout(total=15)) as response:
                     if response.status != 200:
                         raise Exception()
                     leaders = loads(await response.text())
@@ -87,7 +87,7 @@ async def __post_results(self, session, payload):
         result = True
         try:
             payload['apiKey'] = self.__api_key
-            async with session.put(self.__api_endpoint, json=payload) as response:
+            async with session.put(self.__api_endpoint, json=payload, timeout=aiohttp.ClientTimeout(total=30)) as response:
                 if response.status != 201:
                     result = False
         except:

game/sprites/text/exitmenu.py

@@ -18,7 +18,7 @@ def __init__(self, game_env):
         self.__n_selected_surf = self.font.render("No",1, self.__game_env.static.text_selection_color)          # creating surface with No text when highlighted
 
         self.__choices = self.__title.surf.get_width()/2 - (self.__y_selected_surf.get_width() + self.__n_surf.get_width())/2 
-        self.__highlight_yes()
+        self.__highlight_no()
 
     def __recreate_surf(self):
         self.surf = Surface((self.__title.surf.get_width(), self.__title.surf.get_height() + self.__y_surf.get_height()), self.__game_env.SRCALPHA)