hiding controls on first step of tutorial. Showing text

seanhess · Aug 24, 2013 · c1f2f99 · c1f2f99
1 parent 6081974
commit c1f2f99
Show file tree

Hide file tree

Showing 44 changed files with 565 additions and 126 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,7 @@
-all: sprites
+all: install
 
 sprites:
-	cd WizardWar && bash images/packTextures.sh
+	cd WizardWar && bash images/packTextures.sh
+
+install: sprites
+
diff --git a/Podfile b/Podfile
@@ -1,5 +1,5 @@
 platform :ios, '5.0'
-pod 'ReactiveCocoa', '1.8.1'
+pod 'ReactiveCocoa', '~> 1.9.7'
 pod 'BButton', '~> 2.0.0'
 pod 'WEPopover', '~> 0.0.1'
 pod 'SDWebImage', '~> 3.3'

diff --git a/WizardWar.xcodeproj/project.pbxproj b/WizardWar.xcodeproj/project.pbxproj
diff --git a/WizardWar/AIService.h b/WizardWar/AIService.h
@@ -16,6 +16,14 @@
 
 @protocol AIService <NSObject, Simulated>
 @property (nonatomic, strong) Wizard*wizard;
+@property (nonatomic, strong) Wizard*opponent;
 @property (nonatomic, weak) id<AIDelegate> delegate;
+
+// for tutorials, they can hide the controls
+@property (nonatomic) BOOL hideControls;
+
+-(void)tutorialDidTap;
 -(void)opponent:(Wizard*)wizard didCastSpell:(Spell*)spell atTick:(NSInteger)tick;
+-(BOOL)shouldPreventSpellCast:(Spell*)spell atTick:(NSInteger)tick;
+
 @end
diff --git a/WizardWar/AppDelegate.m b/WizardWar/AppDelegate.m
@@ -21,7 +21,7 @@
 #import "ConnectionService.h"
 #import <ReactiveCocoa.h>
 #import "AnalyticsService.h"
-#import <TestFlight.h>
+#import "TestFlight.h"
 #import <FacebookSDK/FacebookSDK.h>
 #import "OLUnitsService.h"
 #import "InfoService.h"

diff --git a/WizardWar/ChatBubbleSprite.h b/WizardWar/ChatBubbleSprite.h
@@ -0,0 +1,13 @@
+//
+//  ChatBubbleSprite.h
+//  WizardWar
+//
+//  Created by Sean Hess on 8/24/13.
+//  Copyright (c) 2013 Orbital Labs. All rights reserved.
+//
+
+#import "CCSprite.h"
+
+@interface ChatBubbleSprite : CCSprite
+@property (nonatomic, strong) NSString * message;
+@end
diff --git a/WizardWar/ChatBubbleSprite.m b/WizardWar/ChatBubbleSprite.m
@@ -0,0 +1,44 @@
+//
+//  ChatBubbleSprite.m
+//  WizardWar
+//
+//  Created by Sean Hess on 8/24/13.
+//  Copyright (c) 2013 Orbital Labs. All rights reserved.
+//
+
+#import "ChatBubbleSprite.h"
+#import "cocos2d.h"
+#import "AppStyle.h"
+
+@interface ChatBubbleSprite ()
+@property (nonatomic, strong) CCSprite * background;
+@property (nonatomic, strong) CCLabelTTF * label;
+@end
+
+
+@implementation ChatBubbleSprite
+
+-(id)init {
+    if ((self = [super init])) {
+        self.background = [CCSprite spriteWithSpriteFrameName:@"chat-bubble.png"];
+        self.background.scale = 0.5;
+        [self addChild:self.background];
+
+        self.label = [CCLabelTTF labelWithString:@"hello" fontName:FONT_LOVEYA fontSize:12.0];
+        self.label.color = ccc3(0, 0, 0);
+        [self addChild:self.label];
+    }
+    return self;
+}
+
+-(void)setMessage:(NSString *)message {
+    _message = message;
+    if (!message) message = @"";
+    [self.label setString:message];
+}
+
+-(void)setFlipX:(BOOL)flipX {
+    self.background.flipX = flipX;
+}
+
+@end
diff --git a/WizardWar/Data/DataModel.xcdatamodeld/.xccurrentversion b/WizardWar/Data/DataModel.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>DataModel v0.14.xcdatamodel</string>
+	<string>DataModel 4.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/...deld/DataModel 00.14.xcdatamodel/contents → ...tamodeld/DataModel 4.xcdatamodel/contents b/...deld/DataModel 00.14.xcdatamodel/contents → ...tamodeld/DataModel 4.xcdatamodel/contents
@@ -20,6 +20,7 @@
         <attribute name="level" optional="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="passed" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="wizardLevel" optional="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
     </entity>
     <entity name="SpellRecord" representedClassName="SpellRecord" syncable="YES">
         <attribute name="castTotal" optional="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
@@ -54,7 +55,7 @@
     <elements>
         <element name="Challenge" positionX="0" positionY="0" width="128" height="105"/>
         <element name="FacebookUser" positionX="0" positionY="0" width="128" height="135"/>
-        <element name="QuestLevel" positionX="160" positionY="192" width="128" height="120"/>
+        <element name="QuestLevel" positionX="160" positionY="192" width="128" height="135"/>
         <element name="SpellRecord" positionX="160" positionY="192" width="128" height="120"/>
         <element name="User" positionX="0" positionY="0" width="128" height="360"/>
     </elements>

diff --git a/WizardWar/FeedbackLayer.m b/WizardWar/FeedbackLayer.m
@@ -7,7 +7,7 @@
 //
 
 #import "FeedbackLayer.h"
-#import <cocos2d.h>
+#import "cocos2d.h"
 #import "AppStyle.h"
 #import <ReactiveCocoa.h>
 #import "Spell.h"

diff --git a/WizardWar/Library/RACHelpers.h b/WizardWar/Library/RACHelpers.h
@@ -0,0 +1,20 @@
+//
+//  RACHelpers.h
+//  WizardWar
+//
+//  Created by Sean Hess on 8/24/13.
+//  Copyright (c) 2013 Orbital Labs. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+#define RACMapExists ^id(id value) { return @(value != nil); }
+#define RACFilterExists ^BOOL(id value) { return value != nil; }
+
+#define RACMapNot ^id(NSNumber* value) { return @(!value.intValue); }
+
+
+@interface RACHelpers : NSObject
+
+@end
diff --git a/WizardWar/Library/RACHelpers.m b/WizardWar/Library/RACHelpers.m
@@ -0,0 +1,13 @@
+//
+//  RACHelpers.m
+//  WizardWar
+//
+//  Created by Sean Hess on 8/24/13.
+//  Copyright (c) 2013 Orbital Labs. All rights reserved.
+//
+
+#import "RACHelpers.h"
+
+@implementation RACHelpers
+
+@end
diff --git a/WizardWar/LifeIndicatorNode.h b/WizardWar/LifeIndicatorNode.h
@@ -13,6 +13,5 @@
 
 @interface LifeIndicatorNode : CCNode
 @property (nonatomic, strong) Wizard * player;
-@property (nonatomic, strong) Match * match;
 -(id)initWithUnits:(Units*)units;
 @end
diff --git a/WizardWar/LifeIndicatorNode.m b/WizardWar/LifeIndicatorNode.m
@@ -60,10 +60,6 @@ -(id)initWithUnits:(Units *)units {
         [[RACAble(self.player.effect) distinctUntilChanged] subscribeNext:^(id value) {
             [self renderEffect];
         }];
-
-        [[RACAble(self.match.status) distinctUntilChanged] subscribeNext:^(id value) {
-            [self renderMatchStatus];
-        }];
     }
     return self;
 }
@@ -112,8 +108,4 @@ -(void)renderEffect {
     }
 }
 
--(void)renderMatchStatus {
-    self.visible = self.match.status == MatchStatusPlaying;
-}
-
 @end
diff --git a/WizardWar/Match.h b/WizardWar/Match.h
@@ -40,6 +40,7 @@ typedef enum MatchStatus {
 
 @property (nonatomic, strong) NSMutableArray * sortedPlayers;
 @property (nonatomic) MatchStatus status;
+@property (nonatomic, strong) id<AIService>ai;
 
 -(id)initWithMatchId:(NSString*)matchId hostName:(NSString*)hostName currentWizard:(Wizard*)wizard withAI:(id<AIService>)ai multiplayer:(id<Multiplayer>)multiplayer sync:(TimerSyncService*)sync;
 -(void)update:(NSTimeInterval)dt;

diff --git a/WizardWar/Match.m b/WizardWar/Match.m
@@ -31,7 +31,6 @@ @interface Match () <GameTimerDelegate, MultiplayerDelegate, TimerSyncDelegate,
 @property (nonatomic, strong) GameTimerService * timer;
 @property (nonatomic, strong) id<Multiplayer> multiplayer;
 @property (nonatomic, strong) TimerSyncService * sync;
-@property (nonatomic, strong) id<AIService> ai;
 
 @property (nonatomic, strong) NSMutableDictionary * players;
 @property (nonatomic, strong) NSMutableDictionary * spells;

diff --git a/WizardWar/MatchLayer.h b/WizardWar/MatchLayer.h
@@ -13,8 +13,13 @@
 #import "Combos.h"
 #import "Units.h"
 #import "DrawingLayer.h"
+#import <ReactiveCocoa.h>
 
 @interface MatchLayer : CCLayer
 @property (nonatomic, strong) DrawingLayer * drawingLayer;
+@property (nonatomic, strong) RACSignal * showControlsSignal;
+@property (nonatomic, strong) RACSignal * matchStatusSignal;
+
+
 -(id)initWithMatch:(Match*)match size:(CGSize)size combos:(Combos*)combos units:(Units*)units;
 @end
diff --git a/WizardWar/MatchLayer.m b/WizardWar/MatchLayer.m
@@ -25,6 +25,7 @@
 #import "SpellsLayer.h"
 
 #import <ReactiveCocoa.h>
+#import "RACHelpers.h"
 
 #define INDICATOR_PADDING_Y 40
 
@@ -43,6 +44,9 @@ @interface MatchLayer () <CCTouchOneByOneDelegate, MatchDelegate>
 @property (nonatomic, strong) UIButton * backButton;
 @property (nonatomic, strong) CCSprite * background;
 
+@property (nonatomic) MatchStatus matchStatus;
+@property (nonatomic, strong) RACSignal * aiHideControlsSignal;
+
 @end
 
 @implementation MatchLayer
@@ -55,9 +59,6 @@ -(id)initWithMatch:(Match*)match size:(CGSize)size combos:(Combos *)combos units
 
         [self addChild:[CCLayerColor layerWithColor:ccc4(66, 66, 66, 255)]];
 
-        __weak MatchLayer * wself = self;
-
-
         // Manually use the suffix, because fallbacks conflict for other stuff
         NSString * backgroundName = @[@"cave", @"icecave", @"evilforest", @"castle"].randomItem;
         NSInteger device = [[CCConfiguration sharedConfiguration] runningDevice];
@@ -96,9 +97,6 @@ -(id)initWithMatch:(Match*)match size:(CGSize)size combos:(Combos *)combos units
         LifeIndicatorNode * player1Indicator = [[LifeIndicatorNode alloc] initWithUnits:units];
         LifeIndicatorNode * player2Indicator = [[LifeIndicatorNode alloc] initWithUnits:units];
 
-        player1Indicator.match = self.match;
-        player2Indicator.match = self.match;
-
         player1Indicator.position = ccp(self.units.min, self.units.maxY - INDICATOR_PADDING_Y*units.spriteScaleModifier);
         player2Indicator.position = ccp(self.units.max, self.units.maxY - INDICATOR_PADDING_Y*units.spriteScaleModifier);
 
@@ -107,9 +105,15 @@ -(id)initWithMatch:(Match*)match size:(CGSize)size combos:(Combos *)combos units
 
         [self scheduleUpdate];
 
-        [[RACAble(self.match.status) distinctUntilChanged] subscribeNext:^(id value) {
-            [wself renderMatchStatus];
-        }];
+        self.matchStatusSignal = [[RACAbleWithStart(self.match.status) distinctUntilChanged] filter:RACFilterExists];
+        self.aiHideControlsSignal = [RACAbleWithStart(self.match.ai.hideControls) distinctUntilChanged];
+        self.showControlsSignal = [RACSignal combineLatest:@[self.matchStatusSignal, self.aiHideControlsSignal]
+            reduce:^(NSNumber* status, NSNumber* hideControls) {
+                return @((status.intValue == MatchStatusPlaying) && !hideControls.intValue);
+            }];
+
+        RAC(self.matchStatus) = self.matchStatusSignal;
+        RAC(self.indicators.visible) = self.showControlsSignal;
 
         // DEBUG THING
 //        self.debug = [CCLabelTTF labelWithString:@"0" fontName:@"Marker Felt" fontSize:120];
@@ -153,9 +157,9 @@ -(void)didAddSpell:(Spell *)spell {
         [[SimpleAudioEngine sharedEngine] playEffect:@"fireball.mp3"];
     }
     else if([spell isType:Earthwall]) {
-        [[SimpleAudioEngine sharedEngine] playEffect:@"eart®hwall.mp3"];
+        [[SimpleAudioEngine sharedEngine] playEffect:@"earthwall.mp3"];
     }
-    else if ([spell isType:Icewall]) {
+    else if ([spell isAnyType:@[Icewall, Firewall]]) {
         [[SimpleAudioEngine sharedEngine] playEffect:@"icewall.mp3"];
     }
     else if([spell isType:Vine]) {
@@ -166,7 +170,7 @@ -(void)didAddSpell:(Spell *)spell {
     }
     else if([spell isType:Monster]) {
         [[SimpleAudioEngine sharedEngine] playEffect:@"monster.mp3"];
-    }
+    } 
     else if([spell isType:Windblast]) {
         [[SimpleAudioEngine sharedEngine] playEffect:@"windblast.mp3"];
     }
@@ -190,7 +194,7 @@ -(void)didAddSpell:(Spell *)spell {
 
 - (void)didAddPlayer:(Wizard *)wizard {
     BOOL isCurrentWizard = (wizard == self.match.currentWizard);
-    WizardSprite * sprite = [[WizardSprite alloc] initWithWizard:wizard units:self.units match:self.match isCurrentWizard:isCurrentWizard];
+    WizardSprite * sprite = [[WizardSprite alloc] initWithWizard:wizard units:self.units match:self.match isCurrentWizard:isCurrentWizard hideControls:self.aiHideControlsSignal];
 
     [self.wizards addChild:sprite];
 }
@@ -207,7 +211,7 @@ - (void)didTick:(NSInteger)currentTick {
     self.debug.string = [NSString stringWithFormat:@"%i", (int)(currentTick * TICK_INTERVAL)];
 }
 
-- (void)renderMatchStatus {
+- (void)setMatchStatus:(MatchStatus)status {
     self.spells.visible = (self.match.status == MatchStatusPlaying);
 
     if (self.match.status == MatchStatusPlaying) {