Merge branch 'master' of https://github.com/EmergentOrganization/cell…

…-rpg into demo
EmergentOrganization · Jun 11, 2016 · 89c9be6 · 89c9be6
2 parents 6d39e63 + 2b4fb17
commit 89c9be6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/src/io/github/emergentorganization/cellrpg/PixelonTransmission.java b/core/src/io/github/emergentorganization/cellrpg/PixelonTransmission.java
@@ -5,6 +5,7 @@
 import com.badlogic.gdx.Files;
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Preferences;
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver;
 import com.badlogic.gdx.audio.Sound;
@@ -62,6 +63,11 @@ public PixelonTransmission() {
         String logFile = "log4j2.xml";
         System.setProperty("log4j.configurationFile", FileStructure.RESOURCE_DIR + logFile);
         logger = LogManager.getLogger(getClass());
+        Preferences prefs = GameSettings.getPreferences();
+        String type = prefs.getString(GameSettings.KEY_GRAPHICS_TYPE, "windowed");
+        int width = prefs.getInteger(GameSettings.KEY_GRAPHICS_WIDTH, 0);
+        int height = prefs.getInteger(GameSettings.KEY_GRAPHICS_HEIGHT, 0);
+        logger.info("init app " + width + "x" + height + " " + type);
     }
 
     @Override

diff --git a/core/src/io/github/emergentorganization/cellrpg/tools/mixpanel/Mixpanel.java b/core/src/io/github/emergentorganization/cellrpg/tools/mixpanel/Mixpanel.java
@@ -38,14 +38,16 @@ private void updateUserProfile() {
             props.put("JRE", System.getProperty("java.version"));
             props.put("time zone", Calendar.getInstance().getTimeZone().getID());
             // TODO: (maybe) useful mixpanel special properties:
-            //props.put("$email", "???");
             //props.put("$ip", "???");
             //props.put("$first_name", "???");
             //props.put("$last_name", "???");
             //props.put("$name", "???"); // alternative to $first_name $last_name
             //props.put("$created", "???");
             //props.put("$email", "???");
             //props.put("$phone", "???");
+            Preferences prefs = GameSettings.getPreferences();
+            // TODO: this is temporary, KEY_USER_NAME will soon refer to the active avatar's name and not the user:
+            props.put("$name", prefs.getString(GameSettings.KEY_USER_NAME));
 
             JSONObject update = messageBuilder.set(UserIdentifier.getId(), props);
             // Send the update to mixpanel
@@ -86,6 +88,8 @@ public void gameOverEvent(final int score, final int wave) {
 
             props.put("movement_method", prefs.getInteger(GameSettings.KEY_MOVEMENT_CONTROL_METHOD));
             props.put("weapon_method", prefs.getInteger(GameSettings.KEY_WEAPON_CONTROL_METHOD));
+            props.put("width", prefs.getInteger(GameSettings.KEY_GRAPHICS_WIDTH));
+            props.put("height", prefs.getInteger(GameSettings.KEY_GRAPHICS_HEIGHT));
 
             // report CA generation lengths
 //            try {