[Jrisk-cvs] SF.net SVN: domination-code:[2551] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2551] Domination
|
From: <yu...@us...> - 2024-06-04 20:15:15
|
Revision: 2551
http://sourceforge.net/p/domination/code/2551
Author: yuranet
Date: 2024-06-04 20:15:11 +0000 (Tue, 04 Jun 2024)
Log Message:
-----------
javadoc and changelog update
Modified Paths:
--------------
Domination/ChangeLog.txt
Domination/src/net/yura/domination/engine/Risk.java
Domination/src/net/yura/domination/engine/core/RiskGame.java
Domination/swingUI/build.xml
Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java
Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java
Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditorViews.java
Domination/swingUI/src/net/yura/domination/ui/swinggui/TestPanel.java
Modified: Domination/ChangeLog.txt
===================================================================
--- Domination/ChangeLog.txt 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/ChangeLog.txt 2024-06-04 20:15:11 UTC (rev 2551)
@@ -2,7 +2,7 @@
CURRENT VERSION:
- Risk Game: 1.3.1
+ Risk Game: 1.3.2
* Network: 14
* Save: 8
@@ -14,6 +14,10 @@
Increment1GUI: 2
CommandLine: 2
+1.3.2
+
+ RiskGame.getMissions() now returns ALL game missions, to make AI development easier
+
1.3.1 (08.05.2024) (svn rev 2540)
Sounds effects and music! (memory leak fixed this time)
Modified: Domination/src/net/yura/domination/engine/Risk.java
===================================================================
--- Domination/src/net/yura/domination/engine/Risk.java 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/src/net/yura/domination/engine/Risk.java 2024-06-04 20:15:11 UTC (rev 2551)
@@ -1366,7 +1366,7 @@
output=null;
needInput=false;
}
- else if (newgame_type == RiskGame.MODE_SECRET_MISSION && game.getMissions().size() < game.getPlayers().size()) {
+ else if (newgame_type == RiskGame.MODE_SECRET_MISSION && game.getNoMissions() < game.getPlayers().size()) {
output="map does not have enough missions for players";
}
else {
Modified: Domination/src/net/yura/domination/engine/core/RiskGame.java
===================================================================
--- Domination/src/net/yura/domination/engine/core/RiskGame.java 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/src/net/yura/domination/engine/core/RiskGame.java 2024-06-04 20:15:11 UTC (rev 2551)
@@ -2663,10 +2663,10 @@
}
/**
- * Gets the allocated Missions in the game
- * @return Vector Return the Missions in the current game
+ * Gets all Missions in the game
+ * @return all the Missions in the current game
*/
- public Vector getMissions() {
+ public List getMissions() {
return Missions;
}
Modified: Domination/swingUI/build.xml
===================================================================
--- Domination/swingUI/build.xml 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/swingUI/build.xml 2024-06-04 20:15:11 UTC (rev 2551)
@@ -16,7 +16,7 @@
<property file="local.properties" />
- <property name="game.version" value="1.3.1"/>
+ <property name="game.version" value="1.3.2"/>
<!--
For releasing we want to be compatible wth as many versions of java as possible
Modified: Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java 2024-06-04 20:15:11 UTC (rev 2551)
@@ -711,6 +711,7 @@
if (returnVal == javax.swing.JFileChooser.APPROVE_OPTION) {
java.io.File file = fc.getSelectedFile();
+ // TODO file null???? windows java1.8
return file.getAbsolutePath();
}
Modified: Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java 2024-06-04 20:15:11 UTC (rev 2551)
@@ -1414,11 +1414,11 @@
risk.loadMap();
risk.loadCards(true);
- if (!risk.getCards().equals(myMap.getCards()) || risk.getMissions().size() != myMap.getMissions().size()) {
+ if (!risk.getCards().equals(myMap.getCards()) || risk.getNoMissions() != myMap.getNoMissions()) {
return false;
}
- for (int c = 0; c < myMap.getMissions().size(); c++) {
+ for (int c = 0; c < myMap.getNoMissions(); c++) {
Mission m1 = (Mission)myMap.getMissions().get(c);
Mission m2 = (Mission)risk.getMissions().get(c);
if (!MapSave.getMissionString(m1, myMap).equals(MapSave.getMissionString(m2, risk))) {
Modified: Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditorViews.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditorViews.java 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditorViews.java 2024-06-04 20:15:11 UTC (rev 2551)
@@ -931,7 +931,7 @@
public Object getElementAt(int index) {
if (map==null) { return null; }
- return map.getMissions().elementAt(index);
+ return map.getMissions().get(index);
}
public int getSize() {
Modified: Domination/swingUI/src/net/yura/domination/ui/swinggui/TestPanel.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/swinggui/TestPanel.java 2024-06-04 19:27:42 UTC (rev 2550)
+++ Domination/swingUI/src/net/yura/domination/ui/swinggui/TestPanel.java 2024-06-04 20:15:11 UTC (rev 2551)
@@ -282,7 +282,7 @@
missionsModel = new AbstractTableModel() {
- private final String[] columnNames = { "Mission" };
+ private final String[] columnNames = { "i", "Mission" };
public int getColumnCount() {
return columnNames.length;
@@ -306,7 +306,8 @@
public Object getValueAt(int row, int col) {
Mission mission = (Mission)myrisk.getGame().getMissions().get(row);
switch(col) {
- case 0: return mission.toString();
+ case 0: return String.valueOf(row);
+ case 1: return mission.toString();
default: throw new RuntimeException();
}
}
@@ -496,7 +497,9 @@
views.add( "Cards" , new JScrollPane(new JTable(cardsModel)) );
views.add( "Spent Cards" , new JScrollPane(new JTable(cardsModel2)) );
views.add( "Players" , new JScrollPane(new JTable(playersModel)) );
- views.add( "Missions" , new JScrollPane(new JTable(missionsModel)) );
+ JTable missionTable = new JTable(missionsModel);
+ missionTable.getColumnModel().getColumn(0).setMaxWidth(missionTable.getFontMetrics(missionTable.getFont()).stringWidth("1000"));
+ views.add( "Missions" , new JScrollPane(missionTable) );
views.add( "Game" , new JScrollPane(new JTable(gameInfo)) );
JTable commandsTable = new JTable(commands);
|
