# HG changeset patch # User Jens Alfke # Date 1205705207 25200 # Node ID 428a194e3e59ed2afb59af89f58b36802c53e9ad # Parent af9b2b929b037e11892ad2b104ec4ca053ac80eb Game class now tracks board state and moves, as strings, and can step through its history. Fixed another bug in Go (you could drag your captured stones back to the board!) diff -r af9b2b929b03 -r 428a194e3e59 English.lproj/MainMenu.nib/designable.nib --- a/English.lproj/MainMenu.nib/designable.nib Wed Mar 12 15:51:32 2008 -0700 +++ b/English.lproj/MainMenu.nib/designable.nib Sun Mar 16 15:06:47 2008 -0700 @@ -1,31 +1,31 @@ - + 0 - 9B18 - 629 - 949 - 343.00 + 9C31 + 644 + 949.26 + 352.00

0 - ../../GeekGameBoard.xcodeproj + ../GeekGameBoard.xcodeproj 3 -

diff -r af9b2b929b03 -r 428a194e3e59 English.lproj/MainMenu.nib/keyedobjects.nib Binary file English.lproj/MainMenu.nib/keyedobjects.nib has changed diff -r af9b2b929b03 -r 428a194e3e59 Source/Bit.m --- a/Source/Bit.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/Bit.m Sun Mar 16 15:06:47 2008 -0700 @@ -35,11 +35,26 @@ return clone; } +- (void) dealloc +{ + [super dealloc]; +} + + @synthesize owner=_owner; - (BOOL) isFriendly {return _owner.friendly;} - (BOOL) isUnfriendly {return _owner.unfriendly;} +/* +- (NSString*) identifier +{ + if( _identifier ) + return _identifier; + // Defaults to just identifying the owner: + return [NSString stringWithFormat: @"p%i", _owner.index+1]; +} +*/ - (CGFloat) scale { diff -r af9b2b929b03 -r 428a194e3e59 Source/BitHolder.m --- a/Source/BitHolder.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/BitHolder.m Sun Mar 16 15:06:47 2008 -0700 @@ -46,8 +46,12 @@ - (void) setBit: (Bit*)bit { if( bit != self.bit ) { - if( bit && _bit ) - [_bit destroy]; + if( _bit ) { + if( bit ) + [_bit destroy]; + else + [_bit removeFromSuperlayer]; + } setObj(&_bit,bit); ChangeSuperlayer(bit,self,-1); } diff -r af9b2b929b03 -r 428a194e3e59 Source/CheckersGame.h --- a/Source/CheckersGame.h Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/CheckersGame.h Sun Mar 16 15:06:47 2008 -0700 @@ -29,13 +29,8 @@ @interface CheckersGame : Game { int _numPieces[2]; + Grid *_grid; + NSMutableArray *_cells; } -// For subclasses (See HexchequerGame): -- (void) addPieces: (NSString*)imageName - toGrid: (Grid*)grid - forPlayer: (int)playerNum - rows: (NSRange)rows - alternating: (BOOL)alternating; - @end diff -r af9b2b929b03 -r 428a194e3e59 Source/CheckersGame.m --- a/Source/CheckersGame.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/CheckersGame.m Sun Mar 16 15:06:47 2008 -0700 @@ -30,46 +30,34 @@ @implementation CheckersGame -- (void) addPieces: (NSString*)imageName - toGrid: (Grid*)grid - forPlayer: (int)playerNum - rows: (NSRange)rows - alternating: (BOOL)alternating +- (Piece*) pieceForPlayer: (int)playerNum { - Piece *prototype = [[Piece alloc] initWithImageNamed: imageName scale: floor(grid.spacing.width * 0.8)]; - prototype.owner = [self.players objectAtIndex: playerNum]; - unsigned cols=grid.columns; - for( unsigned row=rows.location; row)srcHolder to: (id)dstHolder { @@ -101,8 +133,12 @@ { Square *src=(Square*)srcHolder, *dst=(Square*)dstHolder; int playerIndex = self.currentPlayer.index; + + if( self.currentMove.length==0 ) + [self.currentMove appendString: src.name]; + [self.currentMove appendString: dst.name]; + BOOL isKing = ([bit valueForKey: @"King"] != nil); - PlaySound(isKing ?@"Funk" :@"Tink"); // "King" a piece that made it to the last row: @@ -154,4 +190,22 @@ } +- (BOOL) applyMoveString: (NSString*)move +{ + int length = move.length; + if( length<4 || (length&1) ) + return NO; + GridCell *src = nil; + for( int i=0; i 0 ) + if( ! [self animateMoveFrom: src to: dst] ) + return NO; + src = dst; + } + return YES; +} + + @end diff -r af9b2b929b03 -r 428a194e3e59 Source/DemoBoardView.h --- a/Source/DemoBoardView.h Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/DemoBoardView.h Sun Mar 16 15:06:47 2008 -0700 @@ -28,6 +28,7 @@ @interface DemoBoardView : BoardView { CATextLayer *_headline; + IBOutlet NSSlider *_turnSlider; } - (IBAction) startGameFromMenu: (id)sender; diff -r af9b2b929b03 -r 428a194e3e59 Source/DemoBoardView.m --- a/Source/DemoBoardView.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/DemoBoardView.m Sun Mar 16 15:06:47 2008 -0700 @@ -43,7 +43,7 @@ @"TicTacToeGame", @"GoGame"}; /** Class name of the current game. */ -static NSString* sCurrentGameName = @"KlondikeGame"; +static NSString* sCurrentGameName = @"CheckersGame"; - (void) startGameNamed: (NSString*)gameClassName @@ -89,6 +89,8 @@ alignment: kCALayerWidthSizable | kCALayerMinYMargin]; [self startGameNamed: sCurrentGameName]; + + [_turnSlider bind: @"value" toObject: self withKeyPath: @"game.currentTurn" options: nil]; } @@ -106,6 +108,10 @@ { Game *game = self.game; if( object == game ) { + NSLog(@"maxTurn = %u, currentTurn=%u", self.game.maxTurn,self.game.currentTurn); + _turnSlider.maxValue = self.game.maxTurn; + _turnSlider.numberOfTickMarks = self.game.maxTurn+1; + Player *p = game.winner; NSString *msg; if( p ) { @@ -114,6 +120,7 @@ } else { p = game.currentPlayer; msg = @"Your turn, %@"; + NSLog(@"Game state = '%@'", self.game.stateString); } _headline.string = [NSString stringWithFormat: msg, p.name]; } diff -r af9b2b929b03 -r 428a194e3e59 Source/GGBLayer.h --- a/Source/GGBLayer.h Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/GGBLayer.h Sun Mar 16 15:06:47 2008 -0700 @@ -14,18 +14,24 @@ @interface GGBLayer : CALayer +{ + CABasicAnimation *_curAnimation; -#if TARGET_OS_ASPEN +#if ! TARGET_OS_ASPEN +} +#else // For some reason, the CALayer class on iPhone OS doesn't have these! -{ CGFloat _cornerRadius, _borderWidth; CGColorRef _borderColor, _realBGColor; unsigned int _autoresizingMask; } + @property CGFloat cornerRadius, borderWidth; @property CGColorRef borderColor; #endif - (void) redisplayAll; +- (void) animateAndBlock: (NSString*)keyPath from: (id)from to: (id)to duration: (NSTimeInterval)duration; + @end diff -r af9b2b929b03 -r 428a194e3e59 Source/GGBLayer.m --- a/Source/GGBLayer.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/GGBLayer.m Sun Mar 16 15:06:47 2008 -0700 @@ -30,6 +30,43 @@ } +/* +- (void)addAnimation:(CAAnimation *)anim forKey:(NSString *)key +{ + NSLog(@"%@[%p] addAnimation: %p forKey: %@",[self class],self,anim,key); + [super addAnimation: anim forKey: key]; +} +*/ + + +- (void) animateAndBlock: (NSString*)keyPath from: (id)from to: (id)to duration: (NSTimeInterval)duration +{ + //WARNING: This code works, but is a mess. I hope to find a better way to do this. --Jens 3/16/08 + CABasicAnimation *anim = [CABasicAnimation animationWithKeyPath: keyPath]; + anim.duration= duration; + anim.fromValue = from; + anim.toValue = to; + anim.isRemovedOnCompletion = YES; + anim.delegate = self; + [self addAnimation:anim forKey: @"animateAndBlock:"]; + _curAnimation = (id)[self animationForKey: @"animateAndBlock:"]; + [self setValue: to forKeyPath: keyPath]; // animation doesn't update the property value + + // Now wait for it to finish: + while( _curAnimation ) { + [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode//NSEventTrackingRunLoopMode + beforeDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]]; + } +} + +- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag +{ + if( anim==_curAnimation ) { + _curAnimation = nil; + } +} + + #if TARGET_OS_ASPEN #pragma mark - diff -r af9b2b929b03 -r 428a194e3e59 Source/GGBUtils.h --- a/Source/GGBUtils.h Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/GGBUtils.h Sun Mar 16 15:06:47 2008 -0700 @@ -30,5 +30,6 @@ void setObjCopy( id *variable, id newValue ); +void PreloadSound( NSString* name ); void PlaySound( NSString* name ); void Beep( void ); \ No newline at end of file diff -r af9b2b929b03 -r 428a194e3e59 Source/GGBUtils.m --- a/Source/GGBUtils.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/GGBUtils.m Sun Mar 16 15:06:47 2008 -0700 @@ -42,6 +42,17 @@ } +void PreloadSound( NSString* name ) +{ +#if ! TARGET_OS_ASPEN + NSSound *sound = [[NSSound soundNamed: @"Pop"] copy]; + sound.volume = 0; + [sound play]; + [sound release]; +#endif +} + + void PlaySound( NSString* name ) { #if TARGET_OS_ASPEN diff -r af9b2b929b03 -r 428a194e3e59 Source/Game.h --- a/Source/Game.h Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/Game.h Sun Mar 16 15:06:47 2008 -0700 @@ -20,7 +20,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -@class GGBLayer, Bit, Player; +@class GGBLayer, Bit, BitHolder, Player; @protocol BitHolder; @@ -30,6 +30,9 @@ GGBLayer *_board; NSArray *_players; Player *_currentPlayer, *_winner; + NSMutableString *_currentMove; + NSMutableArray *_states, *_moves; + unsigned _currentTurn; } /** Returns the human-readable name of this game. @@ -41,6 +44,13 @@ @property (readonly, copy) NSArray *players; @property (readonly) Player *currentPlayer, *winner; +@property (readonly) NSArray *states, *moves; +@property (readonly) unsigned maxTurn; +@property unsigned currentTurn; +@property (readonly) BOOL isLatestTurn; + +- (BOOL) animateMoveFrom: (BitHolder*)src to: (BitHolder*)dst; + // Methods for subclasses to implement: @@ -48,6 +58,7 @@ it should add the necessary Grids, Pieces, Cards, Decks etc. to the board. */ - (id) initWithBoard: (GGBLayer*)board; + /** Should return YES if it is legal for the given bit to be moved from its current holder. Default implementation always returns YES. */ - (BOOL) canBit: (Bit*)bit moveFrom: (id)src; @@ -56,6 +67,7 @@ Default implementation always returns YES. */ - (BOOL) canBit: (Bit*)bit moveFrom: (id)src to: (id)dst; + /** Should handle any side effects of a Bit's movement, such as captures or scoring. Does not need to do the actual movement! That's already happened. It should end by calling -endTurn, if the player's turn is over. @@ -76,11 +88,18 @@ - (Player*) checkForWinner; +@property (copy) NSString* stateString; +- (BOOL) applyMoveString: (NSString*)move; + + // Protected methods for subclasses to call: /** Sets the number of players in the game. Subclass initializers should call this. */ - (void) setNumberOfPlayers: (unsigned)n; +/** The current move in progress. Append text to it as the user makes moves. */ +@property (readonly) NSMutableString* currentMove; + /** Advance to the next player, when a turn is over. */ - (void) nextPlayer; diff -r af9b2b929b03 -r 428a194e3e59 Source/Game.m --- a/Source/Game.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/Game.m Sun Mar 16 15:06:47 2008 -0700 @@ -22,6 +22,8 @@ */ #import "Game.h" #import "Bit.h" +#import "BitHolder.h" +#import "QuartzUtils.h" @interface Game () @@ -46,6 +48,9 @@ { self = [super init]; if (self != nil) { + _states = [[NSMutableArray alloc] init]; + _moves = [[NSMutableArray alloc] init]; + _currentMove = [[NSMutableString alloc] init]; _board = [board retain]; // Store a pointer to myself as the value of the "Game" property // of my root layer. (CALayers can have arbitrary KV properties stored into them.) @@ -60,11 +65,15 @@ { [_board release]; [_players release]; + [_currentMove release]; + [_states release]; + [_moves release]; [super dealloc]; } -@synthesize players=_players, currentPlayer=_currentPlayer, winner=_winner; +@synthesize players=_players, currentPlayer=_currentPlayer, winner=_winner, + currentMove=_currentMove, states=_states, moves=_moves; - (void) setNumberOfPlayers: (unsigned)n @@ -82,13 +91,35 @@ } +- (void) addToMove: (NSString*)str; +{ + [_currentMove appendString: str]; +} + + +- (BOOL) _rememberState +{ + if( self.isLatestTurn ) { + [_states addObject: self.stateString]; + return YES; + } else + return NO; +} + + - (void) nextPlayer { + BOOL latestTurn = [self _rememberState]; if( ! _currentPlayer ) { NSLog(@"*** The %@ Begins! ***", self.class); self.currentPlayer = [_players objectAtIndex: 0]; } else { self.currentPlayer = _currentPlayer.nextPlayer; + if( latestTurn ) { + [self willChangeValueForKey: @"currentTurn"]; + _currentTurn++; + [self didChangeValueForKey: @"currentTurn"]; + } } NSLog(@"Current player is %@",_currentPlayer); } @@ -96,16 +127,88 @@ - (void) endTurn { - NSLog(@"--- End of turn"); + NSLog(@"--- End of turn (move was '%@')", _currentMove); + if( self.isLatestTurn ) { + [self willChangeValueForKey: @"maxTurn"]; + [_moves addObject: [[_currentMove copy] autorelease]]; + [_currentMove setString: @""]; + [self didChangeValueForKey: @"maxTurn"]; + } + Player *winner = [self checkForWinner]; if( winner ) { NSLog(@"*** The %@ Ends! The winner is %@ ! ***", self.class, winner); + [self _rememberState]; self.winner = winner; } else [self nextPlayer]; } +- (unsigned) maxTurn +{ + return _moves.count; +} + +- (unsigned) currentTurn +{ + return _currentTurn; +} + +- (void) setCurrentTurn: (unsigned)turn +{ + NSParameterAssert(turn<=self.maxTurn); + if( turn != _currentTurn ) { + if( turn==_currentTurn+1 ) { + [self applyMoveString: [_moves objectAtIndex: _currentTurn]]; + } else { + [CATransaction begin]; + [CATransaction setValue:(id)kCFBooleanTrue + forKey:kCATransactionDisableActions]; + self.stateString = [_states objectAtIndex: turn]; + [CATransaction commit]; + } + _currentTurn = turn; + self.currentPlayer = [_players objectAtIndex: (turn % _players.count)]; + } +} + + +- (BOOL) isLatestTurn +{ + return _currentTurn == MAX(_states.count,1)-1; +} + + +- (BOOL) animateMoveFrom: (BitHolder*)src to: (BitHolder*)dst +{ + if( src==nil || dst==nil || dst==src ) + return NO; + Bit *bit = [src canDragBit: src.bit]; + if( ! bit || ! [dst canDropBit: bit atPoint: GetCGRectCenter(dst.bounds)] + || ! [self canBit: bit moveFrom: src to: dst] ) + return NO; + + ChangeSuperlayer(bit, _board.superlayer, -1); + bit.pickedUp = YES; + dst.highlighted = YES; + [bit performSelector: @selector(setPickedUp:) withObject:nil afterDelay: 0.15]; + CGPoint endPosition = [dst convertPoint: GetCGRectCenter(dst.bounds) toLayer: bit.superlayer]; + [bit animateAndBlock: @"position" + from: [NSValue valueWithPoint: NSPointFromCGPoint(bit.position)] + to: [NSValue valueWithPoint: NSPointFromCGPoint(endPosition)] + duration: 0.25]; + dst.bit = bit; + dst.highlighted = NO; + bit.pickedUp = NO; + + [src draggedBit: bit to: dst]; + [self bit: bit movedFrom: src to: dst]; + src = dst; + return YES; +} + + #pragma mark - #pragma mark GAMEPLAY METHODS TO BE OVERRIDDEN: @@ -148,6 +251,11 @@ } +- (NSString*) stateString {return @"";} +- (void) setStateString: (NSString*)s { } + +- (BOOL) applyMoveString: (NSString*)move {return NO;} + @end diff -r af9b2b929b03 -r 428a194e3e59 Source/GoGame.m --- a/Source/GoGame.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/GoGame.m Sun Mar 16 15:06:47 2008 -0700 @@ -87,6 +87,7 @@ [_captured[1] release]; [self nextPlayer]; + PreloadSound(@"Pop"); } return self; } @@ -104,9 +105,15 @@ } +- (BOOL) canBit: (Bit*)bit moveFrom: (id)srcHolder +{ + return (srcHolder==nil); +} + + - (BOOL) canBit: (Bit*)bit moveFrom: (id)srcHolder to: (id)dstHolder { - if( ! [dstHolder isKindOfClass: [Square class]] ) + if( srcHolder!=nil || ! [dstHolder isKindOfClass: [Square class]] ) return NO; Square *dst=(Square*)dstHolder; diff -r af9b2b929b03 -r 428a194e3e59 Source/Grid.h --- a/Source/Grid.h Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/Grid.h Sun Mar 16 15:06:47 2008 -0700 @@ -67,6 +67,7 @@ /** Removes a particular cell, leaving a blank space. */ - (void) removeCellAtRow: (unsigned)row column: (unsigned)col; +- (GridCell*) cellWithName: (NSString*)identifier; // protected: - (GridCell*) createCellAtRow: (unsigned)row column: (unsigned)col diff -r af9b2b929b03 -r 428a194e3e59 Source/Grid.m --- a/Source/Grid.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/Grid.m Sun Mar 16 15:06:47 2008 -0700 @@ -124,10 +124,11 @@ - (GridCell*) createCellAtRow: (unsigned)row column: (unsigned)col suggestedFrame: (CGRect)frame { - return [[[_cellClass alloc] initWithGrid: self + GridCell *cell = [[_cellClass alloc] initWithGrid: self row: row column: col - frame: frame] - autorelease]; + frame: frame]; + cell.name = [NSString stringWithFormat: @"%c%u", ('A'+row),col]; + return [cell autorelease]; } @@ -172,6 +173,16 @@ } +- (GridCell*) cellWithName: (NSString*)name +{ + for( CALayer *layer in self.sublayers ) + if( [layer isKindOfClass: [GridCell class]] ) + if( [name isEqualToString: ((GridCell*)layer).name] ) + return (GridCell*)layer; + return nil; +} + + #pragma mark - #pragma mark DRAWING: diff -r af9b2b929b03 -r 428a194e3e59 Source/HexchequerGame.m --- a/Source/HexchequerGame.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/HexchequerGame.m Sun Mar 16 15:06:47 2008 -0700 @@ -32,18 +32,31 @@ - (Grid*) x_makeGrid { - HexGrid *grid = [[[HexGrid alloc] initWithRows: 9 columns: 9 frame: _board.bounds] autorelease]; + HexGrid *grid = [[HexGrid alloc] initWithRows: 9 columns: 9 frame: _board.bounds]; + _grid = grid; CGPoint pos = grid.position; pos.x = floor((_board.bounds.size.width-grid.frame.size.width)/2); grid.position = pos; - [grid addCellsInHexagon]; grid.allowsMoves = YES; grid.allowsCaptures = NO; // no land-on captures, that is grid.cellColor = CreateGray(1.0, 0.25); grid.lineColor = kTranslucentLightGrayColor; - [self addPieces: @"Green Ball.png" toGrid: grid forPlayer: 0 rows: NSMakeRange(0,2) alternating: NO]; - [self addPieces: @"Red Ball.png" toGrid: grid forPlayer: 1 rows: NSMakeRange(7,2) alternating: NO]; + [grid addCellsInHexagon]; + for( int y=0; y<9; y++ ) { + for( int x=0; x<9; x++ ) { + GridCell *cell = [_grid cellAtRow: y column: x]; + if( cell ) + [_cells addObject: cell]; + } + } + self.stateString = @"111111111111111111-------------------------222222222222222222"; + + [self performSelector: @selector(applyMoveString:) withObject: @"C4D4" afterDelay: 2.0]; + [self performSelector: @selector(applyMoveString:) withObject: @"G3F3" afterDelay: 5.0]; + [self performSelector: @selector(applyMoveString:) withObject: @"D4E4" afterDelay: 8.0]; + [self performSelector: @selector(applyMoveString:) withObject: @"F3D4" afterDelay: 11.0]; + return grid; } @@ -64,8 +77,12 @@ { Hex *src=(Hex*)srcHolder, *dst=(Hex*)dstHolder; int playerIndex = self.currentPlayer.index; - BOOL isKing = ([bit valueForKey: @"King"] != nil); + + if( self.currentMove.length==0 ) + [self.currentMove appendString: src.name]; + [self.currentMove appendString: dst.name]; + BOOL isKing = ([bit valueForKey: @"King"] != nil); PlaySound(isKing ?@"Funk" :@"Tink"); // "King" a piece that made it to the last row: diff -r af9b2b929b03 -r 428a194e3e59 Source/QuartzUtils.m --- a/Source/QuartzUtils.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/QuartzUtils.m Sun Mar 16 15:06:47 2008 -0700 @@ -76,11 +76,11 @@ pos = [newSuperlayer convertPoint: pos fromLayer: layer.superlayer]; [layer retain]; [layer removeFromSuperlayer]; + layer.position = pos; if( index >= 0 ) [newSuperlayer insertSublayer: layer atIndex: index]; else [newSuperlayer addSublayer: layer]; - layer.position = pos; [layer release]; [CATransaction commit]; diff -r af9b2b929b03 -r 428a194e3e59 Source/TicTacToeGame.m --- a/Source/TicTacToeGame.m Wed Mar 12 15:51:32 2008 -0700 +++ b/Source/TicTacToeGame.m Sun Mar 16 15:06:47 2008 -0700 @@ -29,21 +29,13 @@ @implementation TicTacToeGame -- (void) x_createDispenser: (NSString*)imageName forPlayer: (int)playerNumber +- (Piece*) pieceForPlayer: (int)playerNumber { - Piece *p = [[Piece alloc] initWithImageNamed: imageName scale: 80]; + Piece *p = [[Piece alloc] initWithImageNamed: (playerNumber ? @"O.tiff" :@"X.tiff") + scale: 80]; p.owner = [self.players objectAtIndex: playerNumber]; - CGFloat x = floor(CGRectGetMidX(_board.bounds)); -#if TARGET_OS_ASPEN - x = x - 80 + 160*playerNumber; - CGFloat y = 360; -#else - x += (playerNumber==0 ?-230 :230); - CGFloat y = 175; -#endif - _dispenser[playerNumber] = [[Dispenser alloc] initWithPrototype: p quantity: 0 - frame: CGRectMake(x-45,y-45, 90,90)]; - [_board addSublayer: _dispenser[playerNumber]]; + p.name = (playerNumber ?@"O" :@"X"); + return [p autorelease]; } - (id) initWithBoard: (GGBLayer*)board @@ -62,8 +54,20 @@ [board addSublayer: _grid]; // Create piece dispensers for the two players: - [self x_createDispenser: @"X.tiff" forPlayer: 0]; - [self x_createDispenser: @"O.tiff" forPlayer: 1]; + for( int playerNumber=0; playerNumber<=1; playerNumber++ ) { + Piece *p = [self pieceForPlayer: playerNumber]; + CGFloat x = floor(CGRectGetMidX(_board.bounds)); +#if TARGET_OS_ASPEN + x = x - 80 + 160*playerNumber; + CGFloat y = 360; +#else + x += (playerNumber==0 ?-230 :230); + CGFloat y = 175; +#endif + _dispenser[playerNumber] = [[Dispenser alloc] initWithPrototype: p quantity: 0 + frame: CGRectMake(x-45,y-45, 90,90)]; + [_board addSublayer: _dispenser[playerNumber]]; + } // And they're off! [self nextPlayer]; @@ -71,6 +75,34 @@ return self; } + +- (NSString*) stateString +{ + unichar str[10]; + for( int i=0; i<9; i++ ) { + NSString *ident = [_grid cellAtRow: i/3 column: i%3].bit.name; + if( ident==nil ) + str[i] = '-'; + else + str[i] = [ident characterAtIndex: 0]; + } + return [NSString stringWithCharacters: str length: 9]; +} + +- (void) setStateString: (NSString*)stateString +{ + for( int i=0; i<9; i++ ) { + Piece *piece; + switch( [stateString characterAtIndex: i] ) { + case 'X': case 'x': piece = [self pieceForPlayer: 0]; break; + case 'O': case 'o': piece = [self pieceForPlayer: 1]; break; + default: piece = nil; break; + } + [_grid cellAtRow: i/3 column: i%3].bit = piece; + } +} + + - (Bit*) bitToPlaceInHolder: (id)holder { if( holder.bit==nil && [holder isKindOfClass: [Square class]] ) @@ -79,6 +111,15 @@ return nil; } + +- (void) bit: (Bit*)bit movedFrom: (id)src to: (id)dst +{ + Square *square = (Square*)dst; + int squareIndex = 3*square.row + square.column; + [self.currentMove appendFormat: @"%@%i", bit.name, squareIndex]; + [super bit: bit movedFrom: src to: dst]; +} + - (void) nextPlayer { [super nextPlayer];