updated changelog, makefile, removed hardcoded name and version from setup.py

Author: ljnath

.gitignore

@@ -127,3 +127,4 @@ dmypy.json
 *.dat
 api.key
 **/.vscode/*
+**/release/*

BUILD.md

@@ -99,7 +99,9 @@ rm android-ndk-r19c-linux-x86_64.zip
 5. Download android platform and build-tools
 ```
 sdkmanager "platforms;android-28"
+sdkmanager "platforms;android-29"
 sdkmanager "build-tools;28.0.2"
+sdkmanager "build-tools;29.0.0"
 ```
 
 6. Setup python virtual environment

CHANGELOG.md

@@ -1,131 +1,5 @@
 # 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
-- changed the probabity of a sam-launcher firing from 50% to 33%
-- changed the sam speed increase, now speed increases by 1 every 2 level instead of 1 level
-- changes the jet speed based on input mode; in mouse mode jet speed it slightly faster
-- changed the cloud and vegetation speed by increasing the vegetation's speed and reducing the cloud's speed
-- replaces threading in network communication with asyncio
-- renamed ReplayText to ReplayMenuText
-
-## [1.0.3] - 2020-05-10
-- added support for new api
-- added sam launcher, they appear after level 5 and fire targeted missiles
-- added support to add 10 pts on each level up
-- added support to calulate player accuracy
-- added support to upload offline scores when internet connectivity is available thus so scores are lost
-- added common logging and serilization for both network-handler and leaderboard-handler
-- added ground and grass to the vegetation
-- added support to automatically open the update URL incase an update is available
-- moved all gama data files under the /data/ directory
-- changed log file name to game.log
-- changed API key handling from network-handler to main game file
-- changes game asset names to lowercase for UNIX comaptibity and changed name to be more meaningful
-- changes game asset path name for UNIX comaptibity
-- fixed hint text in player name input screen
-- fixed invalid player name input via file
-- fixed unwanted library imports in game classes
-- removed unused game assets
-- removed README file from final game distrubution build
-
-## [1.0.2] - 2020-05-04
-- added support for player name, games prompts to enter the name for the 1st time and saving to file
-- added support for automatically loading exitsing player name from file
-- added support for player name to be used for submitting game result
-- added special hint in the input name menu
-- added support to save game level data along with game score
-- added support to boost enemy missle speed by 5% after each 10th level
-- changed starting missile count from 4 to 2 
-- changed missile increase factor per level  to half
-- changed input mode selection message in gamemenu sprite
-- changed jet speed from 8 to 7
-- changes TitleScreen enum to Screen as it has all type of screen information
-- changed bullet speed from 5 to 7, to avoid jet hitting its own bullet
-- changed game icon, shortcut icon
-- fixed leaderboard rendereing issue related to alignment
-- fixed help message
-- replace duplicate codes with list comprehension
-- removed capturing of system username
-
-## [1.0.1] - 2020-05-03
-- added leaderboard functionality (requires internet)
-- added game help menu
-- added support to toggle between menu in game start and gameover screen
-- added support to upload game score and current system user to remote api
-- added support to check for game update at startup
-- added support for clouds to notify user about new game update
-- added support for dynamic menu spries creation instead for pre-created sprites
-- changed main game music
-- removed game sound for jet move up and move down (no more licenses)
-
-## [1.0.0] - 2020-05-02
-- renamed game to PyBluesky
-- added background vegetation support
-- added packaging support
-
-## [0.12] - 2020-05-02
-- updated sprite for bullet, jet
-- added support for flashing powerup star, flash rate is configurable in the class
-- added music which powerup is activated
-- added sprite for deactivated missiles to distinguishing between activated ones
-
-## [0.11] - 2020-05-01
-- added powerup star which will mark all active missiles as bad
-- added suport for collision detection between the jet and its bullet
-- consuming powerup will increase game score by 100
-
-## [0.10] - 2020-05-01
-- added ammo limit, game starts with 100 ammo and 50 is added pn every level up (max ammo can be 999)
-- added support for game to run in full screen by default
-- added support to dynamically set game resolution as the monitor resolution
-- channged score sprite color to dark grey
-- change levelup time from 10s to 20s
-
-## [0.9] - 2020-05-01
-- added shoot functionality for the jet by clicking mouse of pressing spacebar
-- updated score calculation, now destroying 1 missile gives 10 pts
-- added game instruction in welcome screen
-- added sound effects for shooting and destroying missiles
-
-## [0.8] - 2020-04-27
-- added methods to continously move text on either X or Y axis
-- added author sprite in the game menu
-
-## [0.7] - 2020-04-26
-- added game title in the menu
-- added support for level up in the game, missile count will increase every level
-- added sound for level up
-- removed redundant condition check in jet sprite
-- renamed GameInputText to GameMenuText
-
-## [0.6] - 2020-04-26
-- refactored game code into modules based on sprite
-- introduced game environment to maintain and share game environment data across different various modules
-
-## [0.5] - 2020-04-26
-- added support for continous jet movement towards cursor; even on fixed mouse position
-
-## [0.4] - 2020-04-26
-- added suport for mouse movement as game input
-- added input mode screen on game start
-- fixed replay text sprite rendering
-
-## [0.3] - 2020-04-25
-- added support for game replay
-
-## [0.2] - 2020-04-24
-- refactored code and added comments
-- changed jet image and collision sound
-- changed cloud image and added support for random cloud design
-
-## [0.1] - 2020-04-23
-- first version with default game play
-- added gameover message during collision
-- added game scoring and playtime
+## [1.0.0] - 2021-07-09
+- First release

Makefile

@@ -5,27 +5,29 @@
 
 ADB = adb
 PYTHON = python
-APK_NAME = PyBluesky__armeabi-v7a-debug-1.0.0-.apk
+ARCHITECTURE = armeabi-v7a
+VERSION = 1.0.0
+APK_NAME = PyBluesky__${ARCHITECTURE}-debug-${VERSION}-.apk
 PACKAGE_NAME = com.ljnath.pybluesky
 ACTIVITY_NAME = org.kivy.android.PythonActivity
 
-all: compile uninstall install start
+all: compile uninstall_apk install_apk run_apk
 
 compile:
 	@echo Compiling project
 	${PYTHON} setup.py apk
 
 reinstall: uninstall install
 
-uninstall:
+uninstall_apk:
 	@echo Un-installing app with package name ${PACKAGE_NAME} from target device
 	${ADB} uninstall ${PACKAGE_NAME}
 
-install:
+install_apk:
 	@echo Installing ${APK_NAME} in target device
 	${ADB} install ${APK_NAME}
 
-start:
+run_apk:
 	@echo Starting ${APK_NAME} in target device
 	${ADB} shell am start -n ${PACKAGE_NAME}/${ACTIVITY_NAME}
 
@@ -48,8 +50,10 @@ help:
 	@echo make 			: Default operations to compile project, uninstall apk from attached device, install new apk and start it
 	@echo make -k		: Same as default, but it will configure with the next dependency even if a dependency fails
 	@echo make compile	: Compile PyBluesky project using setup.pyc
-	@echo make uninstall: Uninstall apk from attached android device using adb
-	@echo make install	: Install apk into attached android device using adb
-	@echo make start	: Start apk in the attached android device using adb
+	@echo make uninstall_apk: Uninstall apk from attached android device using adb
+	@echo make install_apk	: Install apk into attached android device using adb
+	@echo make run_apk	: Start apk in the attached android device using adb
+	@echo make reset	: clean + update
 	@echo make clean	: Clean up already build apk file
+	@echo make update	: Reset local code repo and update with github
 	@echo -------------------------------------------

README.md

@@ -5,7 +5,7 @@
 Author : Lakhya Jyoti Nath (ljnath)<br>
 Date : June 2021<br>
 Email : [email protected]<br>
-Website : https://www.ljnath.com
+Website : https://ljnath.com
 
 
 [![GitHub license](https://img.shields.io/github/license/ljnath/PyBluesky-android)](https://github.com/ljnath/PyBluesky-android/blob/master/LICENSE)

main.py

@@ -26,7 +26,7 @@
 Version: 1.0.0 (based on desktop release 1.0.5 ; changed version number for android release)
 Author: Lakhya Jyoti Nath (ljnath)
 Email:  [email protected]
-Website: https://www.ljnath.com
+Website: https://ljnath.com
 """
 
 import asyncio
@@ -209,15 +209,6 @@ def play():
     menu_screens = {Screen.REPLAY_MENU, Screen.GAME_MENU, Screen.EXIT_MENU}
     last_active_sprite = (game_env.dynamic.active_screen, active_sprite)
 
-    def hide_exit_menu():
-        nonlocal game_pause, game_started, active_sprite
-        pygame.mixer.music.unpause()
-        game_started, game_pause = game_pause, game_started
-        game_env.dynamic.all_sprites.remove(active_sprite)
-        game_env.dynamic.active_screen, active_sprite = last_active_sprite
-        if game_env.dynamic.active_screen != Screen.GAME_SCREEN:
-            [game_env.dynamic.all_sprites.add(sprite) for sprite in (active_sprite, hint_sprite)]
-
     def start_gameplay():
         nonlocal gameover, jet, star_shown, screen_color, game_started, ADD_MISSILE, ADD_SAM_LAUNCHER
         pygame.event.set_blocked(game_env.MOUSEMOTION)

requirements.txt

@@ -1,5 +1,6 @@
 appdirs==1.4.4
 colorama==0.4.4
+Cython==0.29.23
 importlib-metadata==4.6.0
 Jinja2==3.0.1
 MarkupSafe==2.0.1

setup.py

@@ -24,15 +24,17 @@
 Version: 1.0.0
 Author: Lakhya Jyoti Nath (ljnath)
 Email:  [email protected]
-Website: https://www.ljnath.com
+Website: https://ljnath.com
 """
 
 from distutils.core import setup
 from setuptools import find_packages
 
+from game.data.static import StaticData
+
 setup(
-    name="PyBluesky",
-    version='1.0.0',
+    name= StaticData.name,
+    version= StaticData.version, 
     author="Lakhya Jyoti Nath (ljnath)",
     author_email='[email protected]',
     description='A simple python game to navigate your jet and fight \
@@ -59,7 +61,7 @@
                 'presplash': 'assets/images/presplash.png',
                 'presplash-color': '#C4E2FF',
                 'icon': 'assets/icon/pybluesky.png',
-                'dist-name': 'PyBluesky',
+                'dist-name': StaticData.name,
                 'android-api': 29,
                 'bootstrap': 'sdl2',
                 'orientation': 'landscape',