Version 0.0.2-beta

README.md

@@ -1,8 +1,8 @@
-# Zoned   [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Version: 0.0.1-beta](https://img.shields.io/badge/version-0.0.1--beta-orange)](https://github.com/Spikatrix/Zoned/releases/tag/v0.0.1-beta) [![Discord](https://img.shields.io/discord/712603681949745213)](https://discord.gg/MFBkvqw)
+# Zoned   [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Version: 0.0.2-beta](https://img.shields.io/badge/version-0.0.2--beta-orange)](https://github.com/Spikatrix/Zoned/releases/tag/v0.0.2-beta)
 
 <img src="https://i.stack.imgur.com/cunrq.png" alt="Zoned Icon" align="left" style="margin: 10px 20px 10px 10px; border-radius: 20%; box-shadow: 0 6px 20px 2px black" height="162px">
 
-Zoned is a cross-platform grid based multiplayer strategy game powered by [libGDX][libGDX]. The game is primarily targeted for Android, but it will work just fine on Windows and Linux as well.
+Zoned is a cross-platform grid based multiplayer strategy game powered by [libGDX][libGDX]. The game is prima`rily targeted for Android, but it will work just fine on Windows and Linux as well.
 
 It is available to download on the [Google Play Store][play_store_page] (Android) as well as on [GitHub][github_release_page] (Windows, Linux and Android)
 
@@ -45,8 +45,6 @@ You can then find the generated binaries at
 
 ## Contributing
 
-Zoned is a FOSS game developed by [me](https://github.com/Spikatrix). I'm available on [Discord][discord_invite] if you want to have a chat with me.
-
 Contributions are always welcome.
 
 Here are a few ways you can help:
@@ -65,5 +63,4 @@ This project is licensed under the [GNU GPLv3 License][project_license]
 [issue_tracker]: https://github.com/Spikatrix/Zoned/issues
 [email_feedback]: mailto:[email protected]?subject=Zoned+Feedback&body=Your+feedback+here
 [custom_external_map_wiki]: https://github.com/Spikatrix/Zoned/wiki/Custom-External-Maps
-[discord_invite]: https://discord.gg/MFBkvqw
 [project_license]: https://github.com/Spikatrix/Zoned/blob/master/LICENSE

android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cg.zoned" >
 
-    <!-- For local multiplayer (via WiFi) -->
+    <!-- These permissions are required for local network multiplayer -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

android/assets/neon-skin/neon-ui.atlas

@@ -196,7 +196,7 @@ scroll-horizontal
   index: -1
 scroll-vertical
   rotate: false
-  xy: 393, 39
+  xy: 193, 39
   size: 27, 44
   split: 11, 11, 11, 11
   pad: 0, 0, 0, 0

android/assets/particles/radial_particle_emitter.p

@@ -2,16 +2,16 @@ RadialEmitter
 - Delay -
 active: false
 - Duration - 
-lowMin: 1000.0
-lowMax: 1000.0
+lowMin: 100.0
+lowMax: 100.0
 - Count - 
 min: 0
-max: 380
+max: 50
 - Emission - 
-lowMin: 250.0
-lowMax: 250.0
-highMin: 250.0
-highMax: 250.0
+lowMin: 150.0
+lowMax: 150.0
+highMin: 150.0
+highMax: 150.0
 relative: false
 scalingCount: 1
 scaling0: 1.0
@@ -20,8 +20,8 @@ timeline0: 0.0
 - Life - 
 lowMin: 0.0
 lowMax: 0.0
-highMin: 1500.0
-highMax: 1500.0
+highMin: 500.0
+highMax: 500.0
 relative: false
 scalingCount: 1
 scaling0: 1.0
@@ -120,22 +120,22 @@ highMin: 1.0
 highMax: 1.0
 relative: false
 scalingCount: 6
-scaling0: 0.46067417
-scaling1: 0.25842696
-scaling2: 0.252809
-scaling3: 0.17977528
-scaling4: 0.09550562
+scaling0: 0.20224719
+scaling1: 0.15730338
+scaling2: 0.12280702
+scaling3: 0.07017544
+scaling4: 0.028089888
 scaling5: 0.0
 timelineCount: 6
 timeline0: 0.0
-timeline1: 0.25699747
-timeline2: 0.53435117
-timeline3: 0.77099234
-timeline4: 0.89694655
+timeline1: 0.21198668
+timeline2: 0.5068493
+timeline3: 0.7671233
+timeline4: 0.8945616
 timeline5: 1.0
 - Options - 
 attached: false
-continuous: true
+continuous: false
 aligned: false
 additive: false
 behind: false

android/build.gradle

@@ -20,19 +20,30 @@ android {
         applicationId "com.cg.zoned"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 1
-        versionName "0.0.1-beta"
+        versionCode 2
+        versionName "0.0.2-beta"
         // Remember to update the GAME_VERSION in Constants.java
         // And project.setVersion in Desktop's build.gradle
+        // And the version in the badge in the README file
         // Or for Linux users, use the versionUpdate.sh script
     }
     buildTypes {
         release {
-            minifyEnabled false // Don't set this to true because it'll result in a lot of classes missing causing Runtime crashes
+            minifyEnabled false // Don't set this to true because it'll result in a lot of classes missing causing Runtime crashes (Unless you `-keep` them all)
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            if (variant.name == "debug") {
+                outputFileName = "${appName}-${versionName}-${variant.name}.apk"
+            } else {
+                outputFileName = "${appName}-${versionName}.apk"
+            }
+        }
+    }
 }
 
 

android/src/com/cg/zoned/AndroidLauncher.java

@@ -15,6 +15,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (!BuildConfig.VERSION_NAME.equals(Constants.GAME_VERSION)) {
+            // Used as a precaution
             Toast.makeText(getApplicationContext(),
                     "GAME VERSION MISMATCH (" + BuildConfig.VERSION_NAME + " and " + Constants.GAME_VERSION + ")",
                     Toast.LENGTH_LONG).show();

build.gradle

@@ -19,7 +19,7 @@ allprojects {
 
     version = '1.0'
     ext {
-        appName = "zoned"
+        appName = "Zoned"
         gdxVersion = '1.9.10'
         roboVMVersion = '2.3.6'
         box2DLightsVersion = '1.4'
@@ -47,6 +47,8 @@ project(":desktop") {
         api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         api "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+        implementation files("../core/libs/discord-rpc.jar")
     }
 }
 
@@ -73,6 +75,7 @@ project(":android") {
     }
 }
 
+// No HTML support since the game uses Kryonet which isn't supported there
 /*project(":html") {
     apply plugin: "gwt"
     apply plugin: "war"
@@ -95,6 +98,9 @@ project(":core") {
 
         api "com.esotericsoftware:kryonet:2.22.0-RC1"
         api "com.github.payne911:PieMenu:$pieMenuVersion"
+        // Pie menu depends on ShapeDrawer, so that'll get imported as well
+
+        implementation files("libs/discord-rpc.jar")
     }
 }
 

core/src/com/cg/zoned/Assets.java

@@ -0,0 +1,44 @@
+package com.cg.zoned;
+
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.graphics.Texture;
+
+public class Assets {
+    private AssetManager assetManager;
+
+    public Texture getPlayButtonTexture() {
+        return assetManager.get("icons/ui_icons/ic_play_sheet.png", Texture.class);
+    }
+
+    public Texture getBackButtonTexture() {
+        return assetManager.get("icons/ui_icons/ic_back.png", Texture.class);
+    }
+
+    public Texture getCreditsButtonTexture() {
+        return assetManager.get("icons/ui_icons/ic_credits.png", Texture.class);
+    }
+
+    public Texture getCrossButtonTexture() {
+        return assetManager.get("icons/ui_icons/ic_cross.png", Texture.class);
+    }
+
+    public Texture getDevButtonTexture() {
+        return assetManager.get("icons/ui_icons/ic_dev.png", Texture.class);
+    }
+
+    public Texture getSettingsButtonTexture() {
+        return assetManager.get("icons/ui_icons/ic_settings.png", Texture.class);
+    }
+
+    public Texture getTutorialButtonTexture() {
+        return assetManager.get("icons/ui_icons/ic_tutorial.png", Texture.class);
+    }
+
+    public void setAssetManager(AssetManager assetManager) {
+        this.assetManager = assetManager;
+    }
+
+    public void dispose() {
+        assetManager.dispose();
+    }
+}

core/src/com/cg/zoned/Constants.java

@@ -7,14 +7,22 @@
 import java.util.Map;
 
 public final class Constants {
-    public static final String GAME_VERSION = "0.0.1-beta";
+    public static final String GAME_VERSION = "0.0.2-beta";
     // Remember to update the versionName in Android's build.gradle
     // And project.setVersion in Desktop's build.gradle
+    // And the version in the badge in the README file
     // Or for Linux users, use the versionUpdate.sh script
 
+    /**
+     * Enables Discord Rich Presence functionality on Windows and Linux
+     * <p>
+     * Note: When this is enabled, running multiple instances of the game will crash with a SIGSEGV
+     */
+    public static final boolean ENABLE_DISCORD_RPC = true;
+
     public static final float WORLD_SIZE = 480.0f;
 
-    public static final int SERVER_PORT = 22355; // Random port I chose *shrug*
+    public static final int SERVER_PORT = 22355; // Random port I chose ¯\_(ツ)_/¯
 
     public static final float CELL_SIZE = 25.0f;
     public static final Color MAP_GRID_COLOR = Color.WHITE;
@@ -86,6 +94,7 @@ public final class Constants {
     public static final float ANDROID_XXXHDPI_FONT_SCALE_FACTOR = 4.0f;
 
     public static final String LOG_TAG = "ZONED";
+
     public static final String ZONED_PREFERENCES = "Zoned_Preferences";
     public static final String FPS_PREFERENCE = "FPS_Preference";
     public static final String CONTROL_PREFERENCE = "Control_Preference";
@@ -102,7 +111,7 @@ public enum Direction {UP, LEFT, DOWN, RIGHT}
 
     public enum FONT_MANAGER {
         LARGE("large-font", 80),
-        REGULAR("regular-font", 36),
+        REGULAR("regular-font", 32),
         SMALL("small-font", 18),
         PLAYER_LABEL("player-label-font-noscale", 20);