diff --git a/core/AssetManager.java b/core/AssetManager.java index bbea7fe..003a061 100644 --- a/core/AssetManager.java +++ b/core/AssetManager.java @@ -242,8 +242,8 @@ public class AssetManager { for(int i = 0; i < 10; i ++){ for(int j = 0; j < 6; j++){ - //lightTank l = new lightTank(new vector(i*0.25f+ 1.125f,-0.3f, 17.375f - 0.25f*j), 90, 0); - //addLightTank(l); + lightTank l = new lightTank(new vector(i*0.25f+ 1.125f,-0.3f, 17.375f - 0.25f*j), 90, 0); + addLightTank(l); //l.hasMultiShotUpgrade = true; //lightTank l = new lightTank(new vector(i*0.25f + 1.125f,-0.3f, 0.5f + 18.625f + j*0.25f), 90, 0); diff --git a/core/playerCommander.java b/core/playerCommander.java index b33f07e..2bc6306 100644 --- a/core/playerCommander.java +++ b/core/playerCommander.java @@ -115,19 +115,45 @@ public class playerCommander { groups[numberTyped-1][i] = null; } } - + + //check if the current selection has mobile unit, if that is the case grouping should exclude buildings + boolean hasMobileUnit = false; for(int i = 0; i < 100; i ++){ - if(selectedUnits[i] != null){ if(selectedUnits[i].teamNo == 0){ - groups[numberTyped-1][i] = selectedUnits[i]; - selectedUnits[i].groupNo = numberTyped-1; - - selectedUnits[i].isSelected = true; - removeFromOtherGroup(selectedUnits[i], numberTyped-1); + if(selectedUnits[i].type == 0 || selectedUnits[i].type == 1 || selectedUnits[i].type == 2 || selectedUnits[i].type == 3 || selectedUnits[i].type == 6 || selectedUnits[i].type == 7) { + hasMobileUnit = true; + break; + } } } } + + + for(int i = 0; i < 100; i ++){ + if(selectedUnits[i] != null){ + if(selectedUnits[i].teamNo == 0){ + if(hasMobileUnit) { + if(selectedUnits[i].type == 0 || selectedUnits[i].type == 1 || selectedUnits[i].type == 2 || selectedUnits[i].type == 3 || selectedUnits[i].type == 6 || selectedUnits[i].type == 7) { + groups[numberTyped-1][i] = selectedUnits[i]; + selectedUnits[i].groupNo = numberTyped-1; + selectedUnits[i].isSelected = true; + removeFromOtherGroup(selectedUnits[i], numberTyped-1); + } + }else { + + groups[numberTyped-1][i] = selectedUnits[i]; + selectedUnits[i].groupNo = numberTyped-1; + selectedUnits[i].isSelected = true; + removeFromOtherGroup(selectedUnits[i], numberTyped-1); + } + + + } + } + } + + }else{ if(numberTyped == pressedNumber){ doubleNumberPressed = true; @@ -264,7 +290,7 @@ public class playerCommander { }else{ if(doubleClickCountDown == 0) - doubleClickCountDown = 10; + doubleClickCountDown = 15; else doubleClicked = true; diff --git a/gui/gameMenu.java b/gui/gameMenu.java index e03c0a8..b43ee25 100644 --- a/gui/gameMenu.java +++ b/gui/gameMenu.java @@ -224,14 +224,14 @@ public class gameMenu { textRenderer tRenderer = postProcessingThread.theTextRenderer; if(currentHelpPage == 0) { - tRenderer.drawMenuText(82,90,helpPage1, screen, 255,255,255,11); + tRenderer.drawMenuText(82,90,helpPage1, screen, 255,255,255,0); nextPage.display = true; }else if(currentHelpPage == 1) { - tRenderer.drawMenuText(82,90,helpPage2, screen, 255,255,255,11); + tRenderer.drawMenuText(82,90,helpPage2, screen, 255,255,255,0); nextPage.display = true; previousPage.display = true; }else if(currentHelpPage == 2) { - tRenderer.drawMenuText(82,90,helpPage3, screen, 255,255,255,11); + tRenderer.drawMenuText(82,90,helpPage3, screen, 255,255,255,0); nextPage.display = true; previousPage.display = true; drawImage(83,157, 44, 44,lightTankImage); @@ -239,7 +239,7 @@ public class gameMenu { drawImage(83,290, 44, 44,stealthTankImage); drawImage(83,364, 44, 44,heavyTankImage); }else if(currentHelpPage == 3) { - tRenderer.drawMenuText(82,90,helpPage4, screen, 255,255,255,11); + tRenderer.drawMenuText(82,90,helpPage4, screen, 255,255,255,0); previousPage.display = true; } @@ -287,7 +287,7 @@ public class gameMenu { } public void drawBluredBackground() { - if(gameSuspendCount < 6) { + if(gameSuspendCount < 4) { for(int k = 0; k < 3; k++) for(int i = 1; i < 511; i++ ) { diff --git a/images/menuFont - Copy.png b/images/menuFont - Copy.png deleted file mode 100644 index 7d140b6..0000000 Binary files a/images/menuFont - Copy.png and /dev/null differ diff --git a/images/menuFont.png b/images/menuFont.png index ad5bb3b..7d140b6 100644 Binary files a/images/menuFont.png and b/images/menuFont.png differ diff --git a/images/menuFont1.png b/images/menuFont1.png new file mode 100644 index 0000000..1335c02 Binary files /dev/null and b/images/menuFont1.png differ