MenuScreen refactor, moved fonts to folder, transition refactor.

Author: bladecoder

adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java

@@ -300,19 +300,21 @@ public void build (ProjectBuilder builder, String outputDir, String appName, Str
 		new File(outputDir + "/" + assetPath + "/spine").mkdirs();
 		new File(outputDir + "/" + assetPath + "/test").mkdirs();
 		new File(outputDir + "/" + assetPath + "/ui/1").mkdirs();
+		new File(outputDir + "/" + assetPath + "/ui/fonts").mkdirs();
 
 
 		project.files.add(new ProjectFile("android/assets/model/00.chapter", assetPath + "/model/00.chapter", false));
 		project.files.add(new ProjectFile("android/assets/model/world.properties", assetPath + "/model/world.properties", false));
 		project.files.add(new ProjectFile("android/assets/model/world.xml", assetPath + "/model/world.xml", false));
 		project.files.add(new ProjectFile("android/assets/model/world_es.properties", assetPath + "/model/world_es.properties", false));
 
-		project.files.add(new ProjectFile("android/assets/ui/ArchitectsDaughter_fix.ttf", assetPath + "/ui/ArchitectsDaughter_fix.ttf", false));
 		project.files.add(new ProjectFile("android/assets/ui/credits.txt", assetPath + "/ui/credits.txt", false));
-		project.files.add(new ProjectFile("android/assets/ui/Roboto-Black.ttf", assetPath + "/ui/Roboto-Black.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/Roboto-Regular.ttf", assetPath + "/ui/Roboto-Regular.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/Roboto-Thin.ttf", assetPath + "/ui/Roboto-Thin.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/Ubuntu-M.ttf", assetPath + "/ui/Ubuntu-M.ttf", false));
+		project.files.add(new ProjectFile("android/assets/ui/fonts/PaytoneOne.ttf", assetPath + "/ui/fonts/PaytoneOne.ttf", false));
+		project.files.add(new ProjectFile("android/assets/ui/fonts/ArchitectsDaughter_fix.ttf", assetPath + "/ui/fonts/ArchitectsDaughter_fix.ttf", false));
+		project.files.add(new ProjectFile("android/assets/ui/fonts/Roboto-Black.ttf", assetPath + "/ui/fonts/Roboto-Black.ttf", false));
+		project.files.add(new ProjectFile("android/assets/ui/fonts/Roboto-Regular.ttf", assetPath + "/ui/fonts/Roboto-Regular.ttf", false));
+		project.files.add(new ProjectFile("android/assets/ui/fonts/Roboto-Thin.ttf", assetPath + "/ui/fonts/Roboto-Thin.ttf", false));
+		project.files.add(new ProjectFile("android/assets/ui/fonts/Ubuntu-M.ttf", assetPath + "/ui/fonts/Ubuntu-M.ttf", false));
 		project.files.add(new ProjectFile("android/assets/ui/ui.json", assetPath + "/ui/ui.json", false));
 
 		project.files.add(new ProjectFile("android/assets/ui/1/blade_logo.png", assetPath + "/ui/1/blade_logo.png", false));

adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/DependencyBank.java

@@ -12,9 +12,9 @@ public class DependencyBank {
 	static String libGDXReleaseUrl = "https://oss.sonatype.org/content/repositories/releases/";
 
 	//Project plugins
-	static String gwtPluginImport = "de.richsource.gradle.plugins:gwt-gradle-plugin:0.5";
-	static String androidPluginImport = "com.android.tools.build:gradle:0.13+";
-	static String roboVMPluginImport = "org.robovm:robovm-gradle-plugin:1.0.0-alpha-04";
+	static String gwtPluginImport = "de.richsource.gradle.plugins:gwt-gradle-plugin:0.6";
+	static String androidPluginImport = "com.android.tools.build:gradle:1.0.0";
+	static String roboVMPluginImport = "org.robovm:robovm-gradle-plugin:1.0.0-beta-01";
 
 	HashMap<ProjectDependency, Dependency> gdxDependencies = new HashMap<ProjectDependency, Dependency>();
 	LinkedHashMap<ProjectDependency, String[]> gwtInheritances = new LinkedHashMap<ProjectDependency, String[]>();

adventure-composer/src/main/resources/projectTmpl/android/assets/ui/credits.txt

@@ -1,18 +1,5 @@
-t#SCRIPT
+t#BLADECODER ADVENTURE ENGINE
 RAFAEL GARCÍA
-t#CHAPTER DESIGN
-ALMUDENA CASTILLEJO
-RAFAEL GARCÍA
-t#BACKGROUNDS
-ALMUDENA CASTILLEJO
-RAFAEL GARCÍA
-t#PROGRAMMING
-RAFAEL GARCÍA
-t#MUSIC
-Moonlight Sonata Op. 27 No. 2 Moonlight Sonata 
-Performed by Paul Pitman - musopen.org
-t#SOUND FX
-freesound.org
 s#120
 i#libgdx_logo.png
 s#250

adventure-composer/src/main/resources/projectTmpl/android/assets/ui/ArchitectsDaughter_fix.ttf renamed to adventure-composer/src/main/resources/projectTmpl/android/assets/ui/fonts/ArchitectsDaughter_fix.ttf

@@ -1,14 +1,13 @@
 {
 com.badlogic.gdx.graphics.g2d.BitmapFont: {
-		default: {file: Roboto-Regular.ttf, size: 20},
-		debug: {file: Roboto-Regular.ttf, size: 15}, 
-		big-font: {file: Roboto-Black.ttf, size: 35},
-		title-font: {file: Roboto-Black.ttf, size: 60},
-		dialog-font: {file: ArchitectsDaughter_fix.ttf, size: 20},
-		text-manager-font: {file: ArchitectsDaughter_fix.ttf, size: 18},
-		desc: {file: Ubuntu-M.ttf, size: 16},
-		credits-title: {file: Ubuntu-M.ttf, size: 20},
-		credits: {file: Ubuntu-M.ttf, size: 30}
+		default: {file: fonts/Roboto-Regular.ttf, size: 20},
+		debug: {file: fonts/Roboto-Regular.ttf, size: 15}, 
+		big-font: {file: fonts/PaytoneOne.ttf, size: 35},
+		dialog-font: {file: fonts/ArchitectsDaughter_fix.ttf, size: 20},
+		text-manager-font: {file: fonts/ArchitectsDaughter_fix.ttf, size: 18},
+		desc: {file: fonts/Ubuntu-M.ttf, size: 16},
+		credits-title: {file: fonts/Ubuntu-M.ttf, size: 20},
+		credits: {file: fonts/Ubuntu-M.ttf, size: 30}
 	},
 com.badlogic.gdx.graphics.Color: {
 	green: { a: 1, b: 0, g: 1, r: 0 },
@@ -24,7 +23,8 @@ com.badlogic.gdx.graphics.Color: {
 	red500: { r: 0.90, g: 0.11, b: 0.13, a: 1 },
 	red-dark: { r: 0.71, g: 0.04, b: 0.06, a: 1 },
 	red-light:  { r: 0.99, g: 0.45, b: 0.47, a: 1 },
-	black-trans:  { r: 0.1, g: 0.1, b: 0.1, a: 0.7 }
+	black-trans:  { r: 0.1, g: 0.1, b: 0.1, a: 0.7 },
+	yellow:  { r: 1, g: 1, b: 0.13, a: 1 }
 },
 com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
 	black08: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.8 } },
@@ -38,33 +38,41 @@ com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
 	circle-border-light: { name: circle_border, color: light-grey},	
 	border-rect-grey: { name: border_rect4, color: light-grey},
 	border-rect-dark-grey: { name: border_rect2, color: { a: 1, b: 0.6, g: 0.6, r: 0.6 }},
+	border-rect-trans: { name: border_rect4, color: { a: 0.2, b: 0.6, g: 0.6, r: 0.6 }},
+	border-rect-trans-down: { name: border_rect4, color: { a: 0.5, b: 0.6, g: 0.6, r: 0.6 }},
 },
 com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
 	pie_lookat: {up:circle-border, down: circle-border-light, imageUp: lookat},
 	pie_pickup: {up:circle-border, down: circle-border-light, imageUp: pickup},
 	pie_talkto: {up:circle-border, down: circle-border-light, imageUp: talkto},
 	inventory: {up:inventory},
-	menu: {up:circle, down: circle-light, imageUp: menu}
-},
-com.bladecoder.engine.ui.InventoryUI$InventoryUIStyle: {
-	default: {background: border-rect-grey, itemBackground: border-rect-dark-grey, menuButtonStyle: menu}
+	showMenu: {up:circle, down: circle-light, imageUp: menu}
 },
+
 com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
 		default: { font: default, up: grey, fontColor: white , downFontColor: grey, overFontColor: light-grey, disabledFontColor: dark-grey},
-		menu: { font: big-font, fontColor: white , downFontColor: grey, overFontColor: light-grey, disabledFontColor: dark-grey}		
+		menu: { up: border-rect-trans, down: border-rect-trans-down, font: big-font, fontColor: white , downFontColor: grey, overFontColor: yellow, disabledFontColor: dark-grey}		
 },
 com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
 		default: { font: default, fontColor: white},
-		title: { font: title-font, fontColor: white},
+		title: { font: big-font, fontColor: white},
 },
 
+com.bladecoder.engine.ui.MenuScreen$MenuScreenStyle: {
+	default: {textButtonStyle: menu, showTitle: true, titleStyle: title}
+},
+com.bladecoder.engine.ui.InventoryUI$InventoryUIStyle: {
+	default: {background: border-rect-grey, itemBackground: border-rect-dark-grey, menuButtonStyle: showMenu}
+},
 com.bladecoder.engine.ui.DialogUI$DialogUIStyle: {
 	default: {background: black08, font: dialog-font, fontColor: white, overFontColor: light-grey}
 },
 
 com.bladecoder.engine.ui.TextManagerUI$TextManagerUIStyle: {
 	default: {rectBackground: border_black_rect4, talkBackground: white, font: text-manager-font, talkBubble: bubblepointer}
 },
+
+
 com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
 		default: { selection: grey, background: dark-grey, focusedBackground: dark-grey, disabledBackground: grey, font: default, fontColor: white, focusedFontColor: text-dark, disabledFontColor: text-dark, cursor: white, messageFont: default, messageFontColor: text-dark }
 },