Merge branch 'groovy' into develop

build.gradle

@@ -87,8 +87,19 @@ task copyResources(type: Copy) {
     from('extra-resources')
     into("$project.buildDir/libs")
     include('server.properties.example')
-    include('decks/Cyborg-Chronicles/Balanced.deck')
-    include('decks/Cyborg-Chronicles/Defensive.deck')
+    for (File mod : new File('extra-resources/decks').listFiles()) {
+        println 'Checking mod ' + mod.getName()
+        for (File deck : mod.listFiles()) {
+            def modName = mod.getName()
+            def deckName = deck.getName()
+            if (Character.isUpperCase(deck.getName().charAt(0))) {
+                println("Include decks/${modName}/${deckName}")
+                include("decks/${modName}/${deckName}")
+            } else {
+                println("Deck name does not start with capital letter, skipping: decks/${modName}/${deckName}")
+            }
+        }
+    }
     include('mods/**')
 }
 

cardshifter-fx/src/main/java/com/cardshifter/client/GameClientLauncherController.java

@@ -134,10 +134,16 @@ public void clearAIButtons() {
 
 	public void setAI(String aiName) {
 		this.aiChoice = this.aiChoices.get(aiName);
-        this.localGameButton.setDisable(false);
+        this.checkLocalGameButtonEnable();
 	}
-
-	private void localGameStart(ActionEvent event) {
+
+    private void checkLocalGameButtonEnable() {
+        boolean aiSelected = this.aiChoice != null;
+        boolean modChosen = this.modChoice.getSelectionModel().getSelectedItem() != null;
+        this.localGameButton.setDisable(!aiSelected || !modChosen);
+    }
+
+    private void localGameStart(ActionEvent event) {
         String modName = modChoice.getValue();
 		ECSMod mod = mods.getModFor(modName);
 		ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);