initial armies defined by map;

ConquerLLC · May 1, 2012 · e46d52e · e46d52e
1 parent 24d689d
commit e46d52e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/Projectfiles/EasyComputerPlayer.m b/Projectfiles/EasyComputerPlayer.m
@@ -31,6 +31,11 @@ -(void)place {
         //pick a random territory
         NSArray* ownedTerritories = [map territoriesForPlayer:self];
         originTerritory = [ownedTerritories objectAtIndex:(int)(arc4random()%[ownedTerritories count])];
+        uint ownedNeighborCount = [[originTerritory neighboringTerritoriesWithOwner:self] count];
+        NSLog(@"There are %d owned neighbors neighboring %@", ownedNeighborCount, originTerritory.name);
+        if(ownedNeighborCount == [[originTerritory neighboringTerritories] count]) {
+            return;
+        }
 
         int armies = ceil(armiesToPlace/5.0f);
         originTerritory.armies+= armies;
@@ -57,8 +62,8 @@ -(void)attack {
         short originSelectAttemptCount = 0;
         while((originTerritory == nil || originTerritory.armies < 2) && originSelectAttemptCount++ < 7) {
             originTerritory = [ownedTerritories objectAtIndex:(int)(arc4random()%[ownedTerritories count])];
-            uint ownedNeighborCount = [[originTerritory neighboringTerritoriesForPlayer:self] count];
-            if(ownedNeighborCount == [[originTerritory neighboringTerritories] count]) {
+            uint attackableNeighborsCount = [[originTerritory neighboringTerritoriesWithoutOwner:self] count];
+            if(attackableNeighborsCount == 0) {
                 originTerritory = nil;
             }
         }
@@ -68,7 +73,7 @@ -(void)attack {
             destinationTerritory = [originTerritory.neighboringTerritories objectAtIndex:(int)(arc4random()%[originTerritory.neighboringTerritories count])];
         }
 
-        if(destinationTerritory.owner == self) {
+        if(destinationTerritory.owner == self || originTerritory == nil || destinationTerritory == nil) {
             return;
         }
 

diff --git a/Projectfiles/Map.h b/Projectfiles/Map.h
@@ -25,6 +25,7 @@
     NSMutableDictionary* locationsWithColor;
 	NSMutableDictionary* territoryWithColor;
     NSDictionary* properties;
+    int initialArmiesPerTerritory;
     int armiesPerTurn;
     int territoriesForAdditionalArmyPerTurn;
 
@@ -47,6 +48,7 @@
 @property (strong, nonatomic) CCNode* HUD;
 
 @property (strong, nonatomic) NSDictionary* properties;
+@property (nonatomic) int initialArmiesPerTerritory;
 @property (nonatomic) int armiesPerTurn;
 @property (nonatomic) int territoriesForAdditionalArmyPerTurn;
 

diff --git a/Projectfiles/Map.m b/Projectfiles/Map.m
@@ -29,6 +29,7 @@ @implementation Map
 @synthesize continents;
 
 @synthesize properties;
+@synthesize initialArmiesPerTerritory;
 @synthesize armiesPerTurn;
 @synthesize territoriesForAdditionalArmyPerTurn;
 
@@ -92,6 +93,7 @@ -(void)initializeMapData {
         exit(1);
     }
 
+    initialArmiesPerTerritory = [(NSString*)([properties objectForKey:@"InitialArmiesPerTerritory"]) intValue];
     armiesPerTurn = [(NSString*)([properties objectForKey:@"ArmiesPerTurn"]) intValue];
     territoriesForAdditionalArmyPerTurn = [(NSString*)([properties objectForKey:@"TerritoriesForAdditionalArmyPerTurn"]) intValue];
     NSLog(@"Armies per turn: %d", armiesPerTurn);

diff --git a/Projectfiles/Resources/Maps/Conquer/Properties.json b/Projectfiles/Resources/Maps/Conquer/Properties.json
@@ -1,4 +1,5 @@
 {
+    "InitialArmiesPerTerritory": 4,
     "ArmiesPerTurn": 3,
     "TerritoriesForAdditionalArmyPerTurn": 3,
     "Continents": {

diff --git a/Projectfiles/Territory.h b/Projectfiles/Territory.h
@@ -42,7 +42,8 @@
 -(NSArray*)locations;
 -(NSArray*)borderLocations;
 
--(NSArray*)neighboringTerritoriesForPlayer:(Player*)player;
+-(NSArray*)neighboringTerritoriesWithOwner:(Player*)player;
+-(NSArray*)neighboringTerritoriesWithoutOwner:(Player*)player;
 
 -(BOOL)isNeighborTo:(Territory*)territory;
 

diff --git a/Projectfiles/Territory.m b/Projectfiles/Territory.m
@@ -37,7 +37,7 @@ -(id)initWithColor:(UInt32)theColor name:(NSString*)theName onContinent:(Contine
         labelArmies = [CCLabelTTF labelWithString:@"" fontName:@"Marker Felt" fontSize:24];
         [map.HUD addChild: labelArmies];
 
-        [self setArmies:1];
+        [self setArmies:map.initialArmiesPerTerritory];
 
         NSLog(@"Created territory %@ on continent %@", name, continent.name);
 	}
@@ -139,7 +139,17 @@ -(NSArray*)borderLocations {
     return borderLocations;
 }
 
--(NSArray*)neighboringTerritoriesForPlayer:(Player*)player {
+-(NSArray*)neighboringTerritoriesWithOwner:(Player*)player {
+    NSMutableArray* territoriesArray = [[NSMutableArray alloc] init];
+    for(Territory* territory in neighboringTerritories) {
+        if(territory.owner == owner) {
+            [territoriesArray addObject:territory];
+        }
+    }
+    return territoriesArray;
+}
+
+-(NSArray*)neighboringTerritoriesWithoutOwner:(Player*)player {
     NSMutableArray* territoriesArray = [[NSMutableArray alloc] init];
     for(Territory* territory in neighboringTerritories) {
         if(territory.owner != owner) {