[Jrisk-cvs] SF.net SVN: domination-code:[2723] Domination

[<yu...@us...>]

Revision: 2723
          http://sourceforge.net/p/domination/code/2723
Author:   yuranet
Date:     2026-02-06 15:36:25 +0000 (Fri, 06 Feb 2026)
Log Message:
-----------
split getExtraArmiesForPlayer into own method

Modified Paths:
--------------
    Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
    Domination/src/net/yura/domination/engine/core/RiskGame.java
    Domination/test/net/yura/domination/engine/core/PlayGameTest.java

Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java	2026-01-29 19:25:44 UTC (rev 2722)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java	2026-02-06 15:36:25 UTC (rev 2723)
@@ -616,7 +616,7 @@
             }
             else if (Application.getPlatform() == Application.PLATFORM_ANDROID) {
 
-                String myToken = token;
+                final String myToken = token;
                 lobby.mycom.addPushEventListener(new PushLobbyClient() {
                     @Override
                     public void registerDone() {

Modified: Domination/src/net/yura/domination/engine/core/RiskGame.java
===================================================================
--- Domination/src/net/yura/domination/engine/core/RiskGame.java	2026-01-29 19:25:44 UTC (rev 2722)
+++ Domination/src/net/yura/domination/engine/core/RiskGame.java	2026-02-06 15:36:25 UTC (rev 2723)
@@ -474,19 +474,7 @@
 				workOutEndGoStats( currentPlayer );
 				currentPlayer.nextTurn();
 
-				// add new armies for the Territories Owned
-                                int extraArmies = currentPlayer.getNoTerritoriesOwned() / 3;
-                                if (extraArmies < minimumNewArmies) {
-                                        extraArmies = minimumNewArmies;
-                                }
-                                currentPlayer.addArmies(extraArmies);
-
-				// add new armies for the Continents Owned
-				for (int c=0; c< Continents.length ; c++) {
-					if ( Continents[c].isOwned(currentPlayer) ) {
-						currentPlayer.addArmies( Continents[c].getArmyValue() );
-					}
-				}
+				currentPlayer.addArmies(getExtraArmiesForPlayer(currentPlayer));
 			}
 
 			if (getSetupDone() && gameMode == MODE_CAPITAL && currentPlayer.getCapital() == null) { // capital risk setup not finished
@@ -512,6 +500,22 @@
 		}
 	}
 
+	public int getExtraArmiesForPlayer(Player currentPlayer) {
+		// add new armies for the Territories Owned
+		int extraArmies = currentPlayer.getNoTerritoriesOwned() / 3;
+		if (extraArmies < minimumNewArmies) {
+			extraArmies = minimumNewArmies;
+		}
+
+		// add new armies for the Continents Owned
+		for (int c = 0; c < Continents.length; c++) {
+			if (Continents[c].isOwned(currentPlayer)) {
+				extraArmies += Continents[c].getArmyValue();
+			}
+		}
+		return extraArmies;
+	}
+
     /**
      * in Italian mode, we may have no armies, so we need to handle going into other states too
      */

Modified: Domination/test/net/yura/domination/engine/core/PlayGameTest.java
===================================================================
--- Domination/test/net/yura/domination/engine/core/PlayGameTest.java	2026-01-29 19:25:44 UTC (rev 2722)
+++ Domination/test/net/yura/domination/engine/core/PlayGameTest.java	2026-02-06 15:36:25 UTC (rev 2723)
@@ -43,7 +43,7 @@
     public void playGame(String mode) throws Exception {
         File file = TestUtil.getScriptFile(mode);
 
-        assertTrue(file + " NOT FOUND!", file.exists());
+        assertTrue(file.getAbsolutePath() + " NOT FOUND!", file.exists());
 
         playGame(file);
     }
@@ -50,7 +50,7 @@
     
     public void playGame(File file) throws Exception {
         //InputStream in = ReplayGameTest.class.getResourceAsStream("test.risk");
-        Risk risk = TestUtil.newRisk();
+        final Risk risk = TestUtil.newRisk();
 
         risk.addRiskListener(new RiskAdapter() {
             public void sendMessage(String output, boolean redrawNeeded, boolean repaintNeeded) {