Menu
▾
▴
macattrick-commit — Every CVS commit will be sent to macattrick-commit.
You can subscribe to this list here.
| 2005 |
Jan
(13) |
Feb
(37) |
Mar
(12) |
Apr
(15) |
May
(46) |
Jun
(40) |
Jul
(27) |
Aug
|
Sep
(35) |
Oct
(15) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16404/Test Modified Files: AllTests.m LineUpTreeLayerTest.m LineUpTreeNodeTest.m LineUpTreeTest.m PlayerTest.m PositionTest.m Added Files: PositionHeapTest.h PositionHeapTest.m Log Message: PositionHeap introduced, export function started Index: PlayerTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerTest.m,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PlayerTest.m 24 Jan 2005 20:20:42 -0000 1.14 --- PlayerTest.m 7 Feb 2005 21:16:29 -0000 1.15 *************** *** 31,34 **** --- 31,35 ---- #import "PlayerList.h" #import "AllTests.h" + #import "PositionHeap.h" @implementation PlayerTest *************** *** 103,107 **** -(void) testBestPosition { ! [self assertTrue:[[walter bestPosition] isEqual:[Position positionWithIdentifier:@"Winger Offensive"]]]; } --- 104,108 ---- -(void) testBestPosition { ! [self assertTrue:[[walter bestPosition] isEqual:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger Offensive"]]]; } Index: AllTests.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/AllTests.m,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** AllTests.m 10 Jan 2005 21:44:05 -0000 1.18 --- AllTests.m 7 Feb 2005 21:16:28 -0000 1.19 *************** *** 36,39 **** --- 36,40 ---- #import "PlayerSortingTest.h" #import "PositionTest.h" + #import "PositionHeapTest.h" #import "TeamTest.h" #import "HattrickOrgTest.h" *************** *** 68,71 **** --- 69,73 ---- [self addTest:[TestSuite suiteWithClass:[PlayerSortingTest class]]]; [self addTest:[TestSuite suiteWithClass:[PositionTest class]]]; + [self addTest:[TestSuite suiteWithClass:[PositionHeapTest class]]]; [self addTest:[TestSuite suiteWithClass:[LineUpTreeNodeTest class]]]; [self addTest:[TestSuite suiteWithClass:[LineUpTreeLayerTest class]]]; Index: LineUpTreeLayerTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeLayerTest.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LineUpTreeLayerTest.m 24 Jan 2005 20:20:40 -0000 1.4 --- LineUpTreeLayerTest.m 7 Feb 2005 21:16:28 -0000 1.5 *************** *** 28,32 **** #import "LineUpTreeLayerTest.h" ! @implementation LineUpTreeLayerTest --- 28,32 ---- #import "LineUpTreeLayerTest.h" ! #import "PositionHeap.h" @implementation LineUpTreeLayerTest *************** *** 55,61 **** [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [Position positionWithIdentifier:@"Keeper"]; ! position2 = [Position positionWithIdentifier:@"Inner Midfield"]; ! position3 = [Position positionWithIdentifier:@"Forward"]; rootLayer = [[LineUpTreeLayer alloc] initWithTreshold: 0 position: nil]; LineUpTreeNode *node = [[LineUpTreeNode alloc] initWithPlayer:nil --- 55,61 ---- [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]; ! position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]; ! position3 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"]; rootLayer = [[LineUpTreeLayer alloc] initWithTreshold: 0 position: nil]; LineUpTreeNode *node = [[LineUpTreeNode alloc] initWithPlayer:nil --- NEW FILE: PositionHeapTest.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "PositionHeapTest.h" @implementation PositionHeapTest -(void) testPossiblePositions { NSArray *possiblePositions = [[PositionHeap uniqueInstance] possiblePositions]; [self assertInt:[possiblePositions count] equals:18]; [self assertTrue:[possiblePositions containsObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield Towards Wing"]]]; } @end Index: PositionTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PositionTest.m 6 Feb 2005 19:36:51 -0000 1.8 --- PositionTest.m 7 Feb 2005 21:16:29 -0000 1.9 *************** *** 28,38 **** #import "PositionTest.h" ! @implementation PositionTest - (void) setUp { ! positionKeeper = [Position defaultPositionWithIdentifier:@"Keeper"]; ! positionWinger = [Position defaultPositionWithIdentifier:@"Winger"]; player1 = [[Player alloc] init]; [player1 setStaminaSkill: 6 keeperSkill: 6 --- 28,38 ---- #import "PositionTest.h" ! #import "PositionHeap.h" @implementation PositionTest - (void) setUp { ! positionKeeper = [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Keeper"]; ! positionWinger = [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger"]; player1 = [[Player alloc] init]; [player1 setStaminaSkill: 6 keeperSkill: 6 *************** *** 53,126 **** - (void) testPositionKeeper{ ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Keeper"]] equals: 6 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Keeper"]] equals: 1 precision:0.1]; } - (void) testPositionCentralDefender { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender"]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 3.9 precision:0.1]; } - (void) testPositionWingBack { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback"]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Defensive"]] equals: 1.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Defensive"]] equals: 3.3 precision:0.1]; } - (void) testPositionWingBackOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Offensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Offensive"]] equals: 4.2 precision:0.1]; } - (void) testPositionInnerMidfield { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield"]] equals: 2.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield"]] equals: 6.5 precision:0.1]; } - (void) testPositionInnerMidfieldTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Towards Wing"]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Towards Wing"]] equals: 5.8 precision:0.1]; } - (void) testPositionInnerMidfieldOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Offensive"]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Offensive"]] equals: 6.3 precision:0.1]; } - (void) testPositionInnerMidfieldDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Defensive"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Defensive"]] equals: 6.1 precision:0.1]; } - (void) testPositionWinger { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger"]] equals: 5.3 precision:0.1]; } - (void) testPositionWingerTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Towards Middle"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Towards Middle"]] equals: 5.4 precision:0.1]; } - (void) testPositionWingerOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Offensive"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Offensive"]] equals: 4.9 precision:0.1]; } - (void) testPositionWingerDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Defensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Defensive"]] equals: 4.8 precision:0.1]; } - (void) testPositionForward { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward"]] equals: 4 precision:0.1]; } - (void) testPositionForwardDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward Defensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward Defensive"]] equals: 4.5 precision:0.1]; } - (void) testCopy { --- 53,126 ---- - (void) testPositionKeeper{ ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Keeper"]] equals: 6 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Keeper"]] equals: 1 precision:0.1]; } - (void) testPositionCentralDefender { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender"]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderOffensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 3.9 precision:0.1]; } - (void) testPositionWingBack { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback"]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackDefensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Defensive"]] equals: 1.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Defensive"]] equals: 3.3 precision:0.1]; } - (void) testPositionWingBackOffensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Offensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Wingback Offensive"]] equals: 4.2 precision:0.1]; } - (void) testPositionInnerMidfield { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield"]] equals: 2.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield"]] equals: 6.5 precision:0.1]; } - (void) testPositionInnerMidfieldTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield Towards Wing"]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield Towards Wing"]] equals: 5.8 precision:0.1]; } - (void) testPositionInnerMidfieldOffensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield Offensive"]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield Offensive"]] equals: 6.3 precision:0.1]; } - (void) testPositionInnerMidfieldDefensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield Defensive"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Inner Midfield Defensive"]] equals: 6.1 precision:0.1]; } - (void) testPositionWinger { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger"]] equals: 5.3 precision:0.1]; } - (void) testPositionWingerTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger Towards Middle"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger Towards Middle"]] equals: 5.4 precision:0.1]; } - (void) testPositionWingerOffensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger Offensive"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger Offensive"]] equals: 4.9 precision:0.1]; } - (void) testPositionWingerDefensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger Defensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger Defensive"]] equals: 4.8 precision:0.1]; } - (void) testPositionForward { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Forward"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Forward"]] equals: 4 precision:0.1]; } - (void) testPositionForwardDefensive { ! [self assertFloat:[player1 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Forward Defensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Forward Defensive"]] equals: 4.5 precision:0.1]; } - (void) testCopy { *************** *** 139,152 **** } -(void) testIsEqual { ! [self assertTrue:[positionKeeper isEqual: [Position positionWithIdentifier:@"Keeper"]]]; ! [self assertFalse:[positionKeeper isEqual: [Position positionWithIdentifier:@"Winger"]]]; ! [self assertTrue:[positionWinger isEqual: [Position positionWithIdentifier:@"Winger"]]]; } - -(void) testPossiblePositions { - NSArray *possiblePositions = [Position possiblePositions]; - [self assertInt:[possiblePositions count] equals:18]; - [self assertTrue:[possiblePositions containsObject:[Position positionWithIdentifier:@"Inner Midfield Towards Wing"]]]; - } @end --- 139,147 ---- } -(void) testIsEqual { ! [self assertTrue:[positionKeeper isEqual: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]]]; ! [self assertFalse:[positionKeeper isEqual: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"]]]; ! [self assertTrue:[positionWinger isEqual: [[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"]]]; } @end Index: LineUpTreeNodeTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeNodeTest.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LineUpTreeNodeTest.m 24 Jan 2005 20:20:42 -0000 1.5 --- LineUpTreeNodeTest.m 7 Feb 2005 21:16:28 -0000 1.6 *************** *** 28,32 **** #import "LineUpTreeNodeTest.h" ! --- 28,32 ---- #import "LineUpTreeNodeTest.h" ! #import "PositionHeap.h" *************** *** 55,60 **** [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [Position positionWithIdentifier:@"Keeper"]; ! position2 = [Position positionWithIdentifier:@"Inner Midfield"]; root = [[LineUpTreeNode alloc] initWithPlayer: player1 stillAvailablePlayers: [NSSet setWithObjects:player2, player3, nil] --- 55,60 ---- [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]; ! position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]; root = [[LineUpTreeNode alloc] initWithPlayer: player1 stillAvailablePlayers: [NSSet setWithObjects:player2, player3, nil] --- NEW FILE: PositionHeapTest.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Cocoa/Cocoa.h> #import <ObjcUnit/ObjcUnit.h> #import "PositionHeap.h" @interface PositionHeapTest : TestCase { } @end Index: LineUpTreeTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeTest.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** LineUpTreeTest.m 24 Jan 2005 20:20:42 -0000 1.9 --- LineUpTreeTest.m 7 Feb 2005 21:16:28 -0000 1.10 *************** *** 28,31 **** --- 28,32 ---- #import "LineUpTreeTest.h" + #import "PositionHeap.h" @interface LineUpTreeTest(Private) *************** *** 58,72 **** - (NSArray*) defaultPositions442 { NSMutableArray *positions = [NSMutableArray arrayWithCapacity:11]; ! [positions addObject:[Position positionWithIdentifier:@"Keeper"]]; ! [positions addObject:[Position positionWithIdentifier:@"Central Defender"]]; ! [positions addObject:[Position positionWithIdentifier:@"Central Defender"]]; ! [positions addObject:[Position positionWithIdentifier:@"Wingback"]]; ! [positions addObject:[Position positionWithIdentifier:@"Wingback"]]; ! [positions addObject:[Position positionWithIdentifier:@"Inner Midfield"]]; ! [positions addObject:[Position positionWithIdentifier:@"Inner Midfield"]]; ! [positions addObject:[Position positionWithIdentifier:@"Winger"]]; ! [positions addObject:[Position positionWithIdentifier:@"Winger"]]; ! [positions addObject:[Position positionWithIdentifier:@"Forward"]]; ! [positions addObject:[Position positionWithIdentifier:@"Forward"]]; return positions; } --- 59,73 ---- - (NSArray*) defaultPositions442 { NSMutableArray *positions = [NSMutableArray arrayWithCapacity:11]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Central Defender"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Wingback"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Winger"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"]]; ! [positions addObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Forward"]]; return positions; } |
|
From: Geisschaes <gei...@us...> - 2005-02-06 19:38:23
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26622 Added Files: PercentageTransformer.h PercentageTransformer.m Log Message: Percentage Controller added --- NEW FILE: PercentageTransformer.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Cocoa/Cocoa.h> @interface PercentageTransformer : NSValueTransformer { } + (Class)transformedValueClass; + (BOOL)allowsReverseTransformation; - (id)transformedValue:(id)value; @end --- NEW FILE: PercentageTransformer.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "PercentageTransformer.h" @implementation PercentageTransformer + (Class)transformedValueClass { return [NSNumber class]; } + (BOOL)allowsReverseTransformation { return YES; } - (id)transformedValue:(id)value { if (value == nil) return nil; double inputValue = [value doubleValue]; int result = inputValue * 100; return [NSNumber numberWithInt:result]; } -(id)reverseTransformedValue:(id)value { if (value == nil) return nil; int inputValue = [value intValue]; double result = ((double)inputValue ) / 100; return [NSNumber numberWithDouble:result]; } @end |
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25981 Modified Files: FormulasViewController.h FormulasViewController.m HattrickOrg.m MainController.m Player.m Position.h Position.m PreferencesController.m Log Message: keeper formulas are now correctly integrated, missing defaults and import/export functions Index: Position.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Position.m 24 Jan 2005 20:18:29 -0000 1.7 --- Position.m 6 Feb 2005 19:36:18 -0000 1.8 *************** *** 33,36 **** --- 33,48 ---- @interface Position (Private) + - (void) setPlayerFormRate: (double) newPlayerFormRate; + - (void) setExperienceRate: (double) newExperienceRate; + - (void) setStaminaRate: (double) newStaminaRate; + - (void) setKeeperRate: (double) newKeeperRate; + - (void) setPlaymakingRate: (double) newPlaymakingRate; + - (void) setPassingRate: (double) newPassingRate; + - (void) setWingerRate: (double) newWingerRate; + - (void) setDefenderRate: (double) newDefenderRate; + - (void) setScorerRate: (double) newScorerRate; + - (void) setSetPiecesRate: (double) newSetPiecesRate; + - (void) setTotal: (double) newTotal; + - (void) updateTotal; + (void) loadDefaultPositions; + (void) loadPositions; *************** *** 40,128 **** @implementation Position - /* - + (Position*) positionKeeper { - return [[Position alloc] initWithIdentifier:@"Keeper" staminaRate:0 keeperRate:1 playmakingRate:0 scorerRate:0 - passingRate:0 wingerRate:0 defenderRate:0 setPiecesRate:0]; - } - - + (Position*) positionCentralDefender { - return [[Position alloc] initWithIdentifier:@"Central Defender" staminaRate:0.1 keeperRate:0 playmakingRate:0.02 scorerRate:0 - passingRate:0.15 wingerRate:0 defenderRate:0.75 setPiecesRate:0]; - } - - + (Position*) positionCentralDefenderTowardsWing { - return [[Position alloc] initWithIdentifier:@"Central Defender Towards Wing" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 - passingRate:0.1 wingerRate:0.15 defenderRate:0.65 setPiecesRate:0]; - } - - + (Position*) positionCentralDefenderOffensive { - return [[Position alloc] initWithIdentifier:@"Central Defender Offensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 - passingRate:0.2 wingerRate:0 defenderRate:0.6 setPiecesRate:0]; - } - - + (Position*) positionWingback { - return [[Position alloc] initWithIdentifier:@"Wingback" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 - passingRate:0.1 wingerRate:0.2 defenderRate:0.6 setPiecesRate:0]; - } - + (Position*) positionWingbackTowardsMiddle{ - return [[Position alloc] initWithIdentifier:@"Wingback Towards Middle" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 - passingRate:0.08 wingerRate:0.17 defenderRate:0.65 setPiecesRate:0]; - } - + (Position*) positionWingbackOffensive{ - return [[Position alloc] initWithIdentifier:@"Wingback Offensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 - passingRate:0.2 wingerRate:0.25 defenderRate:0.35 setPiecesRate:0]; - } - + (Position*) positionWingbackDefensive{ - return [[Position alloc] initWithIdentifier:@"Wingback Defensive" staminaRate:0.05 keeperRate:0 playmakingRate:0 scorerRate:0 - passingRate:0.05 wingerRate:0.1 defenderRate:0.8 setPiecesRate:0]; - } - + (Position*) positionInnerMidfield { - return [[Position alloc] initWithIdentifier:@"Inner Midfield" staminaRate:0.25 keeperRate:0 playmakingRate:0.5 scorerRate:0 - passingRate:0.15 wingerRate:0 defenderRate:0.1 setPiecesRate:0]; - } - + (Position*) positionInnerMidfieldTowardsWing { - return [[Position alloc] initWithIdentifier:@"Inner Midfield Towards Wing" staminaRate:0.2 keeperRate:0 playmakingRate:0.35 scorerRate:0 - passingRate:0.15 wingerRate:0.2 defenderRate:0.1 setPiecesRate:0]; - } - + (Position*) positionInnerMidfieldOffensive { - return [[Position alloc] initWithIdentifier:@"Inner Midfield Offensive" staminaRate:0.2 keeperRate:0 playmakingRate:0.5 scorerRate:0 - passingRate:0.25 wingerRate:0 defenderRate:0.05 setPiecesRate:0]; - } - + (Position*) positionInnerMidfieldDefensive { - return [[Position alloc] initWithIdentifier:@"Inner Midfield Defensive" staminaRate:0.15 keeperRate:0 playmakingRate:0.5 scorerRate:0 - passingRate:0.15 wingerRate:0 defenderRate:0.2 setPiecesRate:0]; - } - - - + (Position*) positionWinger { - return [[Position alloc] initWithIdentifier:@"Winger" staminaRate:0.15 keeperRate:0 playmakingRate:0.25 scorerRate:0 - passingRate:0.05 wingerRate:0.5 defenderRate:0.05 setPiecesRate:0]; - } - - + (Position*) positionWingerTowardsMiddle { - return [[Position alloc] initWithIdentifier:@"Winger Towards Middle" staminaRate:0.15 keeperRate:0 playmakingRate:0.3 scorerRate:0 - passingRate:0.1 wingerRate:0.35 defenderRate:0.1 setPiecesRate:0]; - } - - + (Position*) positionWingerOffensive { - return [[Position alloc] initWithIdentifier:@"Winger Offensive" staminaRate:0.15 keeperRate:0 playmakingRate:0.15 scorerRate:0 - passingRate:0.1 wingerRate:0.6 defenderRate:0 setPiecesRate:0]; - } - - + (Position*) positionWingerDefensive { - return [[Position alloc] initWithIdentifier:@"Winger Defensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.2 scorerRate:0 - passingRate:0.1 wingerRate:0.35 defenderRate:0.25 setPiecesRate:0]; - } - - + (Position*) positionForward { - return [[Position alloc] initWithIdentifier:@"Forward" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0.6 - passingRate:0.3 wingerRate:0 defenderRate:0 setPiecesRate:0]; - } - - + (Position*) positionForwardDefensive { - return [[Position alloc] initWithIdentifier:@"Forward Defensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.13 scorerRate:0.45 - passingRate:0.32 wingerRate:0 defenderRate:0 setPiecesRate:0]; - } - */ -(Position*) initFromUserDefaults: (NSString*) newIdentifier { --- 52,55 ---- *************** *** 144,147 **** --- 71,75 ---- scorerRate = [[values objectAtIndex:8] doubleValue]; setPiecesRate = [[values objectAtIndex:9] doubleValue]; + [self updateTotal]; return self; } *************** *** 166,169 **** --- 94,98 ---- playerFormRate = newPlayerFormRate; experienceRate = newExperienceRate; + [self updateTotal]; return self; } *************** *** 184,187 **** --- 113,117 ---- defenderRate = newDefenderRate; setPiecesRate = newSetPiecesRate; + [self updateTotal]; return self; } *************** *** 192,230 **** - (double) playerFormRate { return playerFormRate; } - (double) experienceRate { return experienceRate; } ! - (double)staminaRate { ! return staminaRate; } ! - (double)keeperRate { ! return keeperRate; } ! - (double)playmakingRate { ! return playmakingRate; } ! - (double)passingRate { ! return passingRate; } ! - (double)wingerRate { ! return wingerRate; } ! - (double)defenderRate { ! return defenderRate; } ! - (double)scorerRate { ! return scorerRate; } ! - (double)setPiecesRate { ! return setPiecesRate; } --- 122,200 ---- - (double) playerFormRate { return playerFormRate; } + - (void) setPlayerFormRate: (double) newPlayerFormRate { + playerFormRate = newPlayerFormRate; + } - (double) experienceRate { return experienceRate; } + - (void) setExperienceRate: (double) newExperienceRate { + experienceRate = newExperienceRate; + } ! - (double) staminaRate { return staminaRate; } ! - (void) setStaminaRate: (double) newStaminaRate { ! staminaRate = newStaminaRate; ! [self updateTotal]; } ! ! - (double) keeperRate { return keeperRate; } ! - (void) setKeeperRate: (double) newKeeperRate { ! keeperRate = newKeeperRate; ! [self updateTotal]; } ! ! - (double) playmakingRate { return playmakingRate; } ! - (void) setPlaymakingRate: (double) newPlaymakingRate { ! playmakingRate = newPlaymakingRate; ! [self updateTotal]; } ! ! - (double) passingRate { return passingRate; } ! - (void) setPassingRate: (double) newPassingRate { ! passingRate = newPassingRate; ! [self updateTotal]; } ! ! - (double) wingerRate { return wingerRate; } ! - (void) setWingerRate: (double) newWingerRate { ! wingerRate = newWingerRate; ! [self updateTotal]; } ! ! - (double) defenderRate { return defenderRate; } ! - (void) setDefenderRate: (double) newDefenderRate { ! defenderRate = newDefenderRate; ! [self updateTotal]; } ! ! - (double) scorerRate { return scorerRate; } ! - (void) setScorerRate: (double) newScorerRate { ! scorerRate = newScorerRate; ! [self updateTotal]; } ! ! - (double) setPiecesRate { return setPiecesRate; } ! - (void) setSetPiecesRate: (double) newSetPiecesRate { ! setPiecesRate = newSetPiecesRate; ! [self updateTotal]; ! } ! ! ! - (double) total { return total; } ! - (void) setTotal: (double) newTotal { ! total = newTotal; ! } ! ! ! -(void) updateTotal { ! [self setTotal: staminaRate + keeperRate +playmakingRate + passingRate + wingerRate + defenderRate + scorerRate + setPiecesRate]; } *************** *** 261,264 **** --- 231,240 ---- } + -(Position*) copyWithZone: (NSZone*) zone { + return [[Position alloc] initWithIdentifier:[identifier copy] playerFormRate:playerFormRate experienceRate:experienceRate + staminaRate:staminaRate keeperRate:keeperRate playmakingRate:playmakingRate scorerRate:scorerRate + passingRate:passingRate wingerRate:wingerRate defenderRate:defenderRate setPiecesRate:setPiecesRate]; + } + +(Position*) positionWithIdentifier: (NSString*) positionsIdentifier { *************** *** 331,369 **** NSArray *keys = [Position positionsIdentifiers]; NSArray *objects = [[NSArray alloc] initWithObjects: ! [[Position alloc] initWithIdentifier:@"Keeper" staminaRate:0 keeperRate:1 playmakingRate:0 scorerRate:0 passingRate:0 wingerRate:0 defenderRate:0 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Central Defender" staminaRate:0.1 keeperRate:0 playmakingRate:0.02 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.75 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Central Defender Towards Wing" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.1 wingerRate:0.15 defenderRate:0.65 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Central Defender Offensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 passingRate:0.2 wingerRate:0 defenderRate:0.6 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.1 wingerRate:0.2 defenderRate:0.6 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback Towards Middle" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.08 wingerRate:0.17 defenderRate:0.65 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback Offensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 passingRate:0.2 wingerRate:0.25 defenderRate:0.35 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback Defensive" staminaRate:0.05 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.05 wingerRate:0.1 defenderRate:0.8 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield" staminaRate:0.25 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.1 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield Towards Wing" staminaRate:0.2 keeperRate:0 playmakingRate:0.35 scorerRate:0 passingRate:0.15 wingerRate:0.2 defenderRate:0.1 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield Offensive" staminaRate:0.2 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.25 wingerRate:0 defenderRate:0.05 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield Defensive" staminaRate:0.15 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.2 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger" staminaRate:0.15 keeperRate:0 playmakingRate:0.25 scorerRate:0 passingRate:0.05 wingerRate:0.5 defenderRate:0.05 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger Towards Middle" staminaRate:0.15 keeperRate:0 playmakingRate:0.3 scorerRate:0 passingRate:0.1 wingerRate:0.35 defenderRate:0.1 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger Offensive" staminaRate:0.15 keeperRate:0 playmakingRate:0.15 scorerRate:0 passingRate:0.1 wingerRate:0.6 defenderRate:0 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger Defensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.2 scorerRate:0 passingRate:0.1 wingerRate:0.35 defenderRate:0.25 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Forward" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0.6 passingRate:0.3 wingerRate:0 defenderRate:0 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Forward Defensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.13 scorerRate:0.45 passingRate:0.32 wingerRate:0 defenderRate:0 setPiecesRate:0], nil]; --- 307,345 ---- NSArray *keys = [Position positionsIdentifiers]; NSArray *objects = [[NSArray alloc] initWithObjects: ! [[Position alloc] initWithIdentifier:@"Keeper" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0 keeperRate:1 playmakingRate:0 scorerRate:0 passingRate:0 wingerRate:0 defenderRate:0 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Central Defender" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.02 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.75 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Central Defender Towards Wing" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.1 wingerRate:0.15 defenderRate:0.65 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Central Defender Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 passingRate:0.2 wingerRate:0 defenderRate:0.6 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.1 wingerRate:0.2 defenderRate:0.6 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback Towards Middle" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.08 wingerRate:0.17 defenderRate:0.65 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 passingRate:0.2 wingerRate:0.25 defenderRate:0.35 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Wingback Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.05 keeperRate:0 playmakingRate:0 scorerRate:0 passingRate:0.05 wingerRate:0.1 defenderRate:0.8 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.25 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.1 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield Towards Wing" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.2 keeperRate:0 playmakingRate:0.35 scorerRate:0 passingRate:0.15 wingerRate:0.2 defenderRate:0.1 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.2 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.25 wingerRate:0 defenderRate:0.05 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Inner Midfield Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.5 scorerRate:0 passingRate:0.15 wingerRate:0 defenderRate:0.2 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.25 scorerRate:0 passingRate:0.05 wingerRate:0.5 defenderRate:0.05 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger Towards Middle" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.3 scorerRate:0 passingRate:0.1 wingerRate:0.35 defenderRate:0.1 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger Offensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.15 keeperRate:0 playmakingRate:0.15 scorerRate:0 passingRate:0.1 wingerRate:0.6 defenderRate:0 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Winger Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.2 scorerRate:0 passingRate:0.1 wingerRate:0.35 defenderRate:0.25 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Forward" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0.6 passingRate:0.3 wingerRate:0 defenderRate:0 setPiecesRate:0], ! [[Position alloc] initWithIdentifier:@"Forward Defensive" playerFormRate: 0.6 experienceRate: 0.35 staminaRate:0.1 keeperRate:0 playmakingRate:0.13 scorerRate:0.45 passingRate:0.32 wingerRate:0 defenderRate:0 setPiecesRate:0], nil]; *************** *** 372,375 **** --- 348,363 ---- } + + (void) setPosition: (Position*) position { + [positionsDictionary setObject: position forKey:[position identifier]]; + } + + + + savePositionsToUserDefaults { + NSEnumerator *en = [positionsDictionary objectEnumerator]; + Position *current; + while(current = [en nextObject]) { + [current saveToUserDefaults]; + } + } - (void)dealloc { [identifier release]; Index: FormulasViewController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FormulasViewController.h 20 Jan 2005 20:46:00 -0000 1.1 --- FormulasViewController.h 6 Feb 2005 19:36:17 -0000 1.2 *************** *** 29,38 **** #import <Cocoa/Cocoa.h> ! @interface FormulasViewController : NSObject { IBOutlet NSView *formulasView; } - (NSView *) formulasView; @end --- 29,49 ---- #import <Cocoa/Cocoa.h> ! #import "Position.h" @interface FormulasViewController : NSObject { + Position *keeper; + IBOutlet NSTextField *keeperTotal; IBOutlet NSView *formulasView; } + - (NSView *) formulasView; + -(void) cancel; + -(void) ok; + + + -(IBAction) update; + + - (Position *) keeper; + - (void) setKeeper: (Position *) newKeeper; @end Index: HattrickOrg.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** HattrickOrg.m 22 Dec 2004 18:47:28 -0000 1.16 --- HattrickOrg.m 6 Feb 2005 19:36:18 -0000 1.17 *************** *** 105,108 **** --- 105,109 ---- } + - (void) logout { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; Index: Position.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Position.h 24 Jan 2005 20:18:29 -0000 1.6 --- Position.h 6 Feb 2005 19:36:18 -0000 1.7 *************** *** 42,46 **** double scorerRate; double setPiecesRate; ! } --- 42,46 ---- double scorerRate; double setPiecesRate; ! double total; } *************** *** 76,79 **** --- 76,80 ---- - (double)scorerRate; - (double)setPiecesRate; + - (double) total; -(BOOL) isEqual:(id) anObject; *************** *** 81,111 **** -(void) saveToUserDefaults; +(Position*) positionWithIdentifier: (NSString*) positionsIdentifier; - +(Position*) defaultPositionWithIdentifier: (NSString*) positionIdentifier; - + (NSArray*) positionsIdentifiers; ! /* ! + (Position*) positionKeeper; ! + (Position*) positionCentralDefender; ! + (Position*) positionCentralDefenderTowardsWing; ! + (Position*) positionCentralDefenderOffensive; ! + (Position*) positionWingback; ! + (Position*) positionWingbackTowardsMiddle; ! + (Position*) positionWingbackOffensive; ! + (Position*) positionWingbackDefensive; ! + (Position*) positionInnerMidfield; ! + (Position*) positionInnerMidfieldTowardsWing; ! + (Position*) positionInnerMidfieldOffensive; ! + (Position*) positionInnerMidfieldDefensive; ! + (Position*) positionWinger; ! + (Position*) positionWingerTowardsMiddle; ! + (Position*) positionWingerOffensive; ! + (Position*) positionWingerDefensive; ! + (Position*) positionForward; ! + (Position*) positionForwardDefensive; ! + (NSArray*) possiblePositions; ! */ @end --- 82,95 ---- -(void) saveToUserDefaults; + // class methods + +(Position*) positionWithIdentifier: (NSString*) positionsIdentifier; ! +(Position*) defaultPositionWithIdentifier: (NSString*) positionIdentifier; + + (NSArray*) positionsIdentifiers; + + (void) setPosition: (Position*) position; + + savePositionsToUserDefaults; @end Index: MainController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/MainController.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MainController.m 16 Jan 2005 18:04:00 -0000 1.13 --- MainController.m 6 Feb 2005 19:36:18 -0000 1.14 *************** *** 38,42 **** #import "AggressivenessTransformer.h" #import "SkillToListIndexTransformer.h" ! static MainController *mainController; --- 38,42 ---- #import "AggressivenessTransformer.h" #import "SkillToListIndexTransformer.h" ! #import "PercentageTransformer.h" static MainController *mainController; *************** *** 166,169 **** --- 166,170 ---- [NSValueTransformer setValueTransformer:[[[AgreeabilityTransformer alloc] init] autorelease] forName:@"AgreeabilityTransformer"]; [NSValueTransformer setValueTransformer:[[[SkillToListIndexTransformer alloc] init] autorelease] forName:@"SkillToListIndexTransformer"]; + [NSValueTransformer setValueTransformer:[[[PercentageTransformer alloc] init] autorelease] forName:@"PercentageTransformer"]; } Index: Player.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Player.m 15 Jan 2005 17:39:40 -0000 1.19 --- Player.m 6 Feb 2005 19:36:18 -0000 1.20 *************** *** 357,364 **** - (double) calculatePositionValue: (Position*) position { ! return (((playerForm * 0.075 + 0.4) * (staminaSkill * [position staminaRate] + keeperSkill * [position keeperRate] + playmakerSkill * [position playmakingRate] + scorerSkill * [position scorerRate] + passingSkill * [position passingRate] + wingerSkill * [position wingerRate] ! + defenderSkill * [position defenderRate] + setPiecesSkill * [position setPiecesRate])) + log10(experience) * 0.7); } --- 357,365 ---- - (double) calculatePositionValue: (Position*) position { ! //(playerForm * 0.075 + 0.4) ! return (((playerForm * [position playerFormRate] * 0.125 + 0.4) * (staminaSkill * [position staminaRate] + keeperSkill * [position keeperRate] + playmakerSkill * [position playmakingRate] + scorerSkill * [position scorerRate] + passingSkill * [position passingRate] + wingerSkill * [position wingerRate] ! + defenderSkill * [position defenderRate] + setPiecesSkill * [position setPiecesRate])) + log10(experience) * [position experienceRate] * 2); } Index: PreferencesController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PreferencesController.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PreferencesController.m 20 Jan 2005 20:46:01 -0000 1.3 --- PreferencesController.m 6 Feb 2005 19:36:19 -0000 1.4 *************** *** 31,42 **** @implementation PreferencesController ! - (IBAction)cancel:(id)sender ! { [self close]; } ! - (IBAction)ok:(id)sender ! { [userDefaultsController save:self]; [self close]; } --- 31,42 ---- @implementation PreferencesController ! - (IBAction)cancel:(id)sender{ ! [formulasViewController cancel]; [self close]; } ! - (IBAction)ok:(id)sender { [userDefaultsController save:self]; + [formulasViewController ok]; [self close]; } Index: FormulasViewController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FormulasViewController.m 20 Jan 2005 20:46:01 -0000 1.1 --- FormulasViewController.m 6 Feb 2005 19:36:18 -0000 1.2 *************** *** 29,32 **** --- 29,37 ---- #import "FormulasViewController.h" + #import "Position.h" + + @interface FormulasViewController (Private) + - (void) loadPositions; + @end *************** *** 41,45 **** --- 46,60 ---- - (NSView *) formulasView { return formulasView; } + - (void) loadPositions { + [self setKeeper: [[Position positionWithIdentifier:@"Keeper"] copy]]; + } + -(void) cancel { + [self loadPositions]; + } + -(void) ok { + [Position setPosition: keeper]; + [Position savePositionsToUserDefaults]; + } - (void) dealloc { *************** *** 48,51 **** --- 63,80 ---- } + -(void) awakeFromNib { + [self loadPositions]; + } + + + + - (Position *) keeper { return keeper; } + - (void) setKeeper: (Position *) newKeeper { + [newKeeper retain]; + [keeper release]; + keeper = newKeeper; + } + + @end |
|
From: Geisschaes <gei...@us...> - 2005-02-06 19:37:04
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25981/English.lproj/PreferencesPanel.nib Modified Files: info.nib keyedobjects.nib Log Message: keeper formulas are now correctly integrated, missing defaults and import/export functions Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/info.nib,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** info.nib 21 Jan 2005 07:58:17 -0000 1.8 --- info.nib 6 Feb 2005 19:36:23 -0000 1.9 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>93 129 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>69 100 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvs9esT5m and /tmp/cvsgQxt0p differ |
|
From: Geisschaes <gei...@us...> - 2005-02-06 19:37:02
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25981/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: keeper formulas are now correctly integrated, missing defaults and import/export functions Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** project.pbxproj 20 Jan 2005 20:46:05 -0000 1.63 --- project.pbxproj 6 Feb 2005 19:36:24 -0000 1.64 *************** *** 1856,1859 **** --- 1856,1860 ---- 306F818D079985BD00FC68E8, 3031CB0A07A043B0006539CD, + 3092DC1107B66C780043063E, ); isa = PBXHeadersBuildPhase; *************** *** 2065,2068 **** --- 2066,2070 ---- 306F818E079985BD00FC68E8, 3031CB0B07A043B0006539CD, + 3092DC1207B66C780043063E, ); isa = PBXSourcesBuildPhase; *************** *** 3406,3409 **** --- 3408,3451 ---- }; }; + 3092DC0F07B66C780043063E = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = PercentageTransformer.h; + refType = 4; + sourceTree = "<group>"; + }; + 3092DC1007B66C780043063E = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = PercentageTransformer.m; + refType = 4; + sourceTree = "<group>"; + }; + 3092DC1107B66C780043063E = { + fileRef = 3092DC0F07B66C780043063E; + isa = PBXBuildFile; + settings = { + }; + }; + 3092DC1207B66C780043063E = { + fileRef = 3092DC1007B66C780043063E; + isa = PBXBuildFile; + settings = { + }; + }; + 3092DC1307B66C780043063E = { + fileRef = 3092DC0F07B66C780043063E; + isa = PBXBuildFile; + settings = { + }; + }; + 3092DC1407B66C780043063E = { + fileRef = 3092DC1007B66C780043063E; + isa = PBXBuildFile; + settings = { + }; + }; 3094220B0706E9C000873206 = { fileEncoding = 4; *************** *** 3530,3533 **** --- 3572,3576 ---- 306F818F079985BD00FC68E8, 3031CB0C07A043B0006539CD, + 3092DC1307B66C780043063E, ); isa = PBXHeadersBuildPhase; *************** *** 3727,3730 **** --- 3770,3774 ---- 306F8190079985BD00FC68E8, 3031CB0D07A043B0006539CD, + 3092DC1407B66C780043063E, ); isa = PBXSourcesBuildPhase; *************** *** 5094,5097 **** --- 5138,5143 ---- 30E284D3077EFCA900DB648A = { children = ( + 3092DC0F07B66C780043063E, + 3092DC1007B66C780043063E, 306F8189079985BC00FC68E8, 306F818A079985BC00FC68E8, Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** roman.mode1 24 Jan 2005 20:18:51 -0000 1.17 --- roman.mode1 6 Feb 2005 19:36:25 -0000 1.18 *************** *** 242,246 **** <array> <string>29B97314FDCFA39411CA2CEA</string> - <string>30B355F80690131C00571DE8</string> <string>1C37FBAC04509CD000000102</string> </array> --- 242,245 ---- *************** *** 253,257 **** </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {322, 603}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 252,256 ---- </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {322, 605}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 261,265 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {339, 621}}</string> <key>GroupTreeTableConfiguration</key> <array> --- 260,264 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {339, 623}}</string> <key>GroupTreeTableConfiguration</key> <array> *************** *** 268,272 **** </array> <key>RubberWindowFrame</key> ! <string>93 169 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 267,271 ---- </array> <key>RubberWindowFrame</key> ! <string>581 146 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 284,288 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 283,287 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 292,301 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.m</string> <key>bookmark</key> ! <string>3021F7F607A58EF00073597B</string> <key>history</key> <array> - <string>307E08700789E6ED00CCBC6B</string> <string>30ADE253078B19040012CF83</string> <string>30ADE254078B19040012CF83</string> --- 291,299 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>bookmark</key> ! <string>30CBF15607B69E6B005A0707</string> <key>history</key> <array> <string>30ADE253078B19040012CF83</string> <string>30ADE254078B19040012CF83</string> *************** *** 310,317 **** <string>303B4FB90791C8710056E135</string> <string>306095380792FF3E00BAA4CF</string> - <string>306095500793022800BAA4CF</string> <string>306095510793022800BAA4CF</string> <string>306095AD07930A1200BAA4CF</string> - <string>306095B007930A1200BAA4CF</string> <string>306095FE07930FBD00BAA4CF</string> <string>306095FF07930FBD00BAA4CF</string> --- 308,313 ---- *************** *** 323,327 **** <string>306096300793190400BAA4CF</string> <string>306096310793190400BAA4CF</string> - <string>3060964207931A3C00BAA4CF</string> <string>3060964307931A3C00BAA4CF</string> <string>3060964407931A3C00BAA4CF</string> --- 319,322 ---- *************** *** 334,361 **** <string>306F7F9707992C5300FC68E8</string> <string>306F7F9F07992D0F00FC68E8</string> - <string>306F80EB079973E600FC68E8</string> <string>306F81940799866E00FC68E8</string> - <string>306F81B00799875200FC68E8</string> - <string>306F81B10799875200FC68E8</string> <string>306F81B20799875200FC68E8</string> <string>304A3C52079ACC7700358038</string> <string>304A3C7D079AD0F000358038</string> - <string>304A3C84079AD1B900358038</string> <string>304A3CA2079AD44E00358038</string> <string>304A3CB4079AD56A00358038</string> - <string>3063E94B079AE9F8003DF28B</string> - <string>30E7ABB1079DA8B400E048FC</string> - <string>30E7ABB2079DA8B400E048FC</string> <string>3031CB0E07A043C6006539CD</string> <string>3031CB0F07A043C6006539CD</string> - <string>3031CB1007A043C6006539CD</string> - <string>3031CB2007A0449D006539CD</string> <string>3031CB2307A04526006539CD</string> <string>3031CB3407A0495A006539CD</string> <string>3031CB4007A04A5B006539CD</string> <string>3031CB5107A04D53006539CD</string> - <string>30557D3207A25F0800D5CE02</string> <string>30557D3407A25F0800D5CE02</string> - <string>30557D5407A26C7200D5CE02</string> <string>3021F76107A56A290073597B</string> <string>3021F76207A56A290073597B</string> --- 329,345 ---- *************** *** 366,370 **** <string>3021F7DE07A57D510073597B</string> <string>3021F7E407A5810F0073597B</string> ! <string>3021F7E507A5810F0073597B</string> </array> <key>prevStack</key> --- 350,375 ---- <string>3021F7DE07A57D510073597B</string> <string>3021F7E407A5810F0073597B</string> ! <string>3021F7FA07A590F30073597B</string> ! <string>30884AC807ABD400001F2ACB</string> ! <string>30884AD407ABF910001F2ACB</string> ! <string>30884AD707ABF924001F2ACB</string> ! <string>30884AFD07ABFBE5001F2ACB</string> ! <string>30884B0307ABFC21001F2ACB</string> ! <string>30884B0407ABFC21001F2ACB</string> ! <string>30884B0507ABFC21001F2ACB</string> ! <string>3092DC1807B66D430043063E</string> ! <string>3092DC1907B66D430043063E</string> ! <string>3092DC1A07B66D430043063E</string> ! <string>3092DC1B07B66D430043063E</string> ! <string>3092DC1C07B66D430043063E</string> ! <string>3092DC1D07B66D430043063E</string> ! <string>3092DC1E07B66D430043063E</string> ! <string>3092DC1F07B66D430043063E</string> ! <string>30CBF0FA07B693F8005A0707</string> ! <string>30CBF0FB07B693F8005A0707</string> ! <string>30CBF0FC07B693F8005A0707</string> ! <string>30CBF11307B6967F005A0707</string> ! <string>30CBF11D07B69796005A0707</string> ! <string>30CBF11E07B69796005A0707</string> </array> <key>prevStack</key> *************** *** 437,450 **** <string>3031CB5307A04D53006539CD</string> <string>30557D5607A26C7200D5CE02</string> - <string>3021F76307A56A290073597B</string> - <string>3021F76407A56A290073597B</string> <string>3021F77107A56B2D0073597B</string> - <string>3021F78807A56FCE0073597B</string> - <string>3021F78907A56FCE0073597B</string> <string>3021F7A107A575590073597B</string> - <string>3021F7A907A576490073597B</string> - <string>3021F7DF07A57D510073597B</string> <string>3021F7E007A57D510073597B</string> ! <string>3021F7E607A5810F0073597B</string> </array> </dict> --- 442,458 ---- <string>3031CB5307A04D53006539CD</string> <string>30557D5607A26C7200D5CE02</string> <string>3021F77107A56B2D0073597B</string> <string>3021F7A107A575590073597B</string> <string>3021F7E007A57D510073597B</string> ! <string>30884B0807ABFC21001F2ACB</string> ! <string>3092DC2207B66D430043063E</string> ! <string>3092DC2507B66D430043063E</string> ! <string>3092DC2607B66D430043063E</string> ! <string>3092DC2707B66D430043063E</string> ! <string>30CBF0FD07B693F8005A0707</string> ! <string>30CBF0FE07B693F8005A0707</string> ! <string>30CBF0FF07B693F8005A0707</string> ! <string>30CBF11407B6967F005A0707</string> ! <string>30CBF11F07B69796005A0707</string> </array> </dict> *************** *** 458,469 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {727, 356}}</string> <key>RubberWindowFrame</key> ! <string>93 169 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>356pt</string> </dict> <dict> --- 466,477 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {653, 358}}</string> <key>RubberWindowFrame</key> ! <string>581 146 998 665 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>358pt</string> </dict> <dict> *************** *** 478,484 **** <dict> <key>Frame</key> ! <string>{{0, 363}, {727, 258}}</string> <key>RubberWindowFrame</key> ! <string>93 169 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 486,492 ---- <dict> <key>Frame</key> ! <string>{{0, 365}, {653, 258}}</string> <key>RubberWindowFrame</key> ! <string>581 146 998 665 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 489,493 **** </array> <key>Proportion</key> ! <string>727pt</string> </dict> </array> --- 497,501 ---- </array> <key>Proportion</key> ! <string>653pt</string> </dict> </array> *************** *** 504,510 **** <key>TableOfContents</key> <array> ! <string>3021F76607A56A290073597B</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3021F76707A56A290073597B</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 512,518 ---- <key>TableOfContents</key> <array> ! <string>30CBF0EF07B6912C005A0707</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30CBF0F007B6912C005A0707</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 534,548 **** <key>WindowOrderList</key> <array> - <string>303B689D075A03FF009951CC</string> - <string>3021F76907A56A290073597B</string> - <string>1CD10A99069EF8BA00B06720</string> - <string>303B68B1075A0D24009951CC</string> <string>1C530D57069F1CE1000CFCEE</string> - <string>3021F77307A56B2D0073597B</string> - <string>1C0AD2B3069F1EA900FABCE6</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>93 169 1072 663 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 542,553 ---- <key>WindowOrderList</key> <array> <string>1C530D57069F1CE1000CFCEE</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>303B68B1075A0D24009951CC</string> + <string>1C0AD2B3069F1EA900FABCE6</string> + <string>30CBF0F907B691FF005A0707</string> </array> <key>WindowString</key> ! <string>581 146 998 665 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 572,581 **** <key>PBXProjectModuleLabel</key> <string>Position.m</string> - <key>bookmark</key> - <string>3021F7F707A58EF00073597B</string> - <key>history</key> - <array> - <string>30557DC007A27E4100D5CE02</string> - </array> </dict> <key>SplitCount</key> --- 577,580 ---- *************** *** 639,643 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>3021F7C907A57AF20073597B</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 638,642 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>30CBF14E07B69E15005A0707</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 679,684 **** <key>sizes</key> <array> ! <string>{{0, 0}, {222, 242}}</string> ! <string>{{222, 0}, {667, 242}}</string> </array> </dict> --- 678,683 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {204, 242}}</string> ! <string>{{204, 0}, {685, 242}}</string> </array> </dict> *************** *** 720,724 **** <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>287 217 889 609 0 0 1280 832 </string> </dict> <key>Module</key> --- 719,723 ---- <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>351 197 889 609 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 743,754 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3021F76807A56A290073597B</string> <string>1C162984064C10D400B95A72</string> ! <string>3021F76907A56A290073597B</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>287 217 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> --- 742,753 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>306262D507AECB2D00439F7E</string> <string>1C162984064C10D400B95A72</string> ! <string>306262D607AECB2D00439F7E</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>351 197 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> *************** *** 775,779 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 774,778 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 783,803 **** <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.h</string> <key>bookmark</key> ! <string>3021F7F807A58EF00073597B</string> <key>history</key> <array> ! <string>3021F7B207A579B20073597B</string> ! <string>3021F7CA07A57AF20073597B</string> ! <string>3021F7D007A57B8C0073597B</string> ! <string>3021F7D107A57B8C0073597B</string> ! <string>3021F7D207A57B8C0073597B</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>3021F7B407A579B20073597B</string> ! <string>3021F7CB07A57AF20073597B</string> ! <string>3021F7D307A57B8C0073597B</string> ! <string>3021F7D407A57B8C0073597B</string> </array> </dict> --- 782,791 ---- <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>bookmark</key> ! <string>30CBF15707B69E6B005A0707</string> <key>history</key> <array> ! <string>30CBF0F507B691FF005A0707</string> </array> </dict> *************** *** 825,830 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 813,816 ---- *************** *** 862,867 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>3021F7B607A579B20073597B</string> ! <string>3021F7B707A579B20073597B</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> --- 848,853 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30CBF0F707B691FF005A0707</string> ! <string>30CBF0F807B691FF005A0707</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> *************** *** 924,928 **** <array> <string>303B689D075A03FF009951CC</string> ! <string>3021F7C107A57A2B0073597B</string> <string>1C78EAAC065D492600B07095</string> </array> --- 910,914 ---- <array> <string>303B689D075A03FF009951CC</string> ! <string>306262D707AECB2D00439F7E</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 967,972 **** <key>sizes</key> <array> ! <string>{{0, 0}, {491, 167}}</string> ! <string>{{0, 176}, {491, 267}}</string> </array> </dict> --- 953,958 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {363, 167}}</string> ! <string>{{0, 176}, {363, 267}}</string> </array> </dict> *************** *** 994,998 **** <string>{{0, 0}, {633, 216}}</string> <key>RubberWindowFrame</key> ! <string>206 282 633 258 0 0 1280 832 </string> </dict> <key>Module</key> --- 980,984 ---- <string>{{0, 0}, {633, 216}}</string> <key>RubberWindowFrame</key> ! <string>611 246 633 258 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1017,1028 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3021F76A07A56A290073597B</string> <string>1CD0528B0623707200166675</string> ! <string>3021F76B07A56A290073597B</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>206 282 633 258 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1003,1014 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30CBF0F107B6912C005A0707</string> <string>1CD0528B0623707200166675</string> ! <string>30CBF0F207B6912C005A0707</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>611 246 633 258 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** roman.pbxuser 24 Jan 2005 20:18:54 -0000 1.82 --- roman.pbxuser 6 Feb 2005 19:36:25 -0000 1.83 *************** *** 39,44 **** 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; ! activeExecutable = 30950684067C4D100077C270; ! activeTarget = 30950682067C4D100077C270; addToTargets = ( 30744BA4069560A70039B82A, --- 39,44 ---- 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; [...2681 lines suppressed...] ! sepNavSelRange = "{2390, 311}"; ! sepNavVisRect = "{{0, 391}, {705, 428}}"; sepNavWindowFrame = "{{153, 159}, {750, 542}}"; }; --- 3851,3865 ---- 30EC0BDE06425043008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1090, 2057}}"; sepNavSelRange = "{3450, 0}"; ! sepNavVisRect = "{{0, 0}, {1090, 643}}"; ! sepNavWindowFrame = "{{72, 83}, {1135, 749}}"; }; }; 30EC0BDF06425043008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {806, 2785}}"; ! sepNavSelRange = "{780, 0}"; ! sepNavVisRect = "{{0, 310}, {606, 326}}"; sepNavWindowFrame = "{{153, 159}, {750, 542}}"; }; |
|
From: Geisschaes <gei...@us...> - 2005-02-06 19:37:02
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25981/English.lproj/PlayerDetails.nib Modified Files: keyedobjects.nib Log Message: keeper formulas are now correctly integrated, missing defaults and import/export functions Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib/keyedobjects.nib,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsTD61J5 and /tmp/cvsm8ZLI7 differ |
|
From: Geisschaes <gei...@us...> - 2005-02-06 19:37:01
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25981/Test Modified Files: PositionTest.m Log Message: keeper formulas are now correctly integrated, missing defaults and import/export functions Index: PositionTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PositionTest.m 24 Jan 2005 20:20:42 -0000 1.7 --- PositionTest.m 6 Feb 2005 19:36:51 -0000 1.8 *************** *** 124,127 **** --- 124,134 ---- [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward Defensive"]] equals: 4.5 precision:0.1]; } + - (void) testCopy { + Position* copy = [positionWinger copy]; + [self assertFalse:(player1 == copy)]; + [self assertInt:[positionWinger wingerRate] equals:[copy wingerRate]]; + [self assertInt:[positionWinger keeperRate] equals:[copy keeperRate]]; + [self assertInt:[positionWinger playerFormRate] equals:[copy playerFormRate]]; + } - (void) testSaveToUserDefaults { |
|
From: Geisschaes <gei...@us...> - 2005-02-06 19:37:00
|
Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25981/English.lproj/FormulasView.nib Modified Files: info.nib keyedobjects.nib Log Message: keeper formulas are now correctly integrated, missing defaults and import/export functions Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** info.nib 20 Jan 2005 20:46:02 -0000 1.2 --- info.nib 6 Feb 2005 19:36:19 -0000 1.3 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>149 170 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>239 374 542 354 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>84 163 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>213 385 542 354 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvswKBHdG and /tmp/cvsOW65dH differ |
|
From: Geisschaes <gei...@us...> - 2005-01-24 20:21:58
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323/Test Modified Files: LineUpTreeLayerTest.m LineUpTreeNodeTest.m LineUpTreeTest.m PlayerSortingTest.m PlayerTest.m PositionTest.m Log Message: new positions philosophy added Index: PlayerTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerTest.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PlayerTest.m 15 Jan 2005 17:39:53 -0000 1.13 --- PlayerTest.m 24 Jan 2005 20:20:42 -0000 1.14 *************** *** 103,107 **** -(void) testBestPosition { ! [self assertTrue:[[walter bestPosition] isEqual:[Position positionWingerOffensive]]]; } --- 103,107 ---- -(void) testBestPosition { ! [self assertTrue:[[walter bestPosition] isEqual:[Position positionWithIdentifier:@"Winger Offensive"]]]; } Index: PlayerSortingTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerSortingTest.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlayerSortingTest.m 29 Jun 2004 10:18:10 -0000 1.2 --- PlayerSortingTest.m 24 Jan 2005 20:20:42 -0000 1.3 *************** *** 43,47 **** } ! - (void) testNameComparison { [self assertInt: [player1 playerNameComparison:player2] equals: NSOrderedAscending]; [self assertInt: [player2 playerNameComparison:player1] equals: NSOrderedDescending]; --- 43,47 ---- } ! /*- (void) testNameComparison { [self assertInt: [player1 playerNameComparison:player2] equals: NSOrderedAscending]; [self assertInt: [player2 playerNameComparison:player1] equals: NSOrderedDescending]; *************** *** 88,92 **** [self assertInt: [player1 defenderSkillComparison:player1] equals: NSOrderedSame]; [self assertInt: [player2 defenderSkillComparison:player1] equals: NSOrderedDescending]; ! } - (void) testSetPiecesComparison { --- 88,92 ---- [self assertInt: [player1 defenderSkillComparison:player1] equals: NSOrderedSame]; [self assertInt: [player2 defenderSkillComparison:player1] equals: NSOrderedDescending]; ! }*/ - (void) testSetPiecesComparison { Index: LineUpTreeLayerTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeLayerTest.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LineUpTreeLayerTest.m 9 Jun 2004 19:35:36 -0000 1.3 --- LineUpTreeLayerTest.m 24 Jan 2005 20:20:40 -0000 1.4 *************** *** 55,61 **** [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [Position positionKeeper]; ! position2 = [Position positionInnerMidfield]; ! position3 = [Position positionForward]; rootLayer = [[LineUpTreeLayer alloc] initWithTreshold: 0 position: nil]; LineUpTreeNode *node = [[LineUpTreeNode alloc] initWithPlayer:nil --- 55,61 ---- [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [Position positionWithIdentifier:@"Keeper"]; ! position2 = [Position positionWithIdentifier:@"Inner Midfield"]; ! position3 = [Position positionWithIdentifier:@"Forward"]; rootLayer = [[LineUpTreeLayer alloc] initWithTreshold: 0 position: nil]; LineUpTreeNode *node = [[LineUpTreeNode alloc] initWithPlayer:nil Index: PositionTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PositionTest.m 22 Jul 2004 11:54:03 -0000 1.6 --- PositionTest.m 24 Jan 2005 20:20:42 -0000 1.7 *************** *** 33,38 **** - (void) setUp { ! positionKeeper = [Position positionKeeper]; ! positionWinger = [Position positionWinger]; player1 = [[Player alloc] init]; [player1 setStaminaSkill: 6 keeperSkill: 6 --- 33,38 ---- - (void) setUp { ! positionKeeper = [Position defaultPositionWithIdentifier:@"Keeper"]; ! positionWinger = [Position defaultPositionWithIdentifier:@"Winger"]; player1 = [[Player alloc] init]; [player1 setStaminaSkill: 6 keeperSkill: 6 *************** *** 53,133 **** - (void) testPositionKeeper{ ! [self assertFloat:[player1 calculatePositionValue: [Position positionKeeper]] equals: 6 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionKeeper]] equals: 1 precision:0.1]; } - (void) testPositionCentralDefender { ! [self assertFloat:[player1 calculatePositionValue: [Position positionCentralDefender]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionCentralDefender]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [Position positionCentralDefenderTowardsWing]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionCentralDefenderTowardsWing]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionCentralDefenderOffensive]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionCentralDefenderOffensive]] equals: 3.9 precision:0.1]; } - (void) testPositionWingBack { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWingback]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWingback]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWingbackTowardsMiddle]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWingbackTowardsMiddle]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWingbackDefensive]] equals: 1.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWingbackDefensive]] equals: 3.3 precision:0.1]; } - (void) testPositionWingBackOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWingbackOffensive]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWingbackOffensive]] equals: 4.2 precision:0.1]; } - (void) testPositionInnerMidfield { ! [self assertFloat:[player1 calculatePositionValue: [Position positionInnerMidfield]] equals: 2.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionInnerMidfield]] equals: 6.5 precision:0.1]; } - (void) testPositionInnerMidfieldTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [Position positionInnerMidfieldTowardsWing]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionInnerMidfieldTowardsWing]] equals: 5.8 precision:0.1]; } - (void) testPositionInnerMidfieldOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionInnerMidfieldOffensive]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionInnerMidfieldOffensive]] equals: 6.3 precision:0.1]; } - (void) testPositionInnerMidfieldDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionInnerMidfieldDefensive]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionInnerMidfieldDefensive]] equals: 6.1 precision:0.1]; } - (void) testPositionWinger { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWinger]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWinger]] equals: 5.3 precision:0.1]; } - (void) testPositionWingerTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWingerTowardsMiddle]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWingerTowardsMiddle]] equals: 5.4 precision:0.1]; } - (void) testPositionWingerOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWingerOffensive]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWingerOffensive]] equals: 4.9 precision:0.1]; } - (void) testPositionWingerDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionWingerDefensive]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionWingerDefensive]] equals: 4.8 precision:0.1]; } - (void) testPositionForward { ! [self assertFloat:[player1 calculatePositionValue: [Position positionForward]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionForward]] equals: 4 precision:0.1]; } - (void) testPositionForwardDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position positionForwardDefensive]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position positionForwardDefensive]] equals: 4.5 precision:0.1]; } ! -(void) testIsEqual { ! [self assertTrue:[positionKeeper isEqual: positionKeeper]]; ! [self assertFalse:[positionKeeper isEqual: positionWinger]]; ! [self assertTrue:[positionWinger isEqual: [Position positionWinger]]]; } --- 53,138 ---- - (void) testPositionKeeper{ ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Keeper"]] equals: 6 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Keeper"]] equals: 1 precision:0.1]; } - (void) testPositionCentralDefender { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender"]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Towards Wing"]] equals: 3.5 precision:0.1]; } - (void) testPositionCentralDefenderOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Central Defender Offensive"]] equals: 3.9 precision:0.1]; } - (void) testPositionWingBack { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback"]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Towards Middle"]] equals: 3.6 precision:0.1]; } - (void) testPositionWingBackDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Defensive"]] equals: 1.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Defensive"]] equals: 3.3 precision:0.1]; } - (void) testPositionWingBackOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Offensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Wingback Offensive"]] equals: 4.2 precision:0.1]; } - (void) testPositionInnerMidfield { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield"]] equals: 2.3 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield"]] equals: 6.5 precision:0.1]; } - (void) testPositionInnerMidfieldTowardsWing { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Towards Wing"]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Towards Wing"]] equals: 5.8 precision:0.1]; } - (void) testPositionInnerMidfieldOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Offensive"]] equals: 2 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Offensive"]] equals: 6.3 precision:0.1]; } - (void) testPositionInnerMidfieldDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Defensive"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Inner Midfield Defensive"]] equals: 6.1 precision:0.1]; } - (void) testPositionWinger { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger"]] equals: 5.3 precision:0.1]; } - (void) testPositionWingerTowardsMiddle { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Towards Middle"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Towards Middle"]] equals: 5.4 precision:0.1]; } - (void) testPositionWingerOffensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Offensive"]] equals: 1.8 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Offensive"]] equals: 4.9 precision:0.1]; } - (void) testPositionWingerDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Defensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Winger Defensive"]] equals: 4.8 precision:0.1]; } - (void) testPositionForward { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward"]] equals: 4 precision:0.1]; } - (void) testPositionForwardDefensive { ! [self assertFloat:[player1 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward Defensive"]] equals: 1.5 precision:0.1]; ! [self assertFloat:[player2 calculatePositionValue: [Position defaultPositionWithIdentifier:@"Forward Defensive"]] equals: 4.5 precision:0.1]; } ! - (void) testSaveToUserDefaults { ! [positionKeeper saveToUserDefaults]; ! [self assertNotNil:[[NSUserDefaults standardUserDefaults] arrayForKey:@"Keeper"]]; ! Position *newKeeper = [[Position alloc] initFromUserDefaults:@"Keeper"]; ! [self assert:positionKeeper equals:newKeeper]; ! } -(void) testIsEqual { ! [self assertTrue:[positionKeeper isEqual: [Position positionWithIdentifier:@"Keeper"]]]; ! [self assertFalse:[positionKeeper isEqual: [Position positionWithIdentifier:@"Winger"]]]; ! [self assertTrue:[positionWinger isEqual: [Position positionWithIdentifier:@"Winger"]]]; } *************** *** 135,139 **** NSArray *possiblePositions = [Position possiblePositions]; [self assertInt:[possiblePositions count] equals:18]; ! [self assertTrue:[possiblePositions containsObject:[Position positionInnerMidfieldTowardsWing]]]; } --- 140,144 ---- NSArray *possiblePositions = [Position possiblePositions]; [self assertInt:[possiblePositions count] equals:18]; ! [self assertTrue:[possiblePositions containsObject:[Position positionWithIdentifier:@"Inner Midfield Towards Wing"]]]; } Index: LineUpTreeNodeTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeNodeTest.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LineUpTreeNodeTest.m 29 Jun 2004 10:18:10 -0000 1.4 --- LineUpTreeNodeTest.m 24 Jan 2005 20:20:42 -0000 1.5 *************** *** 55,60 **** [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [Position positionKeeper]; ! position2 = [Position positionInnerMidfield]; root = [[LineUpTreeNode alloc] initWithPlayer: player1 stillAvailablePlayers: [NSSet setWithObjects:player2, player3, nil] --- 55,60 ---- [player3 setExperience:1]; [player3 setPlayerForm:8]; ! position1 = [Position positionWithIdentifier:@"Keeper"]; ! position2 = [Position positionWithIdentifier:@"Inner Midfield"]; root = [[LineUpTreeNode alloc] initWithPlayer: player1 stillAvailablePlayers: [NSSet setWithObjects:player2, player3, nil] Index: LineUpTreeTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeTest.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LineUpTreeTest.m 19 Sep 2004 17:06:46 -0000 1.8 --- LineUpTreeTest.m 24 Jan 2005 20:20:42 -0000 1.9 *************** *** 58,72 **** - (NSArray*) defaultPositions442 { NSMutableArray *positions = [NSMutableArray arrayWithCapacity:11]; ! [positions addObject:[Position positionKeeper]]; ! [positions addObject:[Position positionCentralDefender]]; ! [positions addObject:[Position positionCentralDefender]]; ! [positions addObject:[Position positionWingback]]; ! [positions addObject:[Position positionWingback]]; ! [positions addObject:[Position positionInnerMidfield]]; ! [positions addObject:[Position positionInnerMidfield]]; ! [positions addObject:[Position positionWinger]]; ! [positions addObject:[Position positionWinger]]; ! [positions addObject:[Position positionForward]]; ! [positions addObject:[Position positionForward]]; return positions; } --- 58,72 ---- - (NSArray*) defaultPositions442 { NSMutableArray *positions = [NSMutableArray arrayWithCapacity:11]; ! [positions addObject:[Position positionWithIdentifier:@"Keeper"]]; ! [positions addObject:[Position positionWithIdentifier:@"Central Defender"]]; ! [positions addObject:[Position positionWithIdentifier:@"Central Defender"]]; ! [positions addObject:[Position positionWithIdentifier:@"Wingback"]]; ! [positions addObject:[Position positionWithIdentifier:@"Wingback"]]; ! [positions addObject:[Position positionWithIdentifier:@"Inner Midfield"]]; ! [positions addObject:[Position positionWithIdentifier:@"Inner Midfield"]]; ! [positions addObject:[Position positionWithIdentifier:@"Winger"]]; ! [positions addObject:[Position positionWithIdentifier:@"Winger"]]; ! [positions addObject:[Position positionWithIdentifier:@"Forward"]]; ! [positions addObject:[Position positionWithIdentifier:@"Forward"]]; return positions; } |
|
From: Geisschaes <gei...@us...> - 2005-01-24 20:21:49
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323 Modified Files: LineUpController.m Player-Sorting.h Player-Sorting.m PlayerDetailsController.m Position.h Position.m PositionsController.m Log Message: new positions philosophy added Index: Position.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Position.m 20 Jan 2005 20:46:01 -0000 1.6 --- Position.m 24 Jan 2005 20:18:29 -0000 1.7 *************** *** 29,35 **** --- 29,44 ---- #import "Position.h" + static NSDictionary* defaultPositionsDictionary; + static NSMutableDictionary *positionsDictionary; + + @interface Position (Private) + + (void) loadDefaultPositions; + + (void) loadPositions; + + @end @implementation Position + /* + (Position*) positionKeeper { return [[Position alloc] initWithIdentifier:@"Keeper" staminaRate:0 keeperRate:1 playmakingRate:0 scorerRate:0 *************** *** 115,127 **** passingRate:0.32 wingerRate:0 defenderRate:0 setPiecesRate:0]; } ! - (Position*) initWithIdentifier: (NSString*) newIdentifier staminaRate: (double) newStaminaRate keeperRate: (double) newKeeperRate playmakingRate: (double) newPlaymakingRate scorerRate: (double) newScorerRate passingRate: (double) newPassingRate wingerRate: (double) newWingerRate ! defenderRate: (double) newDefenderRate setPiecesRate: (double) newSetPiecesRate ! playerFormRate: (double) newPlayerFormRate experienceRate: (double) newExperienceRate { self = [super init]; identifier = [newIdentifier copy]; --- 124,157 ---- passingRate:0.32 wingerRate:0 defenderRate:0 setPiecesRate:0]; } + */ ! -(Position*) initFromUserDefaults: (NSString*) newIdentifier { ! NSArray *values = [[NSUserDefaults standardUserDefaults] arrayForKey:newIdentifier]; ! if(!values) { ! return nil; ! } ! else { ! self = [super init]; ! identifier = newIdentifier; ! playerFormRate = [[values objectAtIndex:0] doubleValue]; ! experienceRate = [[values objectAtIndex:1] doubleValue]; ! staminaRate = [[values objectAtIndex:2] doubleValue]; ! keeperRate = [[values objectAtIndex:3]doubleValue]; ! playmakingRate = [[values objectAtIndex:4] doubleValue]; ! passingRate = [[values objectAtIndex:5] doubleValue]; ! wingerRate = [[values objectAtIndex:6] doubleValue]; ! defenderRate = [[values objectAtIndex:7] doubleValue]; ! scorerRate = [[values objectAtIndex:8] doubleValue]; ! setPiecesRate = [[values objectAtIndex:9] doubleValue]; ! return self; ! } ! } - (Position*) initWithIdentifier: (NSString*) newIdentifier + playerFormRate: (double) newPlayerFormRate experienceRate: (double) newExperienceRate staminaRate: (double) newStaminaRate keeperRate: (double) newKeeperRate playmakingRate: (double) newPlaymakingRate scorerRate: (double) newScorerRate passingRate: (double) newPassingRate wingerRate: (double) newWingerRate ! defenderRate: (double) newDefenderRate setPiecesRate: (double) newSetPiecesRate { self = [super init]; identifier = [newIdentifier copy]; *************** *** 199,204 **** --- 229,254 ---- } + + -(void) saveToUserDefaults { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSArray *array = [NSArray arrayWithObjects: + [NSNumber numberWithDouble:playerFormRate], + [NSNumber numberWithDouble:experienceRate], + [NSNumber numberWithDouble:staminaRate], + [NSNumber numberWithDouble:keeperRate], + [NSNumber numberWithDouble:playmakingRate], + [NSNumber numberWithDouble:passingRate], + [NSNumber numberWithDouble:wingerRate], + [NSNumber numberWithDouble:defenderRate], + [NSNumber numberWithDouble:scorerRate], + [NSNumber numberWithDouble:setPiecesRate],nil]; + [[NSUserDefaults standardUserDefaults] setObject:array forKey:[self identifier]]; + [pool release]; + } + -(BOOL) isEqual:(id) anObject { return [identifier isEqualToString:[anObject identifier]] && + playerFormRate == [anObject playerFormRate] && + experienceRate == [anObject experienceRate] && staminaRate == [anObject staminaRate] && keeperRate == [anObject keeperRate] && *************** *** 211,238 **** } + (NSArray*) possiblePositions { NSArray *positions = [NSArray arrayWithObjects: ! [Position positionKeeper], ! [Position positionCentralDefender], ! [Position positionCentralDefenderTowardsWing], ! [Position positionCentralDefenderOffensive], ! [Position positionWingback], ! [Position positionWingbackOffensive], ! [Position positionWingbackDefensive], ! [Position positionWingbackTowardsMiddle], ! [Position positionInnerMidfield], ! [Position positionInnerMidfieldDefensive], ! [Position positionInnerMidfieldOffensive], ! [Position positionInnerMidfieldTowardsWing], ! [Position positionWinger], ! [Position positionWingerDefensive], ! [Position positionWingerOffensive], ! [Position positionWingerTowardsMiddle], ! [Position positionForward], ! [Position positionForwardDefensive], nil]; return positions; } - (void)dealloc { [identifier release]; --- 261,375 ---- } + + +(Position*) positionWithIdentifier: (NSString*) positionsIdentifier { + Position *pos = [positionsDictionary objectForKey:positionsIdentifier]; + if(!pos) { + pos= [Position defaultPositionWithIdentifier: positionsIdentifier]; + } + return pos; + } + + +(Position*) defaultPositionWithIdentifier: (NSString*) positionIdentifier { + return [defaultPositionsDictionary objectForKey: positionIdentifier]; + } + + (NSArray*) possiblePositions { NSArray *positions = [NSArray arrayWithObjects: ! [Position positionWithIdentifier:@"Keeper"], ! [Position positionWithIdentifier:@"Central Defender"], ! [Position positionWithIdentifier:@"Central Defender Towards Wing"], ! [Position positionWithIdentifier:@"Central Defender Offensive"], ! [Position positionWithIdentifier:@"Wingback"], ! [Position positionWithIdentifier:@"Wingback Offensive"], ! [Position positionWithIdentifier:@"Wingback Defensive"], ! [Position positionWithIdentifier:@"Wingback Towards Middle"], ! [Position positionWithIdentifier:@"Inner Midfield"], ! [Position positionWithIdentifier:@"Inner Midfield Defensive"], ! [Position positionWithIdentifier:@"Inner Midfield Offensive"], ! [Position positionWithIdentifier:@"Inner Midfield Towards Wing"], ! [Position positionWithIdentifier:@"Winger"], ! [Position positionWithIdentifier:@"Winger Defensive"], ! [Position positionWithIdentifier:@"Winger Offensive"], ! [Position positionWithIdentifier:@"Winger Towards Middle"], ! [Position positionWithIdentifier:@"Forward"], ! [Position positionWithIdentifier:@"Forward Defensive"], nil]; return positions; } + + (NSArray*) positionsIdentifiers { + return [NSArray arrayWithObjects:@"Keeper", + @"Central Defender",@"Central Defender Towards Wing",@"Central Defender Offensive", + @"Wingback",@"Wingback Towards Middle",@"Wingback Offensive",@"Wingback Defensive", + @"Inner Midfield",@"Inner Midfield Towards Wing",@"Inner Midfield Offensive" ,@"Inner Midfield Defensive", + @"Winger",@"Winger Towards Middle",@"Winger Offensive",@"Winger Defensive", + @"Forward",@"Forward Defensive",nil]; + + } + + (void) initialize { + [Position loadPositions]; + [Position loadDefaultPositions]; + } + + + + + (void) loadPositions { + positionsDictionary = [[NSMutableDictionary alloc]init]; + NSArray *keys = [Position positionsIdentifiers]; + NSEnumerator *en = [keys objectEnumerator]; + NSString *ident = nil; + while (ident = [en nextObject]) { + Position *pos = [[Position alloc] initFromUserDefaults: ident]; + if(pos) { + [positionsDictionary setValue:pos forKey:ident]; + [pos release]; + } + } + } + + + (void) loadDefaultPositions { + NSArray *keys = [Position positionsIdentifiers]; + NSArray *objects = [[NSArray alloc] initWithObjects: + [[Position alloc] initWithIdentifier:@"Keeper" staminaRate:0 keeperRate:1 playmakingRate:0 scorerRate:0 + passingRate:0 wingerRate:0 defenderRate:0 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Central Defender" staminaRate:0.1 keeperRate:0 playmakingRate:0.02 scorerRate:0 + passingRate:0.15 wingerRate:0 defenderRate:0.75 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Central Defender Towards Wing" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 + passingRate:0.1 wingerRate:0.15 defenderRate:0.65 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Central Defender Offensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 + passingRate:0.2 wingerRate:0 defenderRate:0.6 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Wingback" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 + passingRate:0.1 wingerRate:0.2 defenderRate:0.6 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Wingback Towards Middle" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0 + passingRate:0.08 wingerRate:0.17 defenderRate:0.65 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Wingback Offensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.1 scorerRate:0 + passingRate:0.2 wingerRate:0.25 defenderRate:0.35 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Wingback Defensive" staminaRate:0.05 keeperRate:0 playmakingRate:0 scorerRate:0 + passingRate:0.05 wingerRate:0.1 defenderRate:0.8 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Inner Midfield" staminaRate:0.25 keeperRate:0 playmakingRate:0.5 scorerRate:0 + passingRate:0.15 wingerRate:0 defenderRate:0.1 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Inner Midfield Towards Wing" staminaRate:0.2 keeperRate:0 playmakingRate:0.35 scorerRate:0 + passingRate:0.15 wingerRate:0.2 defenderRate:0.1 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Inner Midfield Offensive" staminaRate:0.2 keeperRate:0 playmakingRate:0.5 scorerRate:0 + passingRate:0.25 wingerRate:0 defenderRate:0.05 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Inner Midfield Defensive" staminaRate:0.15 keeperRate:0 playmakingRate:0.5 scorerRate:0 + passingRate:0.15 wingerRate:0 defenderRate:0.2 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Winger" staminaRate:0.15 keeperRate:0 playmakingRate:0.25 scorerRate:0 + passingRate:0.05 wingerRate:0.5 defenderRate:0.05 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Winger Towards Middle" staminaRate:0.15 keeperRate:0 playmakingRate:0.3 scorerRate:0 + passingRate:0.1 wingerRate:0.35 defenderRate:0.1 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Winger Offensive" staminaRate:0.15 keeperRate:0 playmakingRate:0.15 scorerRate:0 + passingRate:0.1 wingerRate:0.6 defenderRate:0 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Winger Defensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.2 scorerRate:0 + passingRate:0.1 wingerRate:0.35 defenderRate:0.25 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Forward" staminaRate:0.1 keeperRate:0 playmakingRate:0 scorerRate:0.6 + passingRate:0.3 wingerRate:0 defenderRate:0 setPiecesRate:0], + [[Position alloc] initWithIdentifier:@"Forward Defensive" staminaRate:0.1 keeperRate:0 playmakingRate:0.13 scorerRate:0.45 + passingRate:0.32 wingerRate:0 defenderRate:0 setPiecesRate:0], + nil]; + defaultPositionsDictionary = [[NSDictionary alloc] initWithObjects:objects forKeys:keys]; + [objects release]; + } + - (void)dealloc { [identifier release]; Index: LineUpController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** LineUpController.m 5 Dec 2004 21:50:44 -0000 1.16 --- LineUpController.m 24 Jan 2005 20:18:27 -0000 1.17 *************** *** 108,112 **** positions = [NSMutableArray arrayWithCapacity:11]; // keeper at index 0 ! [positions insertObject:[Position positionKeeper] atIndex:0]; // central defenders at index 1 and 2 [self loadCentralDefender]; --- 108,112 ---- positions = [NSMutableArray arrayWithCapacity:11]; // keeper at index 0 ! [positions insertObject:[Position positionWithIdentifier:@"Keeper"] atIndex:0]; // central defenders at index 1 and 2 [self loadCentralDefender]; *************** *** 123,131 **** - (NSArray*) substitutesPositions { NSMutableArray *subPositions = [NSMutableArray array]; ! [subPositions addObject: [Position positionKeeper]]; ! [subPositions addObject: [Position positionCentralDefender]]; ! [subPositions addObject: [Position positionInnerMidfield]]; ! [subPositions addObject: [Position positionWinger]]; ! [subPositions addObject: [Position positionForward]]; return subPositions; } --- 123,131 ---- - (NSArray*) substitutesPositions { NSMutableArray *subPositions = [NSMutableArray array]; ! [subPositions addObject: [Position positionWithIdentifier:@"Keeper"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Central Defender"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Inner Midfield"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Winger"]]; ! [subPositions addObject: [Position positionWithIdentifier:@"Forward"]]; return subPositions; } *************** *** 133,158 **** - (void) loadForward { if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionForward] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionForwardDefensive] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:9]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionForward] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionForwardDefensive] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:10]; } } --- 133,158 ---- - (void) loadForward { if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward Defensive"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:9]; } if([[specForward1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:9]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward Defensive"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:10]; } if([[specForward2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:10]; } } *************** *** 160,235 **** - (void) loadWinger { if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWinger] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWingerOffensive] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWingerDefensive] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWingerTowardsMiddle] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:7]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWinger] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWingerOffensive] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWingerDefensive] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWingerTowardsMiddle] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:8]; } } - (void) loadInnerMidfield { if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionInnerMidfieldOffensive] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionInnerMidfieldDefensive] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionInnerMidfieldTowardsWing] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:5]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionInnerMidfieldOffensive] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionInnerMidfieldDefensive] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionInnerMidfieldTowardsWing] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:6]; } } --- 160,235 ---- - (void) loadWinger { if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Offensive"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Defensive"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Towards Middle"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:7]; } if([[specRightWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:7]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Offensive"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Defensive"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Winger Towards Middle"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:8]; } if([[specLeftWinger titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:8]; } } - (void) loadInnerMidfield { if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:5]; } if([[specInnerMidfield1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:5]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Offensive"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Defensive"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield Towards Wing"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:6]; } if([[specInnerMidfield2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Central Defender",@"Extra Central Defender")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:6]; } } *************** *** 238,275 **** - (void) loadBackWings { if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWingback] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWingbackOffensive] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWingbackDefensive] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWingbackTowardsMiddle] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:3]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWingback] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWingbackOffensive] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWingbackDefensive] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWingbackTowardsMiddle] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:4]; } } --- 238,275 ---- - (void) loadBackWings { if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Offensive"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Defensive"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Towards Middle"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:3]; } if([[specRightBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:3]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Offensive"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Defensive",@"Defensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Defensive"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Middle",@"Towards Middle")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Wingback Towards Middle"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:4]; } if([[specLeftBack titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:4]; } } *************** *** 277,308 **** - (void) loadCentralDefender { if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionCentralDefenderOffensive] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionCentralDefenderTowardsWing] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:1]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionCentralDefender] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionCentralDefenderOffensive] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionCentralDefenderTowardsWing] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionForward] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionInnerMidfield] atIndex:2]; } } --- 277,308 ---- - (void) loadCentralDefender { if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Offensive"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:1]; } if([[specCentralDefender1 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:1]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Normal",@"Normal")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Offensive",@"Offensive")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Offensive"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Towards Wing",@"Towards Wing")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Central Defender Towards Wing"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Forward",@"Extra Forward")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Forward"] atIndex:2]; } if([[specCentralDefender2 titleOfSelectedItem] isEqualToString: NSLocalizedString(@"Extra Inner Midfield",@"Extra Inner Midfield")]) { ! [positions insertObject:[Position positionWithIdentifier:@"Inner Midfield"] atIndex:2]; } } Index: Player-Sorting.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player-Sorting.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Player-Sorting.m 10 Jan 2005 21:43:45 -0000 1.5 --- Player-Sorting.m 24 Jan 2005 20:18:29 -0000 1.6 *************** *** 37,40 **** --- 37,41 ---- } + /* -(NSComparisonResult) staminaSkillComparison: (Player*) otherPlayer { int result =[self intComparison: otherPlayer identifier: @"staminaSkill"]; *************** *** 65,73 **** return result; } -(NSComparisonResult) setPiecesSkillComparison: (Player*) otherPlayer{ int result =[self intComparison: otherPlayer identifier: @"setPiecesSkill"]; return result; } ! -(NSComparisonResult) injuryLevelComparison: (Player*) otherPlayer{ int result =[self intComparison: otherPlayer identifier: @"injuryLevel"]; --- 66,75 ---- return result; } + */ -(NSComparisonResult) setPiecesSkillComparison: (Player*) otherPlayer{ int result =[self intComparison: otherPlayer identifier: @"setPiecesSkill"]; return result; } ! /* -(NSComparisonResult) injuryLevelComparison: (Player*) otherPlayer{ int result =[self intComparison: otherPlayer identifier: @"injuryLevel"]; *************** *** 90,94 **** } ! -(NSComparisonResult) intComparison: (Player*) otherPlayer identifier: (NSString*) identifier { --- 92,96 ---- } ! */ -(NSComparisonResult) intComparison: (Player*) otherPlayer identifier: (NSString*) identifier { *************** *** 111,114 **** --- 113,117 ---- + /* -(NSComparisonResult) positionKeeperComparison: (Player*) otherPlayer { int result = [self compareDouble: [self calculatePositionValue: [Position positionKeeper]] *************** *** 201,204 **** --- 204,208 ---- return result; } + */ -(int) compareDouble: (double) myValue otherDouble: (double) otherValue { *************** *** 209,211 **** --- 213,216 ---- else NSOrderedSame; } + @end Index: Position.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Position.h 20 Jan 2005 20:46:01 -0000 1.5 --- Position.h 24 Jan 2005 20:18:29 -0000 1.6 *************** *** 32,35 **** --- 32,37 ---- @interface Position : NSObject { NSString *identifier; + double playerFormRate; + double experienceRate; double staminaRate; double keeperRate; *************** *** 40,47 **** double scorerRate; double setPiecesRate; ! double playerFormRate; ! double experienceRate; } - (Position*) initWithIdentifier: (NSString*) newIdentifier staminaRate: (double) newStaminaRate keeperRate: (double) newKeeperRate --- 42,54 ---- double scorerRate; double setPiecesRate; ! } + /*! + @method initFromUserDefaults: newIdentifier + @abstract init a Position from the user defaults. Returns nil if no values are found in the user defaults + */ + -(Position*) initFromUserDefaults: (NSString*) newIdentifier; + - (Position*) initWithIdentifier: (NSString*) newIdentifier staminaRate: (double) newStaminaRate keeperRate: (double) newKeeperRate *************** *** 51,60 **** - (Position*) initWithIdentifier: (NSString*) newIdentifier ! staminaRate: (double) newStaminaRate keeperRate: (double) newKeeperRate playmakingRate: (double) newPlaymakingRate scorerRate: (double) newScorerRate passingRate: (double) newPassingRate wingerRate: (double) newWingerRate ! defenderRate: (double) newDefenderRate setPiecesRate: (double) newSetPiecesRate ! playerFormRate: (double) newPlayerFormRate experienceRate: (double) newExperienceRate; ! - (NSString *)identifier; --- 58,67 ---- - (Position*) initWithIdentifier: (NSString*) newIdentifier ! playerFormRate: (double) newPlayerFormRate experienceRate: (double) newExperienceRate ! staminaRate: (double) newStaminaRate keeperRate: (double) newKeeperRate playmakingRate: (double) newPlaymakingRate scorerRate: (double) newScorerRate passingRate: (double) newPassingRate wingerRate: (double) newWingerRate ! defenderRate: (double) newDefenderRate setPiecesRate: (double) newSetPiecesRate; ! - (NSString *)identifier; *************** *** 72,75 **** --- 79,89 ---- -(BOOL) isEqual:(id) anObject; + -(void) saveToUserDefaults; + + +(Position*) positionWithIdentifier: (NSString*) positionsIdentifier; + +(Position*) defaultPositionWithIdentifier: (NSString*) positionIdentifier; + + (NSArray*) positionsIdentifiers; + + /* + (Position*) positionKeeper; + (Position*) positionCentralDefender; *************** *** 91,95 **** + (Position*) positionForwardDefensive; + (NSArray*) possiblePositions; ! --- 105,109 ---- + (Position*) positionForwardDefensive; + (NSArray*) possiblePositions; ! */ Index: Player-Sorting.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player-Sorting.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Player-Sorting.h 4 Jun 2004 08:22:10 -0000 1.3 --- Player-Sorting.h 24 Jan 2005 20:18:28 -0000 1.4 *************** *** 31,35 **** --- 31,38 ---- @interface Player(Sorting) + -(NSComparisonResult) playerNameComparison: (Player*) otherPlayer; + + /* -(NSComparisonResult) staminaSkillComparison: (Player*) otherPlayer; -(NSComparisonResult) keeperSkillComparison: (Player*) otherPlayer; *************** *** 39,47 **** -(NSComparisonResult) wingerSkillComparison: (Player*) otherPlayer; -(NSComparisonResult) defenderSkillComparison: (Player*) otherPlayer; -(NSComparisonResult) setPiecesSkillComparison: (Player*) otherPlayer; ! -(NSComparisonResult) injuryLevelComparison: (Player*) otherPlayer; -(NSComparisonResult) ageComparison: (Player*) otherPlayer; -(NSComparisonResult) teamCaptainComparison: (Player*) otherPlayer; ! -(NSComparisonResult) positionKeeperComparison: (Player*) otherPlayer; -(NSComparisonResult) positionCentralDefenderComparison: (Player*) otherPlayer; -(NSComparisonResult) positionCentralDefenderOffensiveComparison: (Player*) otherPlayer; --- 42,55 ---- -(NSComparisonResult) wingerSkillComparison: (Player*) otherPlayer; -(NSComparisonResult) defenderSkillComparison: (Player*) otherPlayer; + */ -(NSComparisonResult) setPiecesSkillComparison: (Player*) otherPlayer; ! /*-(NSComparisonResult) injuryLevelComparison: (Player*) otherPlayer; -(NSComparisonResult) ageComparison: (Player*) otherPlayer; + */ -(NSComparisonResult) teamCaptainComparison: (Player*) otherPlayer; ! ! static int comparePosition(id player1, id player2, void *positionIdentifier); ! ! /*-(NSComparisonResult) positionKeeperComparison: (Player*) otherPlayer; -(NSComparisonResult) positionCentralDefenderComparison: (Player*) otherPlayer; -(NSComparisonResult) positionCentralDefenderOffensiveComparison: (Player*) otherPlayer; *************** *** 61,65 **** -(NSComparisonResult) positionForwardComparison: (Player*) otherPlayer; -(NSComparisonResult) positionForwardDefensiveComparison: (Player*) otherPlayer; ! --- 69,73 ---- -(NSComparisonResult) positionForwardComparison: (Player*) otherPlayer; -(NSComparisonResult) positionForwardDefensiveComparison: (Player*) otherPlayer; ! */ Index: PlayerDetailsController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerDetailsController.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerDetailsController.m 18 Jan 2005 21:05:46 -0000 1.6 --- PlayerDetailsController.m 24 Jan 2005 20:18:29 -0000 1.7 *************** *** 102,107 **** - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex{ ! SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); ! id position = [Position performSelector: selector]; return [NSNumber numberWithDouble: [tryPlayer calculatePositionValue:position]]; } --- 102,109 ---- - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex{ ! SEL selector =@selector(positionWithIdentifier:); ! id position = [Position performSelector:selector withObject:[aTableColumn identifier] ]; ! //SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); ! //id position = [Position performSelector: selector]; return [NSNumber numberWithDouble: [tryPlayer calculatePositionValue:position]]; } Index: PositionsController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PositionsController.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PositionsController.m 18 Jan 2005 19:37:28 -0000 1.6 --- PositionsController.m 24 Jan 2005 20:18:30 -0000 1.7 *************** *** 29,32 **** --- 29,33 ---- #import "PositionsController.h" #import "MainController.h" + #import "Position.h" @implementation PositionsController *************** *** 63,68 **** } else { ! SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); ! id position = [Position performSelector: selector]; return [NSNumber numberWithDouble: [player calculatePositionValue:position]]; } --- 64,70 ---- } else { ! // SEL selector = NSSelectorFromString([NSString stringWithFormat:@"position%s",[[aTableColumn identifier] cString]]); ! SEL selector =@selector(positionWithIdentifier:); ! id position = [Position performSelector:selector withObject:[aTableColumn identifier] ]; return [NSNumber numberWithDouble: [player calculatePositionValue:position]]; } *************** *** 92,101 **** if([[tableColumn identifier] isEqualToString:@"playerName"]) { columnSortSelector = NSSelectorFromString(@"playerNameComparison:"); } else { ! columnSortSelector = NSSelectorFromString([NSString ! stringWithFormat: @"position%@Comparison:",[tableColumn identifier]]); } ! [[team playerList] sortUsingSelector: columnSortSelector]; } [tableView setIndicatorImage: (sortDescending ? --- 94,106 ---- if([[tableColumn identifier] isEqualToString:@"playerName"]) { columnSortSelector = NSSelectorFromString(@"playerNameComparison:"); + [[team playerList] sortUsingSelector: columnSortSelector]; } else { ! [[[team playerList] playerList] sortUsingFunction: comparePosition context:[tableColumn identifier]]; ! // columnSortSelector = NSSelectorFromString([NSString ! // stringWithFormat: @"position%@Comparison:",[tableColumn identifier]]); ! } ! } [tableView setIndicatorImage: (sortDescending ? *************** *** 106,109 **** --- 111,121 ---- } + static int comparePosition(id player1, id player2, void *positionIdentifier){ + NSString *positionID = positionIdentifier; + int result = [player1 compareDouble: [player1 calculatePositionValue: [Position positionWithIdentifier:positionID]] + otherDouble: [player2 calculatePositionValue: [Position positionWithIdentifier:positionID]]]; + return result; + } + -(Player*) selectedPlayer { int selected = [positionsTable selectedRow]; |
|
From: Geisschaes <gei...@us...> - 2005-01-24 20:21:34
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PositionTableView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323/English.lproj/PositionTableView.nib Modified Files: info.nib keyedobjects.nib Log Message: new positions philosophy added Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PositionTableView.nib/info.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** info.nib 18 Jan 2005 12:16:41 -0000 1.2 --- info.nib 24 Jan 2005 20:18:50 -0000 1.3 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>93 76 356 240 0 0 1600 1002 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>253 353 854 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>69 59 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>226 305 827 517 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PositionTableView.nib/keyedobjects.nib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsi5F7rP and /tmp/cvs2z4aMR differ |
|
From: Geisschaes <gei...@us...> - 2005-01-24 20:21:33
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: new positions philosophy added Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** roman.mode1 20 Jan 2005 20:46:05 -0000 1.16 --- roman.mode1 24 Jan 2005 20:18:51 -0000 1.17 *************** *** 206,211 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 206,209 ---- *************** *** 244,247 **** --- 242,246 ---- <array> <string>29B97314FDCFA39411CA2CEA</string> + <string>30B355F80690131C00571DE8</string> <string>1C37FBAC04509CD000000102</string> </array> *************** *** 269,273 **** </array> <key>RubberWindowFrame</key> ! <string>132 136 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 268,272 ---- </array> <key>RubberWindowFrame</key> ! <string>93 169 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 285,289 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 284,288 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 293,299 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>bookmark</key> ! <string>3031CB6607A04FA0006539CD</string> <key>history</key> <array> --- 292,298 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.m</string> <key>bookmark</key> ! <string>3021F7F607A58EF00073597B</string> <key>history</key> <array> *************** *** 303,307 **** <string>30ADE256078B19040012CF83</string> <string>30ADE259078B19040012CF83</string> - <string>30ADE266078B19140012CF83</string> <string>30ADE271078B19D30012CF83</string> <string>30E8345A078DAC7600274608</string> --- 302,305 ---- *************** *** 312,316 **** <string>303B4FB90791C8710056E135</string> <string>306095380792FF3E00BAA4CF</string> - <string>3060954F0793022800BAA4CF</string> <string>306095500793022800BAA4CF</string> <string>306095510793022800BAA4CF</string> --- 310,313 ---- *************** *** 324,328 **** <string>30609625079318BE00BAA4CF</string> <string>30609626079318BE00BAA4CF</string> - <string>30609627079318BE00BAA4CF</string> <string>306096300793190400BAA4CF</string> <string>306096310793190400BAA4CF</string> --- 321,324 ---- *************** *** 335,345 **** <string>306096AB0793218900BAA4CF</string> <string>306096C2079325B700BAA4CF</string> - <string>306096C3079325B700BAA4CF</string> <string>306096C4079325B700BAA4CF</string> - <string>306F7F860799269A00FC68E8</string> <string>306F7F9707992C5300FC68E8</string> <string>306F7F9F07992D0F00FC68E8</string> <string>306F80EB079973E600FC68E8</string> - <string>306F81920799866E00FC68E8</string> <string>306F81940799866E00FC68E8</string> <string>306F81B00799875200FC68E8</string> --- 331,338 ---- *************** *** 352,356 **** <string>304A3CB4079AD56A00358038</string> <string>3063E94B079AE9F8003DF28B</string> - <string>3063E94C079AE9F8003DF28B</string> <string>30E7ABB1079DA8B400E048FC</string> <string>30E7ABB2079DA8B400E048FC</string> --- 345,348 ---- *************** *** 361,368 **** <string>3031CB2307A04526006539CD</string> <string>3031CB3407A0495A006539CD</string> - <string>3031CB3F07A04A5B006539CD</string> <string>3031CB4007A04A5B006539CD</string> <string>3031CB5107A04D53006539CD</string> ! <string>3031CB5207A04D53006539CD</string> </array> <key>prevStack</key> --- 353,370 ---- <string>3031CB2307A04526006539CD</string> <string>3031CB3407A0495A006539CD</string> <string>3031CB4007A04A5B006539CD</string> <string>3031CB5107A04D53006539CD</string> ! <string>30557D3207A25F0800D5CE02</string> ! <string>30557D3407A25F0800D5CE02</string> ! <string>30557D5407A26C7200D5CE02</string> ! <string>3021F76107A56A290073597B</string> ! <string>3021F76207A56A290073597B</string> ! <string>3021F78507A56FCE0073597B</string> ! <string>3021F79F07A575590073597B</string> ! <string>3021F7A707A576490073597B</string> ! <string>3021F7DD07A57D510073597B</string> ! <string>3021F7DE07A57D510073597B</string> ! <string>3021F7E407A5810F0073597B</string> ! <string>3021F7E507A5810F0073597B</string> </array> <key>prevStack</key> *************** *** 431,444 **** <string>30E7AB84079DA09500E048FC</string> <string>30E7ABB4079DA8B400E048FC</string> - <string>3031CB1207A043C6006539CD</string> <string>3031CB1307A043C6006539CD</string> - <string>3031CB1407A043C6006539CD</string> <string>3031CB1507A043C6006539CD</string> - <string>3031CB2107A0449D006539CD</string> - <string>3031CB2407A04526006539CD</string> - <string>3031CB3507A0495A006539CD</string> - <string>3031CB4207A04A5B006539CD</string> - <string>3031CB4307A04A5B006539CD</string> <string>3031CB5307A04D53006539CD</string> </array> </dict> --- 433,450 ---- <string>30E7AB84079DA09500E048FC</string> <string>30E7ABB4079DA8B400E048FC</string> <string>3031CB1307A043C6006539CD</string> <string>3031CB1507A043C6006539CD</string> <string>3031CB5307A04D53006539CD</string> + <string>30557D5607A26C7200D5CE02</string> + <string>3021F76307A56A290073597B</string> + <string>3021F76407A56A290073597B</string> + <string>3021F77107A56B2D0073597B</string> + <string>3021F78807A56FCE0073597B</string> + <string>3021F78907A56FCE0073597B</string> + <string>3021F7A107A575590073597B</string> + <string>3021F7A907A576490073597B</string> + <string>3021F7DF07A57D510073597B</string> + <string>3021F7E007A57D510073597B</string> + <string>3021F7E607A5810F0073597B</string> </array> </dict> *************** *** 454,458 **** <string>{{0, 0}, {727, 356}}</string> <key>RubberWindowFrame</key> ! <string>132 136 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 460,464 ---- <string>{{0, 0}, {727, 356}}</string> <key>RubberWindowFrame</key> ! <string>93 169 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 474,478 **** <string>{{0, 363}, {727, 258}}</string> <key>RubberWindowFrame</key> ! <string>132 136 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 480,484 ---- <string>{{0, 363}, {727, 258}}</string> <key>RubberWindowFrame</key> ! <string>93 169 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 498,504 **** <key>TableOfContents</key> <array> ! <string>3031CAFA07A04357006539CD</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3031CAFB07A04357006539CD</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 504,510 ---- <key>TableOfContents</key> <array> ! <string>3021F76607A56A290073597B</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3021F76707A56A290073597B</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 528,538 **** <key>WindowOrderList</key> <array> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>303B68B1075A0D24009951CC</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3031CB3B07A049D0006539CD</string> </array> <key>WindowString</key> ! <string>132 136 1072 663 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 534,548 ---- <key>WindowOrderList</key> <array> ! <string>303B689D075A03FF009951CC</string> ! <string>3021F76907A56A290073597B</string> ! <string>1CD10A99069EF8BA00B06720</string> <string>303B68B1075A0D24009951CC</string> + <string>1C530D57069F1CE1000CFCEE</string> + <string>3021F77307A56B2D0073597B</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>93 169 1072 663 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 553,557 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>MainWindowController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 563,567 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 561,565 **** <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>MainWindowController.m</string> </dict> <key>SplitCount</key> --- 571,581 ---- <string>1CD052900623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Position.m</string> ! <key>bookmark</key> ! <string>3021F7F707A58EF00073597B</string> ! <key>history</key> ! <array> ! <string>30557DC007A27E4100D5CE02</string> ! </array> </dict> <key>SplitCount</key> *************** *** 623,627 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>3031CB3A07A049D0006539CD</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 639,643 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>3021F7C907A57AF20073597B</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 663,668 **** <key>sizes</key> <array> ! <string>{{0, 0}, {240, 242}}</string> ! <string>{{240, 0}, {649, 242}}</string> </array> </dict> --- 679,684 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {222, 242}}</string> ! <string>{{222, 0}, {667, 242}}</string> </array> </dict> *************** *** 689,693 **** <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Test)</string> </dict> <key>GeometryConfiguration</key> --- 705,709 ---- <string>1C162984064C10D400B95A72</string> <key>PBXProjectModuleLabel</key> ! <string>Debug - Macattrick (Macattrick)</string> </dict> <key>GeometryConfiguration</key> *************** *** 704,708 **** <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>315 186 889 609 0 0 1280 832 </string> </dict> <key>Module</key> --- 720,724 ---- <string>{{0, 0}, {889, 567}}</string> <key>RubberWindowFrame</key> ! <string>287 217 889 609 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 727,738 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>306F7FD907993FD400FC68E8</string> <string>1C162984064C10D400B95A72</string> ! <string>306F7FDA07993FD400FC68E8</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>315 186 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> --- 743,754 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3021F76807A56A290073597B</string> <string>1C162984064C10D400B95A72</string> ! <string>3021F76907A56A290073597B</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>287 217 889 609 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> *************** *** 759,763 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>World.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 775,779 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 767,781 **** <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>World.m</string> <key>bookmark</key> ! <string>306F821E07998C8400FC68E8</string> <key>history</key> <array> ! <string>306096BB0793239E00BAA4CF</string> ! <string>3060973D07932E9300BAA4CF</string> </array> <key>prevStack</key> <array> ! <string>306096BD0793239E00BAA4CF</string> </array> </dict> --- 783,803 ---- <string>1CD0528D0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Player-Sorting.h</string> <key>bookmark</key> ! <string>3021F7F807A58EF00073597B</string> <key>history</key> <array> ! <string>3021F7B207A579B20073597B</string> ! <string>3021F7CA07A57AF20073597B</string> ! <string>3021F7D007A57B8C0073597B</string> ! <string>3021F7D107A57B8C0073597B</string> ! <string>3021F7D207A57B8C0073597B</string> </array> <key>prevStack</key> <array> ! <string>3021F7B407A579B20073597B</string> ! <string>3021F7CB07A57AF20073597B</string> ! <string>3021F7D307A57B8C0073597B</string> ! <string>3021F7D407A57B8C0073597B</string> </array> </dict> *************** *** 791,795 **** <string>{{0, 0}, {781, 191}}</string> <key>RubberWindowFrame</key> ! <string>456 250 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 813,817 ---- <string>{{0, 0}, {781, 191}}</string> <key>RubberWindowFrame</key> ! <string>271 209 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 803,806 **** --- 825,830 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 815,819 **** <string>{{0, 198}, {781, 230}}</string> <key>RubberWindowFrame</key> ! <string>456 250 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 839,843 ---- <string>{{0, 198}, {781, 230}}</string> <key>RubberWindowFrame</key> ! <string>271 209 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 838,852 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>306F807007996D9200FC68E8</string> ! <string>306F807107996D9200FC68E8</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>456 250 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 862,876 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>3021F7B607A579B20073597B</string> ! <string>3021F7B707A579B20073597B</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>271 209 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 877,881 **** <string>{{0, 0}, {440, 358}}</string> <key>RubberWindowFrame</key> ! <string>57 381 440 400 0 0 1280 832 </string> </dict> <key>Module</key> --- 901,905 ---- <string>{{0, 0}, {440, 358}}</string> <key>RubberWindowFrame</key> ! <string>736 124 440 400 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 900,908 **** <array> <string>303B689D075A03FF009951CC</string> ! <string>306F7FDB07993FD400FC68E8</string> <string>1C78EAAC065D492600B07095</string> </array> <key>WindowString</key> ! <string>57 381 440 400 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B689D075A03FF009951CC</string> --- 924,932 ---- <array> <string>303B689D075A03FF009951CC</string> ! <string>3021F7C107A57A2B0073597B</string> <string>1C78EAAC065D492600B07095</string> </array> <key>WindowString</key> ! <string>736 124 440 400 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>303B689D075A03FF009951CC</string> *************** *** 943,948 **** <key>sizes</key> <array> ! <string>{{0, 0}, {493, 167}}</string> ! <string>{{0, 176}, {493, 267}}</string> </array> </dict> --- 967,972 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {491, 167}}</string> ! <string>{{0, 176}, {491, 267}}</string> </array> </dict> *************** *** 968,983 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {478, 194}}</string> <key>RubberWindowFrame</key> ! <string>302 184 478 236 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>194pt</string> </dict> </array> <key>Proportion</key> ! <string>194pt</string> </dict> </array> --- 992,1007 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {633, 216}}</string> <key>RubberWindowFrame</key> ! <string>206 282 633 258 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXRunSessionModule</string> <key>Proportion</key> ! <string>216pt</string> </dict> </array> <key>Proportion</key> ! <string>216pt</string> </dict> </array> *************** *** 993,1004 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3031CB2D07A0463B006539CD</string> <string>1CD0528B0623707200166675</string> ! <string>3031CB2E07A0463B006539CD</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>302 184 478 236 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1017,1028 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3021F76A07A56A290073597B</string> <string>1CD0528B0623707200166675</string> ! <string>3021F76B07A56A290073597B</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>206 282 633 258 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** roman.pbxuser 20 Jan 2005 20:46:06 -0000 1.81 --- roman.pbxuser 24 Jan 2005 20:18:54 -0000 1.82 *************** *** 39,44 **** 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30744BA4069560A70039B82A; addToTargets = ( 30744BA4069560A70039B82A, --- 39,44 ---- 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; ! activeExecutable = 30950684067C4D100077C270; [...2123 lines suppressed...] 30D9FB5A0645030C00390F49 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {680, 1427}}"; ! sepNavSelRange = "{2666, 0}"; ! sepNavVisRect = "{{0, 370}, {680, 324}}"; }; }; *************** *** 3581,3585 **** name = WingerTowardsMiddle; rLen = 19; ! rLoc = 5449; rType = 0; vrLen = 1250; --- 4891,4895 ---- name = WingerTowardsMiddle; rLen = 19; ! rLoc = 5643; rType = 0; vrLen = 1250; |
|
From: Geisschaes <gei...@us...> - 2005-01-24 20:21:33
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1323/English.lproj/PlayerDetails.nib Modified Files: keyedobjects.nib Log Message: new positions philosophy added Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PlayerDetails.nib/keyedobjects.nib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 Binary files /tmp/cvsCVZQhL and /tmp/cvsJfaZ3L differ |
|
From: Gfive <gf...@us...> - 2005-01-21 08:06:14
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8842/English.lproj/PreferencesPanel.nib Modified Files: keyedobjects.nib Log Message: Interface changes, Preferences Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvswsekt6 and /tmp/cvs3nMOrS differ |
|
From: Gfive <gf...@us...> - 2005-01-21 07:58:29
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7179/English.lproj/PreferencesPanel.nib Modified Files: info.nib keyedobjects.nib Log Message: Interface changes, Preferences Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/info.nib,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** info.nib 20 Jan 2005 20:46:03 -0000 1.7 --- info.nib 21 Jan 2005 07:58:17 -0000 1.8 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>69 100 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>93 129 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsPaRLWk and /tmp/cvsZNPxko differ |
|
From: Geisschaes <gei...@us...> - 2005-01-20 20:46:44
|
Update of /cvsroot/macattrick/macattrick/English.lproj/TeamInfoView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25064/English.lproj/TeamInfoView.nib Modified Files: keyedobjects.nib Log Message: formulas view added to preference panel, team logo loading added Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/TeamInfoView.nib/keyedobjects.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvspT6Wti and /tmp/cvsug1wHl differ |
|
From: Geisschaes <gei...@us...> - 2005-01-20 20:46:43
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25064/English.lproj/PreferencesPanel.nib Modified Files: classes.nib info.nib keyedobjects.nib Log Message: formulas view added to preference panel, team logo loading added Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/info.nib,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** info.nib 19 Jan 2005 08:29:03 -0000 1.6 --- info.nib 20 Jan 2005 20:46:03 -0000 1.7 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>93 129 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>69 100 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> Index: classes.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/classes.nib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** classes.nib 2 Jul 2004 11:33:37 -0000 1.1 --- classes.nib 20 Jan 2005 20:46:03 -0000 1.2 *************** *** 6,10 **** CLASS = PreferencesController; LANGUAGE = ObjC; ! OUTLETS = {userDefaultsController = NSUserDefaultsController; }; SUPERCLASS = NSWindowController; } --- 6,10 ---- CLASS = PreferencesController; LANGUAGE = ObjC; ! OUTLETS = {tabView = NSTabView; userDefaultsController = NSUserDefaultsController; }; SUPERCLASS = NSWindowController; } Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 Binary files /tmp/cvs6sPhjx and /tmp/cvscYaaUz differ |
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25064 Modified Files: Position.h Position.m PreferencesController.h PreferencesController.m Team.h Team.m Added Files: FormulasViewController.h FormulasViewController.m Log Message: formulas view added to preference panel, team logo loading added Index: Position.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Position.m 22 Jul 2004 11:54:01 -0000 1.5 --- Position.m 20 Jan 2005 20:46:01 -0000 1.6 *************** *** 161,164 **** --- 161,170 ---- } + - (double) playerFormRate { return playerFormRate; } + + + - (double) experienceRate { return experienceRate; } + + - (double)staminaRate { return staminaRate; --- NEW FILE: FormulasViewController.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Cocoa/Cocoa.h> @interface FormulasViewController : NSObject { IBOutlet NSView *formulasView; } - (NSView *) formulasView; @end Index: PreferencesController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PreferencesController.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PreferencesController.h 27 Jul 2004 19:32:28 -0000 1.2 --- PreferencesController.h 20 Jan 2005 20:46:01 -0000 1.3 *************** *** 28,35 **** --- 28,39 ---- #import <Cocoa/Cocoa.h> + #import "FormulasViewController.h" @interface PreferencesController : NSWindowController { IBOutlet NSUserDefaultsController *userDefaultsController; + FormulasViewController *formulasViewController; + IBOutlet NSTabView *tabView; + } - (IBAction)cancel:(id)sender; Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Team.m 4 Jan 2005 18:23:29 -0000 1.19 --- Team.m 20 Jan 2005 20:46:01 -0000 1.20 *************** *** 38,41 **** --- 38,42 ---- - (void) setNumberOfVictories: (int) newNumberOfVictories; - (void) setNumberOfUndefeated: (int) newNumberOfUndefeated; + - (void) setLogo: (NSImage *) newLogo; @end *************** *** 97,100 **** --- 98,108 ---- } + - (NSImage *) logo { return logo; } + - (void) setLogo: (NSImage *) newLogo { + [newLogo retain]; + [logo release]; + logo = newLogo; + } + *************** *** 165,168 **** --- 173,188 ---- [url release]; } + else if ([elementName isEqualToString: @"LogoURL"]) { + NSURL *url = [[NSURL alloc] initWithString: currentStringValue]; + NSImage *image; + if(url) { + image = [[NSImage alloc]initWithContentsOfURL:url]; + } + if(!url || !image) { + image = [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/icon.icns" , [[NSBundle mainBundle] resourcePath]]]; + } + [self setLogo:image]; + [image release]; + } [currentStringValue release]; currentStringValue = nil; --- NEW FILE: FormulasViewController.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "FormulasViewController.h" @implementation FormulasViewController -(FormulasViewController*) init { self = [super init]; [NSBundle loadNibNamed:@"FormulasView" owner: self]; return self; } - (NSView *) formulasView { return formulasView; } - (void) dealloc { [formulasView release]; [super dealloc]; } @end Index: Team.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Team.h 3 Oct 2004 12:33:47 -0000 1.13 --- Team.h 20 Jan 2005 20:46:01 -0000 1.14 *************** *** 46,50 **** NSString *teamName; NSURL *homepage; ! int numberOfVictories; int numberOfUndefeated; --- 46,50 ---- NSString *teamName; NSURL *homepage; ! NSImage *logo; int numberOfVictories; int numberOfUndefeated; *************** *** 86,90 **** */ - (NSURL *) homepage; ! /*! --- 86,94 ---- */ - (NSURL *) homepage; ! /*! ! @method logoURL ! @abstract URL of the Logo ! */ ! - (NSImage *) logo; /*! Index: PreferencesController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PreferencesController.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PreferencesController.m 27 Jul 2004 19:32:28 -0000 1.2 --- PreferencesController.m 20 Jan 2005 20:46:01 -0000 1.3 *************** *** 42,44 **** --- 42,60 ---- } + -(void) awakeFromNib { + if(!formulasViewController) { + formulasViewController = [[FormulasViewController alloc] init]; + } + [[tabView tabViewItemAtIndex:2] setView:[formulasViewController formulasView]]; + } + + + + - (void) dealloc { + [userDefaultsController release]; + [formulasViewController release]; + [super dealloc]; + } + + @end Index: Position.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Position.h 22 Jul 2004 11:54:01 -0000 1.4 --- Position.h 20 Jan 2005 20:46:01 -0000 1.5 *************** *** 58,61 **** --- 58,64 ---- - (NSString *)identifier; + + - (double) playerFormRate; + - (double) experienceRate; - (double)staminaRate; - (double)keeperRate; |
|
From: Geisschaes <gei...@us...> - 2005-01-20 20:46:42
|
Update of /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25064/English.lproj/FormulasView.nib Modified Files: classes.nib info.nib keyedobjects.nib Log Message: formulas view added to preference panel, team logo loading added Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/info.nib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** info.nib 13 Jan 2005 14:18:48 -0000 1.1 --- info.nib 20 Jan 2005 20:46:02 -0000 1.2 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>69 60 356 240 0 0 1600 1002 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>191 449 542 354 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>149 170 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>1848</key> ! <string>239 374 542 354 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> Index: classes.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/classes.nib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** classes.nib 13 Jan 2005 14:18:48 -0000 1.1 --- classes.nib 20 Jan 2005 20:46:02 -0000 1.2 *************** *** 1,4 **** { ! IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }); IBVersion = 1; } \ No newline at end of file --- 1,12 ---- { ! IBClasses = ( ! {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, ! { ! CLASS = FormulasViewController; ! LANGUAGE = ObjC; ! OUTLETS = {formulasView = NSView; }; ! SUPERCLASS = NSObject; ! } ! ); IBVersion = 1; } \ No newline at end of file Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/FormulasView.nib/keyedobjects.nib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsUGr3bY and /tmp/cvseQ51AZ differ |
|
From: Geisschaes <gei...@us...> - 2005-01-20 20:46:40
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25064/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: formulas view added to preference panel, team logo loading added Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** project.pbxproj 18 Jan 2005 19:37:51 -0000 1.62 --- project.pbxproj 20 Jan 2005 20:46:05 -0000 1.63 *************** *** 703,706 **** --- 703,746 ---- }; }; + 3031CB0807A043B0006539CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = FormulasViewController.h; + refType = 4; + sourceTree = "<group>"; + }; + 3031CB0907A043B0006539CD = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = FormulasViewController.m; + refType = 4; + sourceTree = "<group>"; + }; + 3031CB0A07A043B0006539CD = { + fileRef = 3031CB0807A043B0006539CD; + isa = PBXBuildFile; + settings = { + }; + }; + 3031CB0B07A043B0006539CD = { + fileRef = 3031CB0907A043B0006539CD; + isa = PBXBuildFile; + settings = { + }; + }; + 3031CB0C07A043B0006539CD = { + fileRef = 3031CB0807A043B0006539CD; + isa = PBXBuildFile; + settings = { + }; + }; + 3031CB0D07A043B0006539CD = { + fileRef = 3031CB0907A043B0006539CD; + isa = PBXBuildFile; + settings = { + }; + }; 303AED5406B01BE300D5DF46 = { isa = PBXFileReference; *************** *** 1815,1818 **** --- 1855,1859 ---- 30609699079320AC00BAA4CF, 306F818D079985BD00FC68E8, + 3031CB0A07A043B0006539CD, ); isa = PBXHeadersBuildPhase; *************** *** 2023,2026 **** --- 2064,2068 ---- 3060969A079320AC00BAA4CF, 306F818E079985BD00FC68E8, + 3031CB0B07A043B0006539CD, ); isa = PBXSourcesBuildPhase; *************** *** 3487,3490 **** --- 3529,3533 ---- 3060966107931CA900BAA4CF, 306F818F079985BD00FC68E8, + 3031CB0C07A043B0006539CD, ); isa = PBXHeadersBuildPhase; *************** *** 3683,3686 **** --- 3726,3730 ---- 3060966207931CA900BAA4CF, 306F8190079985BD00FC68E8, + 3031CB0D07A043B0006539CD, ); isa = PBXSourcesBuildPhase; *************** *** 4277,4280 **** --- 4321,4326 ---- 30BB2140067DC1CA00B1C71A = { children = ( + 3031CB0807A043B0006539CD, + 3031CB0907A043B0006539CD, 30ADE246078B17660012CF83, 30ADE247078B17660012CF83, Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** roman.mode1 18 Jan 2005 21:06:43 -0000 1.15 --- roman.mode1 20 Jan 2005 20:46:05 -0000 1.16 *************** *** 206,209 **** --- 206,211 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 247,251 **** <array> <array> ! <integer>1</integer> <integer>0</integer> </array> --- 249,253 ---- <array> <array> ! <integer>3</integer> <integer>0</integer> </array> *************** *** 267,271 **** </array> <key>RubberWindowFrame</key> ! <string>201 163 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 269,273 ---- </array> <key>RubberWindowFrame</key> ! <string>132 136 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 283,287 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>SpecialtyTransformer.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 285,289 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 291,305 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>SpecialtyTransformer.m</string> <key>bookmark</key> ! <string>30E7ABCD079DABCE00E048FC</string> <key>history</key> <array> - <string>307E086F0789E6ED00CCBC6B</string> <string>307E08700789E6ED00CCBC6B</string> <string>30ADE253078B19040012CF83</string> <string>30ADE254078B19040012CF83</string> <string>30ADE256078B19040012CF83</string> - <string>30ADE257078B19040012CF83</string> <string>30ADE259078B19040012CF83</string> <string>30ADE266078B19140012CF83</string> --- 293,305 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>bookmark</key> ! <string>3031CB6607A04FA0006539CD</string> <key>history</key> <array> <string>307E08700789E6ED00CCBC6B</string> <string>30ADE253078B19040012CF83</string> <string>30ADE254078B19040012CF83</string> <string>30ADE256078B19040012CF83</string> <string>30ADE259078B19040012CF83</string> <string>30ADE266078B19140012CF83</string> *************** *** 308,312 **** <string>30E8345B078DAC7600274608</string> <string>30E83717078DC6E100274608</string> - <string>30E83746078DCD8F00274608</string> <string>30D9FFE4078DDAEF00FBB745</string> <string>303B4FAE0791C65D0056E135</string> --- 308,311 ---- *************** *** 318,322 **** <string>306095AD07930A1200BAA4CF</string> <string>306095B007930A1200BAA4CF</string> - <string>306095DA07930BD100BAA4CF</string> <string>306095FE07930FBD00BAA4CF</string> <string>306095FF07930FBD00BAA4CF</string> --- 317,320 ---- *************** *** 355,363 **** <string>3063E94B079AE9F8003DF28B</string> <string>3063E94C079AE9F8003DF28B</string> - <string>30E7AB83079DA09500E048FC</string> <string>30E7ABB1079DA8B400E048FC</string> <string>30E7ABB2079DA8B400E048FC</string> ! <string>30E7ABCA079DABCE00E048FC</string> ! <string>30E7ABCB079DABCE00E048FC</string> </array> <key>prevStack</key> --- 353,368 ---- <string>3063E94B079AE9F8003DF28B</string> <string>3063E94C079AE9F8003DF28B</string> <string>30E7ABB1079DA8B400E048FC</string> <string>30E7ABB2079DA8B400E048FC</string> ! <string>3031CB0E07A043C6006539CD</string> ! <string>3031CB0F07A043C6006539CD</string> ! <string>3031CB1007A043C6006539CD</string> ! <string>3031CB2007A0449D006539CD</string> ! <string>3031CB2307A04526006539CD</string> ! <string>3031CB3407A0495A006539CD</string> ! <string>3031CB3F07A04A5B006539CD</string> ! <string>3031CB4007A04A5B006539CD</string> ! <string>3031CB5107A04D53006539CD</string> ! <string>3031CB5207A04D53006539CD</string> </array> <key>prevStack</key> *************** *** 425,431 **** <string>304A3CB5079AD56A00358038</string> <string>30E7AB84079DA09500E048FC</string> - <string>30E7ABB3079DA8B400E048FC</string> <string>30E7ABB4079DA8B400E048FC</string> ! <string>30E7ABCC079DABCE00E048FC</string> </array> </dict> --- 430,444 ---- <string>304A3CB5079AD56A00358038</string> <string>30E7AB84079DA09500E048FC</string> <string>30E7ABB4079DA8B400E048FC</string> ! <string>3031CB1207A043C6006539CD</string> ! <string>3031CB1307A043C6006539CD</string> ! <string>3031CB1407A043C6006539CD</string> ! <string>3031CB1507A043C6006539CD</string> ! <string>3031CB2107A0449D006539CD</string> ! <string>3031CB2407A04526006539CD</string> ! <string>3031CB3507A0495A006539CD</string> ! <string>3031CB4207A04A5B006539CD</string> ! <string>3031CB4307A04A5B006539CD</string> ! <string>3031CB5307A04D53006539CD</string> </array> </dict> *************** *** 441,445 **** <string>{{0, 0}, {727, 356}}</string> <key>RubberWindowFrame</key> ! <string>201 163 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 454,458 ---- <string>{{0, 0}, {727, 356}}</string> <key>RubberWindowFrame</key> ! <string>132 136 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 461,465 **** <string>{{0, 363}, {727, 258}}</string> <key>RubberWindowFrame</key> ! <string>201 163 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> --- 474,478 ---- <string>{{0, 363}, {727, 258}}</string> <key>RubberWindowFrame</key> ! <string>132 136 1072 663 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 485,491 **** <key>TableOfContents</key> <array> ! <string>30E7AB86079DA09500E048FC</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30E7AB87079DA09500E048FC</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 498,504 ---- <key>TableOfContents</key> <array> ! <string>3031CAFA07A04357006539CD</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3031CAFB07A04357006539CD</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 515,523 **** <key>WindowOrderList</key> <array> - <string>1C0AD2B3069F1EA900FABCE6</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>201 163 1072 663 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 528,538 ---- <key>WindowOrderList</key> <array> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>303B68B1075A0D24009951CC</string> + <string>1C0AD2B3069F1EA900FABCE6</string> + <string>3031CB3B07A049D0006539CD</string> </array> <key>WindowString</key> ! <string>132 136 1072 663 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 608,612 **** <array> <string>303B68B1075A0D24009951CC</string> ! <string>30E4964A079D9C9C0009B298</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 623,627 ---- <array> <string>303B68B1075A0D24009951CC</string> ! <string>3031CB3A07A049D0006539CD</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 928,933 **** <key>sizes</key> <array> ! <string>{{0, 0}, {366, 167}}</string> ! <string>{{0, 176}, {366, 267}}</string> </array> </dict> --- 943,948 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {493, 167}}</string> ! <string>{{0, 176}, {493, 267}}</string> </array> </dict> *************** *** 978,984 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30E7AB88079DA09500E048FC</string> <string>1CD0528B0623707200166675</string> ! <string>30E7AB89079DA09500E048FC</string> </array> <key>ToolbarConfiguration</key> --- 993,999 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3031CB2D07A0463B006539CD</string> <string>1CD0528B0623707200166675</string> ! <string>3031CB2E07A0463B006539CD</string> </array> <key>ToolbarConfiguration</key> *************** *** 989,993 **** <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1004,1008 ---- <string>1C0AD2B3069F1EA900FABCE6</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** roman.pbxuser 18 Jan 2005 21:06:46 -0000 1.80 --- roman.pbxuser 20 Jan 2005 20:46:06 -0000 1.81 *************** *** 42,46 **** activeTarget = 30744BA4069560A70039B82A; addToTargets = ( - 308427F90643B8C700173CCD, 30744BA4069560A70039B82A, 30950682067C4D100077C270, --- 42,45 ---- *************** *** 199,203 **** ); }; [...1266 lines suppressed...] 30E8345A078DAC7600274608 = { fRef = 10A233D307327EA7007529F7; --- 3616,3619 ---- *************** *** 4050,4063 **** isa = PBXBookmark; }; - 30E83746078DCD8F00274608 = { - fRef = 30ADE246078B17660012CF83; - isa = PBXTextBookmark; - name = "- (IBAction)nextPlayer:(id)sender;\n- (IBAction)previousPlayer:(id)sender;"; - rLen = 73; - rLoc = 2638; - rType = 0; - vrLen = 1344; - vrLoc = 1275; - }; 30EC0BDE06425043008B3F6B = { uiCtxt = { --- 3640,3643 ---- |
|
From: Gfive <gf...@us...> - 2005-01-19 08:29:17
|
Update of /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19837/English.lproj/PreferencesPanel.nib Modified Files: info.nib keyedobjects.nib Log Message: Interface changes Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/info.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** info.nib 18 Jan 2005 21:06:17 -0000 1.5 --- info.nib 19 Jan 2005 08:29:03 -0000 1.6 *************** *** 4,8 **** <dict> <key>IBDocumentLocation</key> ! <string>69 100 356 240 0 0 1280 832 </string> <key>IBFramework Version</key> <string>364.0</string> --- 4,8 ---- <dict> <key>IBDocumentLocation</key> ! <string>93 129 356 240 0 0 1600 1002 </string> <key>IBFramework Version</key> <string>364.0</string> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/PreferencesPanel.nib/keyedobjects.nib,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvsn0N2oF and /tmp/cvsWlD576 differ |
