From: masakih <masakih@users.sourceforge.jp>
Date: Sat, 6 Feb 2016 01:04:19 +0000 (+0900)
Subject: 海域BOSSと戦闘中にその旨を表示するようにした
X-Git-Tag: 1.5b5~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=432f640e32ad2bcef5cb059312da489604d8498c;p=kcd%2FKCD.git

海域BOSSと戦闘中にその旨を表示するようにした
---

diff --git a/KCD/HMCalculateDamageCommand.m b/KCD/HMCalculateDamageCommand.m
index 392f33f3..f5feeed9 100644
--- a/KCD/HMCalculateDamageCommand.m
+++ b/KCD/HMCalculateDamageCommand.m
@@ -129,8 +129,12 @@ typedef NS_ENUM(NSUInteger, HMBattleType) {
 		return;
 	}
 	id battle = battles[0];
+	id cellNumber = [self.json valueForKeyPath:@"api_data.api_no"];
+	id eventIDNumber = [self.json valueForKeyPath:@"api_data.api_event_id"];
+	BOOL isBossCell = [eventIDNumber integerValue] == 5;
 	
-	[battle setValue:@([[self.json valueForKeyPath:@"api_data.api_no"] integerValue]) forKeyPath:@"no"];
+	[battle setValue:@([cellNumber integerValue]) forKeyPath:@"no"];
+	[battle setValue:@(isBossCell) forKeyPath:@"isBossCell"];
 	
 	[self.store saveAction:nil];
 }
diff --git a/KCD/HMDocksViewController.m b/KCD/HMDocksViewController.m
index f0188e2d..280dc992 100644
--- a/KCD/HMDocksViewController.m
+++ b/KCD/HMDocksViewController.m
@@ -208,6 +208,9 @@
 		if(self.battleCellNumber.integerValue == 0) {
 			NSString *format = NSLocalizedString(@"%@ in sortie into %@ (%@)", @"Sortie");
 			result = [NSString stringWithFormat:format, self.fleetName, self.areaName, self.areaNumber];
+		} else if(self.isBossCell) {
+			NSString *format = NSLocalizedString(@"%@ battle against the enemy main fleet at %@ war zone in %@ (%@) now", @"Sortie");
+			result = [NSString stringWithFormat:format, self.fleetName, self.battleCellNumber, self.areaName, self.areaNumber];
 		} else {
 			NSString *format = NSLocalizedString(@"%@ battle at %@ war zone in %@ (%@) now", @"Sortie");
 			result = [NSString stringWithFormat:format, self.fleetName, self.battleCellNumber, self.areaName, self.areaNumber];
@@ -269,5 +272,8 @@
 {
 	return [self.battleContoller valueForKeyPath:@"content.battleCell"];
 }
-
+- (BOOL)isBossCell
+{
+	return [[self.battleContoller valueForKeyPath:@"content.isBossCell"] boolValue];
+}
 @end
diff --git a/KCD/Temporary.xcdatamodeld/Temporary.xcdatamodel/contents b/KCD/Temporary.xcdatamodeld/Temporary.xcdatamodel/contents
index 118f9f4e..bac27d7d 100644
--- a/KCD/Temporary.xcdatamodeld/Temporary.xcdatamodel/contents
+++ b/KCD/Temporary.xcdatamodeld/Temporary.xcdatamodel/contents
@@ -3,6 +3,7 @@
     <entity name="Battle" syncable="YES">
         <attribute name="battleCell" optional="YES" attributeType="Integer 32" syncable="YES"/>
         <attribute name="deckId" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="isBossCell" optional="YES" attributeType="Boolean" syncable="YES"/>
         <attribute name="mapArea" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="mapInfo" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="no" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -18,7 +19,7 @@
         <attribute name="shipID" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
     <elements>
-        <element name="Battle" positionX="-63" positionY="-18" width="128" height="135"/>
+        <element name="Battle" positionX="-63" positionY="-18" width="128" height="150"/>
         <element name="Damage" positionX="-54" positionY="18" width="128" height="90"/>
         <element name="GuardEscaped" positionX="-54" positionY="27" width="128" height="75"/>
     </elements>
diff --git a/KCD/ja.lproj/Localizable.strings b/KCD/ja.lproj/Localizable.strings
index 384de1b9..f9a7669a 100644
Binary files a/KCD/ja.lproj/Localizable.strings and b/KCD/ja.lproj/Localizable.strings differ
diff --git a/KCD/ja.lproj/Localizable.strings.sed b/KCD/ja.lproj/Localizable.strings.sed
index 52e89d04..7d1528df 100644
--- a/KCD/ja.lproj/Localizable.strings.sed
+++ b/KCD/ja.lproj/Localizable.strings.sed
@@ -16,7 +16,8 @@ s/Hide Upgradable Ships/改造可能艦リストを隠す/2
 s/Show Screenshot List/スクリーンショットリストを表示/2
 s/Hide Screenshot List/スクリーンショットリストを隠す/2
 s/%1$@ in sortie into %2$@ (%3$@)/%1$@が\\n（%3$@）%2$@\\nに出撃中/
-s/%1$@ battle at %2$@ war zone in %3$@ (%4$@) now/%1$@が\\n（%4$@）%3$@\\n第%2$@戦闘域にて戦闘中/
+s/%1$@ battle at %2$@ war zone in %3$@ (%4$@) now/%1$@が\\n（%4$@）%3$@\\n第%2$@戦闘域にて交戦中/
+s/%1$@ battle against the enemy main fleet at %2$@ war zone in %3$@ (%4$@) now/%1$@が\\n（%4$@）%3$@\\n第%2$@戦闘域にて敵主力艦隊と交戦中/
 s/All/すべて/2
 s/Equiped/装備済み/2
 s/Unequiped/未装備/2