• R/O
  • HTTP
  • SSH
  • HTTPS

AwarsIV: 提交

AwarsIVのリポジトリです


Commit MetaInfo

修订版3c3d44aa90e52b92c157602c520b98fc254ff4b2 (tree)
时间2015-05-12 06:53:49
作者Killery <Killery@kiri...>
CommiterKillery

Log Message

ちょこっと足りないところを修正

更改概述

差异

--- a/Awars III/MapView.m
+++ b/Awars III/MapView.m
@@ -606,7 +606,7 @@
606606 NSArray *array3 = [[fileDataArray objectAtIndex:i] componentsSeparatedByString:@"◆"];
607607 NSString *string2 = [NSString stringWithFormat:@"%@◆", [array3 objectAtIndex:0]];
608608 NSRange rangeSearch2 = [[fileDataArray objectAtIndex:i] rangeOfString:string2];
609-
609+ int pussyCnt = 0;
610610
611611 if (rangeSearch.location == !NSNotFound) {
612612
@@ -679,6 +679,8 @@
679679 }
680680
681681 if (rangeSearch2.location == !NSNotFound) {
682+ pussyCnt = 0;
683+
682684
683685 if(asdflag){
684686 MS.D->SCRPT = [NSMutableArray new];
@@ -758,6 +760,33 @@
758760
759761 [MS.D->SCRPT addObject:[NSString stringWithFormat:@"◆スイッチの操作%@", string]];
760762 }
763+ if(MS.D->P->type == 6){
764+ MS.D->P->indent = indent;
765+
766+ NSArray *items10 = [[items9 objectAtIndex:0] componentsSeparatedByString:@","];
767+
768+ MS.D->P->timerFlag = true;
769+ MS.D->P->timerMin = [[items10 objectAtIndex:0] intValue];
770+ MS.D->P->timerSec = [[items10 objectAtIndex:1] intValue];
771+ MS.D->P->timerRun = [[items10 objectAtIndex:2] intValue];
772+ MS.D->P->timerMode = [[items10 objectAtIndex:3] intValue];
773+ MS.D->P->timerVisible = [[items10 objectAtIndex:4] intValue];
774+
775+ [MS.D->SCRPT addObject:[NSString stringWithFormat:@"◆タイマーの操作"]];
776+
777+ NSString *timerRun;
778+ if(MS.D->P->timerRun) timerRun = [@"始動" retain];
779+ else timerRun = [@"停止" retain];
780+ NSString *timerMode;
781+ if(MS.D->P->timerMode) timerMode = [@"足す" retain];
782+ else timerMode = [@"引く" retain];
783+ NSString *timerVisible;
784+ if(MS.D->P->timerVisible) timerVisible = [@"表示" retain];
785+ else timerVisible = [@"非表示" retain];
786+
787+ if(![MS.D->P->label isEqualToString:@""])
788+ [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%d分%d秒 %@ %@ %@",MS.D->P->timerMin, MS.D->P->timerSec, timerRun, timerMode, timerVisible]];
789+ }
761790 if(MS.D->P->type == 7){
762791 MS.D->P->indent = indent;
763792
@@ -778,28 +807,27 @@
778807
779808 MS.D->P->memo = [[items9 objectAtIndex:0] retain];
780809 [MS.D->SCRPT addObject:[NSString stringWithFormat:@"◆注釈"]];
781- if(![MS.D->P->memo isEqualToString:@""])
782- [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", MS.D->P->memo]];
783810 }
784811
785812 scriptIndex++;
786813 //continue;
787814 }else{
788-
815+
789816 if(MS.D){
790817 {if(MS.D->P)
791- {if(MS.D->P->type == 0){
792- { if(!MS.D->P->S1.str) {
793- MS.D->P->S1.str = @"";
818+ {
819+ if(MS.D->P->type == 0){
820+
821+ {
822+ if(!MS.D->P->S1.str) {MS.D->P->S1.str = @"";
794823 }
795824 NSString *string = @"";
796825 string = [[string stringByAppendingFormat:@"%@", [fileDataArray objectAtIndex:i]] retain];
797826 if([string isEqualToString:@""]) continue;
798827 MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingString:string] retain];
799- MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingFormat:@"\n"] retain];
828+ if(pussyCnt > 0) MS.D->P->S1.str = [[MS.D->P->S1.str stringByAppendingFormat:@"\n"] retain];
800829 if(![string isEqualToString:@""])
801- [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]];
802-
830+ [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]];pussyCnt++;
803831 }
804832 }if(MS.D->P->type == 3){
805833 NSString *string = @"";
@@ -823,7 +851,23 @@
823851 }
824852 }
825853 [MS.D->SCRPT addObject:[NSString stringWithString:string]];
854+
855+ }if(MS.D->P->type == 9){
856+
857+ {
858+ if(!MS.D->P->memo) {MS.D->P->memo = @"";
859+ }
860+ NSString *string = @"";
861+ string = [[string stringByAppendingFormat:@"%@", [fileDataArray objectAtIndex:i]] retain];
862+ if([string isEqualToString:@""]) continue;
863+ MS.D->P->memo = [[MS.D->P->memo stringByAppendingString:string] retain];
864+ if(pussyCnt > 0) MS.D->P->memo = [[MS.D->P->memo stringByAppendingFormat:@"\n"] retain];
865+ if(![string isEqualToString:@""])
866+ [MS.D->SCRPT addObject:[NSString stringWithFormat:@"%@", [fileDataArray objectAtIndex:i]]];
867+ pussyCnt++;
868+ }
826869 }
870+
827871 }
828872 }
829873 }scriptIndex++;
@@ -1033,18 +1077,24 @@
10331077 if(*(MS.D->P->switch2 + i + 1) > 0) fileData = [fileData stringByAppendingFormat:@","];
10341078 }
10351079 fileData = [fileData stringByAppendingFormat:@"\n"];
1080+ }if(MS.D->P->type == 6){
1081+ fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent];
1082+ fileData = [fileData stringByAppendingFormat:@"◆6\n"];
1083+ fileData = [fileData stringByAppendingFormat:@"%d, %d,", MS.D->P->timerMin, MS.D->P->timerSec];
1084+ fileData = [fileData stringByAppendingFormat:@"%d, %d, %d\n", MS.D->P->timerRun, MS.D->P->timerMode, MS.D->P->timerVisible];
1085+
10361086 }if(MS.D->P->type == 7){
10371087 fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent];
1038- fileData = [fileData stringByAppendingFormat:@"◆7/n"];
1039- fileData = [fileData stringByAppendingFormat:@"%@/n", MS.D->P->label];
1088+ fileData = [fileData stringByAppendingFormat:@"◆7\n"];
1089+ fileData = [fileData stringByAppendingFormat:@"%@\n", MS.D->P->label];
10401090 }if(MS.D->P->type == 8){
10411091 fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent];
1042- fileData = [fileData stringByAppendingFormat:@"◆8/n"];
1043- fileData = [fileData stringByAppendingFormat:@"%@/n", MS.D->P->labelJump];
1092+ fileData = [fileData stringByAppendingFormat:@"◆8\n"];
1093+ fileData = [fileData stringByAppendingFormat:@"%@\n", MS.D->P->labelJump];
10441094 }if(MS.D->P->type == 9){
10451095 fileData = [fileData stringByAppendingFormat:@"%d", MS.D->P->indent];
1046- fileData = [fileData stringByAppendingFormat:@"◆9/n"];
1047- fileData = [fileData stringByAppendingFormat:@"%@/n", MS.D->P->memo];
1096+ fileData = [fileData stringByAppendingFormat:@"◆9\n"];
1097+ fileData = [fileData stringByAppendingFormat:@"%@\n", MS.D->P->memo];
10481098 }
10491099 MS.D->P = MS.D->P->next;
10501100 }
Show on old repository browser