From 9e83bf76a0d97bc0b8c3429a22f339f434ec776a Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Wed, 26 Feb 2014 23:55:54 +0900
Subject: [PATCH] =?utf8?q?=E6=AC=A1=E3=81=AE=E3=83=AC=E3=83=99=E3=83=AB?=
 =?utf8?q?=E3=81=AB=E4=B8=8A=E3=81=8C=E3=82=8B=E3=81=AE=E3=81=AB=E5=BF=85?=
 =?utf8?q?=E8=A6=81=E3=81=AA=E7=B5=8C=E9=A8=93=E5=80=A4=E7=94=A8=E3=81=AE?=
 =?utf8?q?=E3=82=AD=E3=83=BC=E3=81=A8=E8=89=A6=E7=A8=AE=E3=81=AE=E7=9C=81?=
 =?utf8?q?=E7=95=A5=E5=90=8D=E3=81=AE=E3=82=AD=E3=83=BC=E3=82=92=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KCD/HMKCShipObject.m | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/KCD/HMKCShipObject.m b/KCD/HMKCShipObject.m
index 8e4ec41e..1d297388 100644
--- a/KCD/HMKCShipObject.m
+++ b/KCD/HMKCShipObject.m
@@ -8,21 +8,49 @@
 
 #import "HMKCShipObject.h"
 
-@implementation HMKCShipObject
+static NSArray *shortSTypeNames = nil;
+static NSArray *levelUpExps = nil;
 
+@implementation HMKCShipObject
++ (void)load
+{
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		NSBundle *mainBundle = [NSBundle mainBundle];
+		NSURL *url = [mainBundle URLForResource:@"STypeShortName" withExtension:@"plist"];
+		NSArray *array = [[NSArray alloc] initWithContentsOfURL:url];
+		if(!array) {
+			NSLog(@"Can not load STypeShortName.plist.");
+		}
+		shortSTypeNames = [array copy];
+		
+		url = [mainBundle URLForResource:@"LevelUpExp" withExtension:@"plist"];
+		array = [[NSArray alloc] initWithContentsOfURL:url];
+		if(!array) {
+			NSLog(@"Can not load LevelUpExp.plist.");
+		}
+		levelUpExps = [array copy];
+	});
+}
 - (NSNumber *)master_sortno
 {
 	return nil;
 }
-- (NSString *)type
+- (NSString *)shortTypeName
 {
-	//
-	return nil;
+	NSNumber *idValue = [self valueForKeyPath:@"master_ship.stype.id"];
+	if(!idValue || [idValue isKindOfClass:[NSNull class]]) return nil;
+	
+	if([shortSTypeNames count] < [idValue integerValue]) return nil;
+	
+	return shortSTypeNames[[idValue integerValue] - 1];
 }
 
 - (NSNumber *)next
 {
-	return nil;
+	NSUInteger nextExp = [[levelUpExps objectAtIndex:[[self valueForKey:@"lv"] integerValue]] integerValue];
+	
+	return [NSNumber numberWithInteger:nextExp - [[self valueForKey:@"exp"] integerValue]];
 }
 
 @end
-- 
2.11.0