From 7217d694c57ab90baf7174f66013c6046f99de42 Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Sun, 30 Oct 2016 13:46:14 +0900
Subject: [PATCH] =?utf8?q?=E9=AB=98=E9=80=9F=E4=BF=AE=E5=BE=A9=E6=9D=90?=
 =?utf8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=9F=E3=82=89=E5=8D=B3?=
 =?utf8?q?=E5=BA=A7=E3=81=AB=E6=95=B0=E5=80=A4=E3=82=92=E6=9B=B4=E6=96=B0?=
 =?utf8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KCD/HMNyukyoSpeedChangeCommand.m | 19 ++++++++++++++++---
 KCD/HMNyukyoStartCommand.m       | 20 ++++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/KCD/HMNyukyoSpeedChangeCommand.m b/KCD/HMNyukyoSpeedChangeCommand.m
index 24346294..49f9468b 100644
--- a/KCD/HMNyukyoSpeedChangeCommand.m
+++ b/KCD/HMNyukyoSpeedChangeCommand.m
@@ -11,6 +11,7 @@
 #import "HMServerDataStore.h"
 #import "HMKCNyukyoDock.h"
 #import "HMKCShipObject+Extensions.h"
+#import "HMKCMaterial.h"
 
 
 @implementation HMNyukyoSpeedChangeCommand
@@ -37,7 +38,7 @@
 	NSError *error = nil;
 	NSArray<HMKCNyukyoDock *> *nyukyoDocks = [store objectsWithEntityName:@"NyukyoDock"
 															  error:&error
-														  predicateFormat:@"id = %@", @([ndockId integerValue])];
+														  predicateFormat:@"id = %@", @(ndockId.integerValue)];
 	if(nyukyoDocks.count == 0) {
 		if(error) {
 			NSLog(@"Error: at %@ : %@", NSStringFromClass([self class]), error);
@@ -54,14 +55,26 @@
 	error = nil;
 	NSArray<HMKCShipObject *> *ships = [store objectsWithEntityName:@"Ship"
 															  error:&error
-													predicateFormat:@"id = %@", @([shipId integerValue])];
+													predicateFormat:@"id = %@", @(shipId.integerValue)];
 	if(ships.count == 0) {
 		if(error) {
 			NSLog(@"Error: at %@ : %@", NSStringFromClass([self class]), error);
 		}
 		return;
 	}
-	
 	ships[0].nowhp = ships[0].maxhp;
+    
+    //
+    NSArray<HMKCMaterial *> *materials = [store objectsWithEntityName:@"Material"
+                                                            predicate:nil
+                                                                error:&error];
+    if(materials.count == 0) {
+        if(error) {
+            NSLog(@"Error: at %@ : %@", NSStringFromClass([self class]), error);
+        }
+        return;
+    }
+    NSNumber *bukkets = materials[0].kousokushuhuku;
+    materials[0].kousokushuhuku = @(bukkets.integerValue - 1);
 }
 @end
diff --git a/KCD/HMNyukyoStartCommand.m b/KCD/HMNyukyoStartCommand.m
index f43c5ba1..945de59d 100644
--- a/KCD/HMNyukyoStartCommand.m
+++ b/KCD/HMNyukyoStartCommand.m
@@ -10,6 +10,7 @@
 
 #import "HMServerDataStore.h"
 #import "HMKCShipObject+Extensions.h"
+#import "HMKCMaterial.h"
 
 
 @implementation HMNyukyoStartCommand
@@ -36,10 +37,10 @@
 	
 	HMServerDataStore *store = [HMServerDataStore oneTimeEditor];
 	
+    NSError *error = nil;
+
 	NSString *shipId = self.arguments[@"api_ship_id"];
-	
-	NSError *error = nil;
-	NSArray<HMKCShipObject *> *ships = [store objectsWithEntityName:@"Ship"
+    NSArray<HMKCShipObject *> *ships = [store objectsWithEntityName:@"Ship"
 															  error:&error
 													predicateFormat:@"id = %@", @([shipId integerValue])];
 	if(ships.count == 0) {
@@ -48,7 +49,18 @@
 		}
 		return;
 	}
-	
 	ships[0].nowhp = ships[0].maxhp;
+    
+    NSArray<HMKCMaterial *> *materials = [store objectsWithEntityName:@"Material"
+                                            predicate:nil
+                                                error:&error];
+    if(materials.count == 0) {
+        if(error) {
+            NSLog(@"Error: at %@ : %@", NSStringFromClass([self class]), error);
+        }
+        return;
+    }
+    NSNumber *bukkets = materials[0].kousokushuhuku;
+    materials[0].kousokushuhuku = @(bukkets.integerValue - 1);
 }
 @end
-- 
2.11.0