Menu
▾
▴
[Freecol-commits] SF.net SVN: freecol:[6821] freecol/trunk
|
From: <mp...@us...> - 2010-04-30 12:00:23
|
Revision: 6821
http://freecol.svn.sourceforge.net/freecol/?rev=6821&view=rev
Author: mpope
Date: 2010-04-30 12:00:17 +0000 (Fri, 30 Apr 2010)
Log Message:
-----------
Begin moving stance changes into the server.
Modified Paths:
--------------
freecol/trunk/src/net/sf/freecol/server/control/InGameController.java
freecol/trunk/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java
freecol/trunk/test/src/net/sf/freecol/common/model/CombatTest.java
freecol/trunk/test/src/net/sf/freecol/common/model/MapTest.java
freecol/trunk/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java
freecol/trunk/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java
freecol/trunk/test/src/net/sf/freecol/server/control/InGameControllerTest.java
Modified: freecol/trunk/src/net/sf/freecol/server/control/InGameController.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/control/InGameController.java 2010-04-30 11:55:25 UTC (rev 6820)
+++ freecol/trunk/src/net/sf/freecol/server/control/InGameController.java 2010-04-30 12:00:17 UTC (rev 6821)
@@ -3325,6 +3325,7 @@
nativePlayer.modifyGold(gold);
addAttribute(objects, "gold", Integer.toString(gold));
addPartial(objects, serverPlayer, "gold");
+ // TODO: remove magic numbers, stance into update
nativePlayer.changeRelationWithPlayer(enemy, Stance.WAR);
settlement.modifyAlarm(enemy, 1000); // Let propagation work.
enemy.modifyTension(nativePlayer, 500);
Modified: freecol/trunk/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java 2010-04-30 11:55:25 UTC (rev 6820)
+++ freecol/trunk/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java 2010-04-30 12:00:17 UTC (rev 6821)
@@ -221,7 +221,8 @@
// Set players at war
Player indianPlayer = settlement.getOwner();
- indianPlayer.changeRelationWithPlayer(galleon.getOwner(), Stance.WAR);
+ indianPlayer.setStance(galleon.getOwner(), Stance.WAR);
+ galleon.getOwner().setStance(indianPlayer, Stance.WAR);
cost = base.getCost(galleon, unitTile, settlementTile, 4,4);
assertTrue("Move should be invalid, players at war",
cost == CostDecider.ILLEGAL_MOVE);
Modified: freecol/trunk/test/src/net/sf/freecol/common/model/CombatTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/common/model/CombatTest.java 2010-04-30 11:55:25 UTC (rev 6820)
+++ freecol/trunk/test/src/net/sf/freecol/common/model/CombatTest.java 2010-04-30 12:00:17 UTC (rev 6821)
@@ -536,7 +536,8 @@
Player dutch = game.getPlayer("model.nation.dutch");
Player inca = game.getPlayer("model.nation.inca");
- dutch.changeRelationWithPlayer(inca, Stance.WAR);
+ dutch.setStance(inca, Stance.WAR);
+ inca.setStance(dutch, Stance.WAR);
Tile tile2 = map.getTile(4, 8);
tile2.setExploredBy(dutch, true);
Modified: freecol/trunk/test/src/net/sf/freecol/common/model/MapTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/common/model/MapTest.java 2010-04-30 11:55:25 UTC (rev 6820)
+++ freecol/trunk/test/src/net/sf/freecol/common/model/MapTest.java 2010-04-30 12:00:17 UTC (rev 6821)
@@ -411,7 +411,8 @@
.build();
assertTrue("French colony not on the map",
colonyTile.getSettlement() != null);
- dutchPlayer.changeRelationWithPlayer(frenchPlayer, Stance.WAR);
+ dutchPlayer.setStance(frenchPlayer, Stance.WAR);
+ frenchPlayer.setStance(dutchPlayer, Stance.WAR);
// Test a GoalDecider with subgoals.
// The scoring function is deliberately simple.
Modified: freecol/trunk/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java 2010-04-30 11:55:25 UTC (rev 6820)
+++ freecol/trunk/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java 2010-04-30 12:00:17 UTC (rev 6821)
@@ -121,7 +121,8 @@
assertTrue("Cannot attack own unit", aiPlayer1.getUnitSeekAndDestroyMissionValue(soldier, friendlyColonist.getTile(), turnsToReach) == MISSION_IMPOSSIBLE);
assertTrue("Players are not at war", aiPlayer1.getUnitSeekAndDestroyMissionValue(soldier, enemyColonist.getTile(), turnsToReach) == MISSION_IMPOSSIBLE);
- player1.changeRelationWithPlayer(player2, Stance.WAR);
+ player1.setStance(player2, Stance.WAR);
+ player2.setStance(player1, Stance.WAR);
assertFalse("Unit should be able to attack land unit", aiPlayer1.getUnitSeekAndDestroyMissionValue(soldier, enemyColonist.getTile(), turnsToReach) == MISSION_IMPOSSIBLE);
assertTrue("Land unit cannot attack naval unit", aiPlayer1.getUnitSeekAndDestroyMissionValue(soldier, enemyGalleon.getTile(), turnsToReach) == MISSION_IMPOSSIBLE);
@@ -169,7 +170,8 @@
incaPlayer.setTension(dutchPlayer, new Tension(Tension.Level.HATEFUL.getLimit()));
assertTrue("Target should be valid for UnitSeekAndDestroyMission", aiInca.isTargetValidForSeekAndDestroy(brave, soldier));
- incaPlayer.changeRelationWithPlayer(dutchPlayer, Stance.WAR);
+ incaPlayer.setStance(dutchPlayer, Stance.WAR);
+ dutchPlayer.setStance(incaPlayer, Stance.WAR);
assertTrue("Target should be valid for UnitSeekAndDestroyMission", aiInca.isTargetValidForSeekAndDestroy(brave, soldier));
}
@@ -225,7 +227,8 @@
assertTrue("No hostile units are present, should be UnitWanderHostileMission", isUnitWanderHostileMission);
// Make unit hostile by changing stance to War,reassign mission and check
- player1.changeRelationWithPlayer(player2, Stance.WAR);
+ player1.setStance(player2, Stance.WAR);
+ player2.setStance(player1, Stance.WAR);
aiPlayer1.giveMilitaryMission(aiUnit);
isUnitWanderHostileMission = aiUnit.getMission() instanceof UnitWanderHostileMission;
Modified: freecol/trunk/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java 2010-04-30 11:55:25 UTC (rev 6820)
+++ freecol/trunk/test/src/net/sf/freecol/server/ai/mission/UnitSeekAndDestroyMissionTest.java 2010-04-30 12:00:17 UTC (rev 6821)
@@ -91,7 +91,8 @@
Unit defender = new Unit(game, tile2, player2, veteranType, UnitState.ACTIVE);
defender.equipWith(muskets, true);
- player1.changeRelationWithPlayer(player2, Stance.WAR);
+ player1.setStance(player2, Stance.WAR);
+ player2.setStance(player1, Stance.WAR);
UnitSeekAndDestroyMission mission = new UnitSeekAndDestroyMission(aiMain,aiUnit,defender);
aiUnit.setMission(mission);
@@ -131,7 +132,8 @@
Unit defender = new Unit(game, defenderTile, player2, veteranType, UnitState.ACTIVE);
defender.equipWith(muskets, true);
- player1.changeRelationWithPlayer(player2, Stance.WAR);
+ player1.setStance(player2, Stance.WAR);
+ player2.setStance(player1, Stance.WAR);
UnitSeekAndDestroyMission mission = new UnitSeekAndDestroyMission(aiMain,aiUnit,defender);
aiUnit.setMission(mission);
Modified: freecol/trunk/test/src/net/sf/freecol/server/control/InGameControllerTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/server/control/InGameControllerTest.java 2010-04-30 11:55:25 UTC (rev 6820)
+++ freecol/trunk/test/src/net/sf/freecol/server/control/InGameControllerTest.java 2010-04-30 12:00:17 UTC (rev 6821)
@@ -100,16 +100,14 @@
Unit jesuit = new Unit(game, tile, dutchPlayer, missionaryType, UnitState.ACTIVE);
- // set players at war
- indianPlayer.changeRelationWithPlayer(dutchPlayer, Stance.WAR);
+ // set tension to hateful
Tension tension = new Tension(Level.HATEFUL.getLimit());
camp.setAlarm(dutchPlayer, tension);
-
assertEquals("Wrong camp alarm", tension, camp.getAlarm(dutchPlayer));
+
InGameController igc = (InGameController) server.getController();
igc.establishMission((ServerPlayer) dutchPlayer, jesuit, camp);
boolean result = !jesuit.isDisposed();
-
assertFalse("Mission creation should have failed",result);
assertNull("Indian settlement should not have a mission",camp.getMissionary());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
