OSDN Git Service

ver0.631
authorKillery <Killery@kiritani-no-mac-mini.local>
Sat, 9 Apr 2016 12:56:11 +0000 (21:56 +0900)
committerKillery <Killery@kiritani-no-Mac-mini.local>
Sat, 9 Apr 2016 12:56:11 +0000 (21:56 +0900)
14 files changed:
Awars III/BuildChipList.h
Awars III/BuildChipList.m
Awars III/ChipView.m
Awars III/EventScene.m
Awars III/FieldScene.h
Awars III/FieldScene.m
Awars III/FieldView.m
Awars III/MapEditor.h
Awars III/MapEditor.m
Awars III/MapView.m
Awars III/ScenarioEditor.m
Awars III/UnitChipList.h
Awars III/UnitChipList.m
Awars III/en.lproj/MainMenu.xib

index a6818ae..99b3915 100755 (executable)
@@ -80,6 +80,7 @@ typedef struct _BUILDCHIP{
     NSImage *imgb;
     
     bool invisible;
+    bool GuildFlag;
     
 }BUILDCHIP;
 
@@ -141,6 +142,8 @@ int BuildChipNum;
     IBOutlet NSPopUpButton *PUresearch;
     IBOutlet NSPopUpButton *PUunion;
     
+    IBOutlet NSButton *BTNguild;
+    
     NSMutableArray *unitListPU;
     
     NSMutableArray *researchListMA;
index 4b356bd..5f0fdd7 100755 (executable)
@@ -105,7 +105,7 @@ NSInteger clickIndex;
     [PUunit addItemsWithTitles:unitListPU];
     
     [self initResearchList];
-    
+    [BTNguild setState:BC[clickIndex].GuildFlag];
     
     BCLDpoint.x = [BCLDetailPanel frame].origin.x + 0;
     BCLDpoint.y = [BCLDetailPanel frame].origin.y + 0;
@@ -113,6 +113,7 @@ NSInteger clickIndex;
     [BCLUnitResearchPanel makeKeyAndOrderFront:nil];
 }
 -(IBAction)unitResearchCloseBCL:(id)sender{
+    BC[clickIndex].GuildFlag = [BTNguild state];
     [BCLUnitResearchPanel close];
 }
 
@@ -366,6 +367,7 @@ NSInteger clickIndex;
             BC[j].type = [[items objectAtIndex:2] intValue];
             BC[j].linkDest = [[items objectAtIndex:3] retain];
             BC[j].linkNext = [[items objectAtIndex:4] retain];
+            if([items count] > 5) BC[j].GuildFlag = [[items objectAtIndex:5] intValue];
             
             items = [[fileDataArray objectAtIndex:6] componentsSeparatedByString:@","];
             
@@ -552,7 +554,8 @@ NSInteger clickIndex;
         fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", BC[i].capture]] stringByAppendingString:@","];
         fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", BC[i].type]] stringByAppendingString:@","];
         fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", BC[i].linkDest]] stringByAppendingString:@","];
-        fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", BC[i].linkNext]] stringByAppendingString:@"\n"];
+        fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", BC[i].linkNext]] stringByAppendingString:@","];
+        fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", BC[i].GuildFlag]] stringByAppendingString:@"\n"];
         fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", BC[i].iName]] stringByAppendingString:@","];
         fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", BC[i].iNameb]] stringByAppendingString:@"\n"];
         fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"----"]] stringByAppendingString:@"\n"];
index 2023e35..5313865 100755 (executable)
             for(by=0;by<8;by++){
                 [self DrawImage:chip x:bx*32 y:by*32 cx:bx cy:by];
                 NSImage *BCI = BC[(by*3 + bx)+(BuildChipListIndex-1)*24].img;
-                [BCI setFlipped:NO];
+                
                 [self DrawImage:BCI x:bx*32 y:by*32 cx:bx cy:by];
             }
         }
             for(by=0;by<8;by++){
                 [self DrawImage:chip x:bx*32 y:by*32 cx:bx cy:by];
                 NSImage *UCI = UC[(by*3 + bx)+(UnitChipListIndex-1)*24].img;
-                [UCI setFlipped:NO];
+                
                 [self DrawImage:UCI x:bx*32 y:by*32 cx:bx cy:by];
             }
         }
         for(by=0;by<8;by++){
             [self DrawImage:chip x:bx*32 y:by*32 cx:bx cy:by];
             NSImage *LCI = LC[(by*3 + bx)+(LoadChipListIndex-1)*24].img;
-            //[UCI setFlipped:true];
+            
             [self DrawImage:LCI x:bx*32 y:by*32 cx:bx cy:by];
             }
         }
index 70da387..aab2634 100755 (executable)
@@ -81,8 +81,8 @@
     if(!ST){
         if(!startOrEndFlag){
             mapInitFlag = true;
-            MapView *mapInit = [[MapView alloc] init];
-            [mapInit loadMapChip];
+            
+            [MapViewInst loadMapChip];
             mapInitFlag = false;
             [nameTF setStringValue:@""];
             [dialogTF setStringValue:@""];
         
         fadeFlag = false;
         mapInitFlag = true;
-        MapView *mapInit = [[MapView alloc] init];
-        [mapInit loadMapChip];
+        [MapViewInst loadMapChip];
         mapInitFlag = false;
         [fsWindow makeKeyAndOrderFront:nil];
         [esWindow close];
index 3421367..12a21f5 100755 (executable)
@@ -282,6 +282,21 @@ int DUNnum;
 bool extentBattleFlag2;
 bool extentMPcostFlag;
 
+int *GuildChosen1;
+int *GuildChosen2;
+int GCnum1;
+int GCnum2;
+
+int *GuildDisp1;
+int *GuildDisp2;
+
+int *saveGuildList;
+int guildc;
+bool guildRE1;
+bool guildRE2;
+int Gnum1;
+int Gnum2;
+
 @interface FieldScene : NSObject
 {
     NSTimer *time;
@@ -582,12 +597,12 @@ bool extentMPcostFlag;
 
 
 
-
+-(int)chooseGuildList:(int*)value gcnum:(int)gcnum;
 -(void)addBuildStatus;
 
 @end
 
-
+FieldScene *fieldScene;
 
 
 
index a40aaab..adaf6df 100755 (executable)
@@ -61,6 +61,9 @@
                  userInfo:nil
                  repeats:YES
                  ];
+        
+        fieldScene = self;
+        
         P[0].name = @"青軍";
         P[0].type = 0;
         P[0].resource = 500;
     
     B = &BC[buildNum[possionX][possionY]];
     
+    
     RESEARCH *Rtop;
     UNITCHIP *BU;
     
     Rtop = B->R;
-
+    if(B->R){
     BU = B->R->U;
     BRU = BU;
-    
     for(int i = 0;i <= crCRL;i++){
         BU = B->R->U;
         BRU = BU;
         B->R = B->R->next;
     }
     B->R = Rtop;
-    BRUindex = 0;
-    for (int i = 0; BRU->nameID != UC[i].nameID;i++) {
+        BRUindex = 0;
+    for (int i = 0; BRU->nameID != UC[i].nameID && i < UCN;i++) {
         BRUindex++;
+        
+    }
+        return;
     }
     
-}
+    if(buildTeam[possionX][possionY] == 0 || buildTeam[possionX][possionY] == 1){
+        
+        int k = 0;
+        B->R = Rtop;
+        while (B->R) {
+            B->R = B->R->next;
+            k++;
+        }
+        
+        for(int i = k;i <= crCRL;i++){
+            
+            [researchATK setStringValue:[NSString stringWithFormat:@"攻撃力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.ATK]];
+            [researchDEF setStringValue:[NSString stringWithFormat:@"防御力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.DEF]];
+            [researchCAP setStringValue:[NSString stringWithFormat:@"演算力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.CAP]];
+            [researchACU setStringValue:[NSString stringWithFormat:@"命中値 %g", UC[*(GuildDisp1 + i - k)-1].S_M.ACU]];
+            [researchEVA setStringValue:[NSString stringWithFormat:@"回避値 %g", UC[*(GuildDisp1 + i - k)-1].S_M.EVA]];
+            [researchMOV setStringValue:[NSString stringWithFormat:@"移動力 %d", UC[*(GuildDisp1 + i - k)-1].S_M.MOV]];
+            [researchIMG setImage:UC[*(GuildDisp1 + i - k)-1].imgb];
+            [researchIMG setImageScaling:NSScaleToFit];
+            
+        }B->R = Rtop;
+        
+        BRUindex = 0;
+        for (int i = 0; UC[*(GuildDisp1 + crCRL - k)-1].nameID != UC[i].nameID && i < UCN;i++) {
+            BRUindex++;
+        }BRU = &UC[BRUindex];
+        
+    
+        
+    }else if(buildTeam[possionX][possionY] == 2 || buildTeam[possionX][possionY] == 3){
+        
+        int k = 0;
+        B->R = Rtop;
+        while (B->R) {
+            B->R = B->R->next;
+            k++;
+        }
+        
+        for(int i = k;i <= crCRL;i++){
+            
+            [researchATK setStringValue:[NSString stringWithFormat:@"攻撃力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.ATK]];
+            [researchDEF setStringValue:[NSString stringWithFormat:@"防御力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.DEF]];
+            [researchCAP setStringValue:[NSString stringWithFormat:@"演算力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.CAP]];
+            [researchACU setStringValue:[NSString stringWithFormat:@"命中値 %g", UC[*(GuildDisp2 + i - k)-1].S_M.ACU]];
+            [researchEVA setStringValue:[NSString stringWithFormat:@"回避値 %g", UC[*(GuildDisp2 + i - k)-1].S_M.EVA]];
+            [researchMOV setStringValue:[NSString stringWithFormat:@"移動力 %d", UC[*(GuildDisp2 + i - k)-1].S_M.MOV]];
+            [researchIMG setImage:UC[*(GuildDisp2 + i - k)-1].imgb];
+            [researchIMG setImageScaling:NSScaleToFit];
+            
+        }B->R = Rtop;
+        
+  
+        BRUindex = 0;
+        for (int i = 0; UC[*(GuildDisp2 + crCRL - k)-1].nameID != UC[i].nameID && i < UCN;i++) {
+            BRUindex++;
+        }BRU = &UC[BRUindex];
+    }
+
+    
+    
+    
+    
+   }
 
 -(void)SetStatusFunc{
     double STRfix;
             DUN[i] = 0;
         }
         
+        [self initGuildList];
     }
     
     
                     stanbyFlag = false;
                     wtMovedFlag = false;
                     wtAttackedFlag = false;
+                    guildRE1 = false;
+                    guildRE2 = false;
                     
                     if(buildNum[U->x][U->y] >= 0){
                         B = BTop;
@@ -2664,6 +2735,8 @@ w000p:
 
 -(bool)setBuildList{
 
+    crCRL = 0;
+    
     [self willChangeValueForKey:@"CResearchListMA"];
     [CResearchListMA removeAllObjects];
     [self didChangeValueForKey:@"CResearchListMA"];
@@ -2682,10 +2755,24 @@ w000p:
     
     Rtop = B0->R;
     
-    if(!B0->R){
+    
+    if(buildTeam[possionX][possionY] == 0 || buildTeam[possionX][possionY] == 1){
+    
+        
+        if(GCnum1 < 0)
+        if(!B0->R){
         return false;
-    }
     
+        }
+    }else if(buildTeam[possionX][possionY] == 2 || buildTeam[possionX][possionY] == 3){
+    
+    
+        if(GCnum2 < 0)
+        if(!B0->R){
+            return false;
+            
+        }
+    }
     while(B0->R){
         BU = B0->R->U;
         
@@ -2711,13 +2798,13 @@ w000p:
     
     B = &BC[buildNum[possionX][possionY]];
     
+    if(B0->R){
     Rtop = B->R;
     
     BU = B->R->U;
     BRU = BU;
     
-    crCRL = 0;
-    for(int i = 0;i <= crCRL;i++){
+    for(int i = 0;i <= crCRL && B->R;i++){
         BU = B->R->U;
         BRU = BU;
         [researchATK setStringValue:[NSString stringWithFormat:@"攻撃力 %g", BU->S_M.ATK]];
@@ -2732,9 +2819,220 @@ w000p:
         B->R = B->R->next;
     }
     B->R = Rtop;
+    }
+    
+    MAPSCRIPT MS = MF[MFselectedRow+1].MS;
+    
+    if(B->GuildFlag &&( buildTeam[possionX][possionY] == 0 || buildTeam[possionX][possionY] == 1)){
+    
+        int a = MS.guildListRegistNum12 - MS.guildListRegistNum11;
+        
+        if(!guildRE1){
+        Gnum1 = 0;
+        if(a > 0)
+            Gnum1 = MS.guildListRegistNum11 + arc4random()%(MS.guildListRegistNum12 - MS.guildListRegistNum11+1);
+        else
+            Gnum1 = MS.guildListRegistNum12;
+        
+        if(Gnum1 > GCnum1+1)
+            Gnum1 = GCnum1;
+        }
+        int n = 0;
+        guildc = 0;
+        saveGuildList = calloc((GCnum1+1), sizeof(int));
+        if(!guildRE1) GuildDisp1 = calloc(Gnum1, sizeof(int));
+        for(int i = 0;i < Gnum1;i++){
+            
+            if(!guildRE1){
+                n = [self chooseGuildList:GuildChosen1 gcnum:GCnum1];
+            if(n == -1)
+                break;
+                *(GuildDisp1 + i) = *(GuildChosen1 + n);
+            }
+        
+            if(*(GuildDisp1 + i) <= 0)
+                break;
+            
+            NSMutableDictionary* dict = [NSMutableDictionary new];
+            [dict setValue:[NSString stringWithFormat:@"%@", UC[*(GuildDisp1 + i)-1].name] forKey:@"name"];
+            [dict setValue:[NSString stringWithFormat:@"%g", UC[*(GuildDisp1 + i)-1].S_M.HP] forKey:@"HP"];
+            [dict setValue:[NSString stringWithFormat:@"資%d 食%d 金%d", UC[*(GuildDisp1 + i)-1].S_M.cSupply, UC[*(GuildDisp1 + i)-1].S_M.cFood, UC[*(GuildDisp1 + i)-1].S_M.cMoney] forKey:@"cost"];
+            [dict setValue:UC[*(GuildDisp1 + i)-1].img forKey:@"img"];
+            
+            
+            [self willChangeValueForKey:@"CResearchListMA"];
+            [CResearchListMA addObject:dict];
+            [self didChangeValueForKey:@"CResearchListMA"];
+    
+        }
+        
+        
+        
+        int k = 0;
+        B->R = Rtop;
+        while (B->R) {
+            B->R = B->R->next;
+            k++;
+        }
+        
+        for(int i = k;i <= crCRL;i++){
+            
+            [researchATK setStringValue:[NSString stringWithFormat:@"攻撃力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.ATK]];
+            [researchDEF setStringValue:[NSString stringWithFormat:@"防御力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.DEF]];
+            [researchCAP setStringValue:[NSString stringWithFormat:@"演算力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.CAP]];
+            [researchACU setStringValue:[NSString stringWithFormat:@"命中値 %g", UC[*(GuildDisp1 + i - k)-1].S_M.ACU]];
+            [researchEVA setStringValue:[NSString stringWithFormat:@"回避値 %g", UC[*(GuildDisp1 + i - k)-1].S_M.EVA]];
+            [researchMOV setStringValue:[NSString stringWithFormat:@"移動力 %d", UC[*(GuildDisp1 + i - k)-1].S_M.MOV]];
+            [researchIMG setImage:UC[*(GuildDisp1 + i - k)-1].imgb];
+            [researchIMG setImageScaling:NSScaleToFit];
+            
+        }B->R = Rtop;
+        
+        guildRE1 = true;
+    }else if(B->GuildFlag && (buildTeam[possionX][possionY] == 2 || buildTeam[possionX][possionY] == 3)){
+    
+        int a = MS.guildListRegistNum22 - MS.guildListRegistNum21;
+        
+        if(!guildRE2){
+        Gnum2 = 0;
+        if(a > 0)
+            Gnum2 = MS.guildListRegistNum21 + arc4random()%(MS.guildListRegistNum22 - MS.guildListRegistNum21+1);
+        else
+            Gnum2 = MS.guildListRegistNum22;
+        
+        if(Gnum2 > GCnum2+1)
+            Gnum2 = GCnum2;
+        }
+        int n = 0;
+        
+        guildc = 0;
+        saveGuildList = calloc((GCnum2+1), sizeof(int));
+        if(!guildRE2) GuildDisp2 = calloc(Gnum2, sizeof(int));
+        for(int i = 0;i < Gnum2;i++){
+            if(!guildRE2){
+                n = [self chooseGuildList:GuildChosen2 gcnum:GCnum2];
+                if(n == -1)
+                    break;
+                *(GuildDisp2 + i) = *(GuildChosen2 + n);
+            }
+            
+            if(*(GuildDisp2 + i) <= 0)
+                break;
+            
+            NSMutableDictionary* dict = [NSMutableDictionary new];
+            [dict setValue:[NSString stringWithFormat:@"%@", UC[*(GuildDisp2 + i)-1].name] forKey:@"name"];
+            [dict setValue:[NSString stringWithFormat:@"%g", UC[*(GuildDisp2 + i)-1].S_M.HP] forKey:@"HP"];
+            [dict setValue:[NSString stringWithFormat:@"資%d 食%d 金%d", UC[*(GuildDisp2 + i)-1].S_M.cSupply, UC[*(GuildDisp2 + i)-1].S_M.cFood, UC[*(GuildDisp2 + i)-1].S_M.cMoney] forKey:@"cost"];
+            [dict setValue:UC[*(GuildDisp2 + i)-1].img forKey:@"img"];
+            
+            
+            [self willChangeValueForKey:@"CResearchListMA"];
+            [CResearchListMA addObject:dict];
+            [self didChangeValueForKey:@"CResearchListMA"];
+        }
+        
+        int k = 0;
+        B->R = Rtop;
+        while (B->R) {
+            B->R = B->R->next;
+            k++;
+        }
+        
+        for(int i = k;i <= crCRL;i++){
+            
+            [researchATK setStringValue:[NSString stringWithFormat:@"攻撃力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.ATK]];
+            [researchDEF setStringValue:[NSString stringWithFormat:@"防御力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.DEF]];
+            [researchCAP setStringValue:[NSString stringWithFormat:@"演算力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.CAP]];
+            [researchACU setStringValue:[NSString stringWithFormat:@"命中値 %g", UC[*(GuildDisp2 + i - k)-1].S_M.ACU]];
+            [researchEVA setStringValue:[NSString stringWithFormat:@"回避値 %g", UC[*(GuildDisp2 + i - k)-1].S_M.EVA]];
+            [researchMOV setStringValue:[NSString stringWithFormat:@"移動力 %d", UC[*(GuildDisp2 + i - k)-1].S_M.MOV]];
+            [researchIMG setImage:UC[*(GuildDisp2 + i - k)-1].imgb];
+            [researchIMG setImageScaling:NSScaleToFit];
+            
+        }B->R = Rtop;
+        
+        
+        guildRE2 = true;
+    }
+    
+    
+    
+    
+    
+    
+    
     
     return true;
 }
+-(int)chooseGuildList:(int*)value gcnum:(int)gcnum{
+
+    int a = 0;
+    while(1){
+        bool sameFlag = false;
+        bool sameFlag2 = false;
+        
+        if(guildc >= gcnum+1){
+            a = -1;
+            break;
+        }
+        
+        a = arc4random()%(gcnum+1);
+        
+        for(int i = 0;i < guildc;i++){
+            if(*(saveGuildList+i) == a){
+                sameFlag2 = true;
+                break;
+            }
+        }
+        
+        if(sameFlag2)
+            continue;
+        
+        *(saveGuildList+guildc) = a;
+        
+        guildc++;
+        
+        U = UTop;
+        while(U){
+            if([UC[*(value + a)-1].nameID isEqualToString:U->C.nameID]){
+                sameFlag = true;
+                break;
+            }
+            U = U->next;
+        }U = UTop;
+        
+        if(!sameFlag)
+            break;
+    }
+
+
+    return a;
+}
+
+-(void)initGuildList{
+
+    MAPSCRIPT MS = MF[MFselectedRow+1].MS;
+    
+    GuildChosen1 = calloc(UCN, sizeof(int));
+    GuildChosen2 = calloc(UCN, sizeof(int));
+
+    GCnum1 = -1;
+    for (int i = 0;i < UCN;i++) {
+        if(MS.guildListRegist[i]){
+            GCnum1++;
+            *(GuildChosen1 + GCnum1) = i+1;
+        }
+    }
+    GCnum2 = -1;
+    for (int i = 0;i < UCN;i++) {
+        if(MS.guildListRegist2[i]){
+            GCnum2++;
+            *(GuildChosen2 + GCnum2) = i+1;
+        }
+    }
+
+}
+
 
 -(void)SetMenu{
     
index 4c357da..769d15a 100755 (executable)
     
     
     if(evInitMap) {evInitMap = false;
-        //[self loadMesh:SC[storyNumb].nameMAP index:scenarioNumb];
-        /*
-         MapView *MV = [MapView alloc];
-         [MV loadMapChip];
-         */
+
         NSRect seRect = NSMakeRect(0, 0, chipWidth*32, chipHeight*32);
         [self setFrame:seRect];
         chipNum[0][0] = 0;
                 UT = 2;
             }
             
+            if(!B0.GuildFlag){
             while(B0.R){
                 BU = B0.R->U;
                 BRU = BU;
                 
                     B0.R = B0.R->next;
             }B0.R = Rtop;
+            }else{
+                
+                bool EmadeNonGuildFlag = false;
+                int k = 0;
+                while(B0.R){
+                    BU = B0.R->U;
+                    BRU = BU;
+                    if(B->makeLv >= B0.R->Lv && unitNum[B->x][B->y] < 0){
+                        
+                        int rdmCnt = rand()%100;
+                        
+                        if(BU && rdmCnt > 60){
+                            if(BU->S_M.cSupply <= P[UT].resource &&
+                               BU->S_M.cFood <= P[UT].food &&
+                               BU->S_M.cMoney <= P[UT].money){
+                                
+                                
+                                P[UT].resource -= BU->S_M.cSupply;
+                                P[UT].food -= BU->S_M.cFood;
+                                P[UT].money -= BU->S_M.cMoney;
+                                
+                                unitNum[B->x][B->y] = BU->chipNumb;
+                                unitTeam[B->x][B->y] = B->team;
+                                possionX = B->x;
+                                possionY = B->y;
+                                [self addUnitStatusFix];
+                                EmadeNonGuildFlag = true;
+                                break;
+                            }
+                        }
+                    }
+                    
+                    B0.R = B0.R->next;
+                    k++;
+                }B0.R = Rtop;
             
+                MAPSCRIPT MS = MF[MFselectedRow+1].MS;
+                
+                if(!EmadeNonGuildFlag){
+                
+                    possionX = B->x;
+                    possionY = B->y;
+                    
+                    if((buildTeam[possionX][possionY] == 0 || buildTeam[possionX][possionY] == 1)){
+                        
+                        int a = MS.guildListRegistNum12 - MS.guildListRegistNum11;
+                        
+                        if(!guildRE1){
+                            Gnum1 = 0;
+                            if(a > 0)
+                                Gnum1 = MS.guildListRegistNum11 + arc4random()%(MS.guildListRegistNum12 - MS.guildListRegistNum11+1);
+                            else
+                                Gnum1 = MS.guildListRegistNum12;
+                            
+                            if(Gnum1 > GCnum1+1)
+                                Gnum1 = GCnum1;
+                        }
+                        int n = 0;
+                        int j = 0;
+                        guildc = 0;
+                        saveGuildList = calloc((GCnum1+1), sizeof(int));
+                        if(!guildRE1) GuildDisp1 = calloc(Gnum1, sizeof(int));
+                        for(int i = 0;i < Gnum1;i++){
+                            
+                            if(!guildRE1){
+                                n = [fieldScene chooseGuildList:GuildChosen1 gcnum:GCnum1];
+                                if(n == -1)
+                                    break;
+                                *(GuildDisp1 + i) = *(GuildChosen1 + n);
+                            }
+                            
+                            if(*(GuildDisp1 + i) <= 0)
+                                break;
+                            j++;
+                        }
+                        
+                        j = arc4random()%(j+1);
+                        
+                        BRUindex = 0;
+                        for (int i = 0; UC[*(GuildDisp1 + j - k)-1].nameID != UC[i].nameID && i < UCN;i++) {
+                            BRUindex++;
+                        }BRU = &UC[BRUindex];
+                        
+                        guildRE1 = true;
+                    }else if((buildTeam[possionX][possionY] == 2 || buildTeam[possionX][possionY] == 3)){
+                        
+                        int a = MS.guildListRegistNum22 - MS.guildListRegistNum21;
+                        
+                        if(!guildRE2){
+                            Gnum2 = 0;
+                            if(a > 0)
+                                Gnum2 = MS.guildListRegistNum21 + arc4random()%(MS.guildListRegistNum22 - MS.guildListRegistNum21+1);
+                            else
+                                Gnum2 = MS.guildListRegistNum22;
+                            
+                            if(Gnum2 > GCnum2+1)
+                                Gnum2 = GCnum2;
+                        }
+                        int n = 0;
+                        int j = 0;
+                        guildc = 0;
+                        saveGuildList = calloc((GCnum2+1), sizeof(int));
+                        if(!guildRE2) GuildDisp2 = calloc(Gnum2, sizeof(int));
+                        for(int i = 0;i < Gnum2;i++){
+                            if(!guildRE2){
+                                n = [fieldScene chooseGuildList:GuildChosen2 gcnum:GCnum2];
+                                if(n == -1)
+                                    break;
+                                *(GuildDisp2 + i) = *(GuildChosen2 + n);
+                            }
+                            
+                            if(*(GuildDisp2 + i) <= 0)
+                                break;
+                        }
+                        
+                        
+                        j = arc4random()%(j+1);
+                        
+                        BRUindex = 0;
+                        for (int i = 0; UC[*(GuildDisp2 + j - k)-1].nameID != UC[i].nameID && i < UCN;i++) {
+                            BRUindex++;
+                        }BRU = &UC[BRUindex];
+                        
+                        guildRE2 = true;
+                    } 
+                
+                int rdmCnt = rand()%100;
+                    
+                    if(BRU && rdmCnt > 50)
+                    if(BRU->S_M.cSupply <= P[UT].resource &&
+                       BRU->S_M.cFood <= P[UT].food &&
+                       BRU->S_M.cMoney <= P[UT].money){
+                        
+                        
+                        P[UT].resource -= BRU->S_M.cSupply;
+                        P[UT].food -= BRU->S_M.cFood;
+                        P[UT].money -= BRU->S_M.cMoney;
+                        
+                        unitNum[B->x][B->y] = BRU->chipNumb;
+                        unitTeam[B->x][B->y] = B->team;
+                        [self addUnitStatusFix];
+                        break;
+                    }
+                }
+                
+            
+            }
         }
         B = B->next;
     }B = BTop;
index 09d1ec7..afe89e8 100644 (file)
@@ -302,6 +302,12 @@ typedef struct _MAPSCRIPT{
     bool scenarioSetMode;
     int scenarioNumbCrnt;
     int scenarioNumbNext;
+    int guildListRegist[4096];
+    int guildListRegistNum11;
+    int guildListRegistNum12;
+    int guildListRegist2[4096];
+    int guildListRegistNum21;
+    int guildListRegistNum22;
     
     NSMutableArray *SCRPTname;
     struct _MAPSCRIPTD *D;
@@ -473,6 +479,9 @@ bool fuckingRetardedBtnPushed1;
 
 int fileNumb;
 
+int eventGuildListRow;
+bool eventGUildListFlag;
+
 NSTimer *timeMapEditor;
 
 @interface MapEditor : NSObject
@@ -905,9 +914,24 @@ NSTimer *timeMapEditor;
     IBOutlet NSTextField *eventScenarioCrntTF;
     IBOutlet NSTextField *eventScenarioNextTF;
     
+    
+    IBOutlet NSWindow *eventGuildListWindow;
 
+    NSMutableArray *eventGuildListMA;
+    IBOutlet NSArrayController *eventGuildListAC;
+    IBOutlet NSTableView *eventGuildListTV;
+    IBOutlet NSTextField *eventGuildTF1;
+    IBOutlet NSTextField *eventGuildTF2;
+    IBOutlet NSButtonCell *eventGuildBC1;
+    IBOutlet NSButtonCell *eventGuildBC2;
+    IBOutlet NSButton *eventGuildBTN;
 }
 
+
+-(IBAction)eventGuildBtnCell:(id)sender;
+-(IBAction)eventGuildBtn:(id)sender;
+-(IBAction)eventGuildBtnSubmit:(id)sender;
+
 -(IBAction)EDSWOKbtn:(id)sender;
 -(IBAction)EDSWCancelbtn:(id)sender;
 
index d20a6e0..b2eb452 100755 (executable)
     [EDbranchBuildTV setTarget:self];
     [EDbranchBuildTV setAction:@selector(ClickBB:)];
     
+    [eventGuildListTV setTarget:self];
+    [eventGuildListTV setAction:@selector(ClickEG:)];
+    
     EEGC1MA = [NSMutableArray new];
     EEGC2MA = [NSMutableArray new];
     
     EDbranchPlaceMA = [NSMutableArray new];
     EDbranchObjeMA = [NSMutableArray new];
     EDbranchBuildMA = [NSMutableArray new];
+    
+    eventGuildListMA = [NSMutableArray new];
 
     
 }
     return self;
 }
 
+-(void)ClickEG:(id)sender{
+
+    eventGuildListRow = (int)[eventGuildListTV clickedRow];
+
+
+}
+
 -(void)EDdeleteFunc:(MAPSCRIPT)MS msd:(MAPSCRIPTD*)MSD{
     
     squareCnt = 1;
             k++;
         }
     }
+    
+    
+    if(eventGUildListFlag){
+    
+        [self setEventGuildList];
+    }
 }
 
 -(IBAction)eventCheckBtn:(id)sender{
 }
 
 
+-(void)initEventGuildList{
+    [self willChangeValueForKey:@"eventGuildListMA"];
+    [eventGuildListMA removeAllObjects];
+    [self didChangeValueForKey:@"eventGuildListMA"];
+    
+    
+    if([eventGuildBC1 isHighlighted]){
+    for(int i = 0;i < UCN;i++){
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        
+        
+        [dict setValue:[NSString stringWithFormat:@"%@", UC[i].name] forKey:@"name"];
+        [dict setValue:UC[i].imgb forKey:@"img"];
+        [dict setValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegist[i]] forKey:@"chk"];
+        
+        [self willChangeValueForKey:@"eventGuildListMA"];
+        [eventGuildListMA addObject:dict];
+        [self didChangeValueForKey:@"eventGuildListMA"];
+        
+        
+    }
 
 
+    [eventGuildTF1 setStringValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegistNum11]];
+    [eventGuildTF2 setStringValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegistNum12]];
+    }else if([eventGuildBC2 isHighlighted]){
+        for(int i = 0;i < UCN;i++){
+            NSMutableDictionary* dict = [NSMutableDictionary new];
+            
+            
+            [dict setValue:[NSString stringWithFormat:@"%@", UC[i].name] forKey:@"name"];
+            [dict setValue:UC[i].imgb forKey:@"img"];
+            [dict setValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegist2[i]] forKey:@"chk"];
+            
+            [self willChangeValueForKey:@"eventGuildListMA"];
+            [eventGuildListMA addObject:dict];
+            [self didChangeValueForKey:@"eventGuildListMA"];
+            
+            
+        }
+        
+        
+        [eventGuildTF1 setStringValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegistNum21]];
+        [eventGuildTF2 setStringValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegistNum22]];
+    
+    
+    }
+}
+
+-(void)setEventGuildList{
+    
+    if([eventGuildBC1 state] != 0){
+    for(int i = 0;i < UCN;i++){
+        
+        MF[MFselectedRow+1].MS.guildListRegist[i] = [[eventGuildListMA[i] valueForKey:@"chk"] intValue];
+        
+        
+    }
+    
+    MF[MFselectedRow+1].MS.guildListRegistNum11 = [eventGuildTF1 intValue];
+    MF[MFselectedRow+1].MS.guildListRegistNum12 = [eventGuildTF2 intValue];
+    }else if([eventGuildBC2 state] != 0){
+        for(int i = 0;i < UCN;i++){
+            
+            MF[MFselectedRow+1].MS.guildListRegist2[i] = [[eventGuildListMA[i] valueForKey:@"chk"] intValue];
+            
+            
+        }
+        
+        MF[MFselectedRow+1].MS.guildListRegistNum21 = [eventGuildTF1 intValue];
+        MF[MFselectedRow+1].MS.guildListRegistNum22 = [eventGuildTF2 intValue];
+        
+        
+        
+    }
+
+    
+}
+
+-(IBAction)eventGuildBtnCell:(id)sender{
+    
+    
+    [self initEventGuildList];
+}
+
+-(IBAction)eventGuildBtn:(id)sender{
+    eventGUildListFlag = true;
+    [eventGuildBC1 setState:YES];
+    [eventGuildBC2 setState:NO];
+    
+    [self willChangeValueForKey:@"eventGuildListMA"];
+    [eventGuildListMA removeAllObjects];
+    [self didChangeValueForKey:@"eventGuildListMA"];
+    
+    for(int i = 0;i < UCN;i++){
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        
+        
+        [dict setValue:[NSString stringWithFormat:@"%@", UC[i].name] forKey:@"name"];
+        [dict setValue:UC[i].imgb forKey:@"img"];
+        [dict setValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegist[i]] forKey:@"chk"];
+        
+        [self willChangeValueForKey:@"eventGuildListMA"];
+        [eventGuildListMA addObject:dict];
+        [self didChangeValueForKey:@"eventGuildListMA"];
+        
+        
+    }
+
+    [eventGuildTF1 setStringValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegistNum11]];
+    [eventGuildTF2 setStringValue:[NSString stringWithFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegistNum12]];
+    
+    [eventGuildListWindow makeKeyAndOrderFront:nil];
+
+}
+-(IBAction)eventGuildBtnSubmit:(id)sender{
+    eventGUildListFlag = false;
+    
+    [eventGuildListWindow close];
+
+}
+
 
 
 
index 1e2284b..d935659 100644 (file)
     fileData = [NSString stringWithContentsOfFile:pathDATA encoding:NSUTF8StringEncoding error:nil];
     fileDataArray = [fileData componentsSeparatedByString:@"\n"];
     
+    if(mapInitFlag){
+        MFselectedRow = 0;
+        for (int i = 1;i < 512;i++) {
+            if([[SC[storyNumb].nameMAP objectAtIndex:scenarioNumb] isEqualToString:[NSString stringWithFormat:@"%@", MF[i].fileName]])
+                break;
+            MFselectedRow++;
+        }
+    }
     
     if(!fileData){
         mapChipDataLoadFail = true;
         }
     }
     
-    NSLog(@"%d", unitNum[1][1]);
+    //NSLog(@"%d", unitNum[1][1]);
     
-    bool EGdarkFlag = false;
+    NSArray *items00 = [[fileDataArray objectAtIndex:indexCnt] componentsSeparatedByString:@","];
     
-    if(mapInitFlag){
-    MFselectedRow = 0;
-    for (int i = 1;i < 512;i++) {
-        if([[SC[storyNumb].nameMAP objectAtIndex:scenarioNumb] isEqualToString:[NSString stringWithFormat:@"%@", MF[i].fileName]])
-            break;
-        MFselectedRow++;
+    MF[MFselectedRow+1].MS.guildListRegistNum11 = [[items00 objectAtIndex:0] intValue];
+    MF[MFselectedRow+1].MS.guildListRegistNum12 = [[items00 objectAtIndex:1] intValue];
+    
+    indexCnt++;
+    
+    NSArray *items0 = [[fileDataArray objectAtIndex:indexCnt] componentsSeparatedByString:@","];
+    
+    for(int i = 0;i < [items0 count];i++){
+        MF[MFselectedRow+1].MS.guildListRegist[i] = [[items0 objectAtIndex:i] intValue];
     }
+    
+    indexCnt++;
+    
+    items00 = [[fileDataArray objectAtIndex:indexCnt] componentsSeparatedByString:@","];
+    
+    MF[MFselectedRow+1].MS.guildListRegistNum21 = [[items00 objectAtIndex:0] intValue];
+    MF[MFselectedRow+1].MS.guildListRegistNum22 = [[items00 objectAtIndex:1] intValue];
+    
+    indexCnt++;
+    
+    items0 = [[fileDataArray objectAtIndex:indexCnt] componentsSeparatedByString:@","];
+    
+    for(int i = 0;i < [items0 count];i++){
+        MF[MFselectedRow+1].MS.guildListRegist2[i] = [[items0 objectAtIndex:i] intValue];
     }
     
+    indexCnt++;
+    
+    
+    
+    bool EGdarkFlag = false;
+    
     
     int EGcnt = 0;
-    for(int i = indexCnt;i < [fileDataArray count];i++){indexCnt++;
+    indexCnt++;
+    for(int i = indexCnt;i < [fileDataArray count];i++){
         NSArray *items = [[fileDataArray objectAtIndex:i] componentsSeparatedByString:@"|"];
         EGcnt++;
         
         
         
         }
+        
         if([[fileDataArray objectAtIndex:i] isEqualToString:@"----"])
             break;
+        indexCnt++;
     }
     
+    indexCnt++;
     NSArray *items = [[fileDataArray objectAtIndex:indexCnt] componentsSeparatedByString:@","];
     
     playerSet1 = [[items objectAtIndex:0] intValue];
         }
     }
     
+    fileData = [fileData stringByAppendingFormat:@"----\n"];
+    
+    fileData = [fileData stringByAppendingFormat:@"%d,%d\n", MF[MFselectedRow+1].MS.guildListRegistNum11, MF[MFselectedRow+1].MS.guildListRegistNum12];
+    
+    for(int i = 0;i < UCN;i++){
+        if(i > 0) fileData = [fileData stringByAppendingFormat:@","];
+        fileData = [fileData stringByAppendingFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegist[i]];
+    }
+    
+    fileData = [fileData stringByAppendingFormat:@"\n"];
+    
+    
+    fileData = [fileData stringByAppendingFormat:@"%d,%d\n", MF[MFselectedRow+1].MS.guildListRegistNum21, MF[MFselectedRow+1].MS.guildListRegistNum22];
+    
+    for(int i = 0;i < UCN;i++){
+        if(i > 0) fileData = [fileData stringByAppendingFormat:@","];
+        fileData = [fileData stringByAppendingFormat:@"%d", MF[MFselectedRow+1].MS.guildListRegist2[i]];
+    }
+    
+    fileData = [fileData stringByAppendingFormat:@"\n"];
+    
     
     fileData = [fileData stringByAppendingFormat:@"----\n"];
     fileData = [fileData stringByAppendingFormat:@"%d|%d",
index fc5c2cc..9d8db29 100755 (executable)
         return;
     }
         
-        /*
-    I = Itop;
-    
-    for(int i = 0;i < SEMA1row;i++){
-        I = I->next;
-    }
-    
-    BASE *b = I->B;
-    BASE *bTop = b;
-    for(int i = 0;i < SEMA1row;i++){
-        b = b->next;
-    }
-    
-    
-    LAYER *lTop = b->L;
-    int i = 0;
-    
-    if(b->L){
-    if(TX[st].S->i->SEMA3flag){
-        
-        while(b->L){
-            
-            b->L->visibleInstant = [[SEMA3[i] valueForKey:@"v"] intValue];
-            
-            b->L = b->L->next;
-            i++;
-        }b->L = lTop;
-        
-    }
-    }
-    b = bTop;
-    
-    I = Itop;
-         */
         TX[st].S->i = TX[st].S->i->next;
     }
     TX[st].S->i = SItop;
index 34cce93..3492fea 100755 (executable)
@@ -202,15 +202,7 @@ typedef struct _EQUIP{
     
 }EQUIP;
 
-typedef struct _COMMANDS{
-    
-    struct _COMMANDS *next;
-    NSString *cmd;
-    int waza;
-    NSString *hasei;
-    
 
-}COMMANDS;
 
 typedef struct _COMBO{
     
@@ -226,7 +218,6 @@ typedef struct _COMMAND{
     int C;
     int D;
     
-    COMMANDS *cs;
     COMBO *co;
 
 }COMMAND;
@@ -374,12 +365,15 @@ int SKLUrow;
 int ANLrow;
 
 int CMDrow;
+int CMBrow;
 
 SKILL *Stop;
 ANI *ani;
 
 int UCN;
 
+int CLN;
+
 int UnitChipNum;
 
 int frameMax;
index 22d0842..3ef4b69 100644 (file)
@@ -50,6 +50,9 @@
     [commandListTV setTarget:self];
     [commandListTV setAction:@selector(ClickCMD:)];
     
+    [comboListTV setTarget:self];
+    [comboListTV setAction:@selector(ClickCMB:)];
+    
     [self addPUBEquipList];
     equipItemMA = [NSMutableArray new];
     attackListMA = [NSMutableArray new];
     return self;
 }
 
+-(void)ClickCMB:(id)sender{
+    CMBrow = (int)[comboListTV clickedRow];
+}
+
 -(void)ClickCMD:(id)sender{
     CMDrow = (int)[commandListTV clickedRow];
 }
@@ -733,7 +740,7 @@ bool InitialFlag;
     
     [PUPtEquip addItemWithTitle:@"装備リスト"];
     for (int i = 0; i < eItemNum; i++) {
-        [PUPtEquip addItemWithTitle:EQ[i].name];
+        [PUPtEquip addItemWithTitle:EQ[i].nameRecognition];
     }
 }
 
@@ -2951,7 +2958,7 @@ bool eHandLFlag = false;
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", UC[i].A->dmgExtend]] stringByAppendingString:@","];
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", UC[i].A->imagine]] stringByAppendingString:@"\n"];
         
-            fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", UC[i].A->cmd]] stringByAppendingString:@"\n"];
+            fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@,%d", UC[i].A->cmd, UC[i].A->hasei]] stringByAppendingString:@"\n"];
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@,%d", UC[i].A->AN.movName, UC[i].A->AN.frame]] stringByAppendingString:@"\n"];
             if(UC[i].A->msg){
                 fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"####"]] stringByAppendingString:@"\n"];
@@ -3077,7 +3084,7 @@ bool eHandLFlag = false;
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", LC[i].A->dmgExtend]] stringByAppendingString:@","];
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", LC[i].A->imagine]] stringByAppendingString:@"\n"];
             
-            fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", LC[i].A->cmd]] stringByAppendingString:@"\n"];
+            fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@,%d", LC[i].A->cmd, LC[i].A->hasei]] stringByAppendingString:@"\n"];
             
             if(LC[i].A->msg){
                 fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"####"]] stringByAppendingString:@"\n"];
@@ -3206,7 +3213,7 @@ bool eHandLFlag = false;
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", EQ[i].A->dmgExtend]] stringByAppendingString:@","];
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%d", EQ[i].A->imagine]] stringByAppendingString:@"\n"];
             
-            fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@", EQ[i].A->cmd]] stringByAppendingString:@"\n"];
+            fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@,%d", EQ[i].A->cmd, EQ[i].A->hasei]] stringByAppendingString:@"\n"];
             fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"%@,%d", EQ[i].A->AN.movName, EQ[i].A->AN.frame]] stringByAppendingString:@"\n"];
             if(EQ[i].A->msg){
                 fileData = [[fileData stringByAppendingString:[NSString stringWithFormat:@"####"]] stringByAppendingString:@"\n"];
@@ -3446,20 +3453,28 @@ bool eHandLFlag = false;
     NSString *fileData = nil;
     
     
-    comboItemNumb = 2;
+    fileData = [NSString stringWithContentsOfFile:pathCL encoding:NSUTF8StringEncoding error:nil];
+    fileDataArray = [fileData componentsSeparatedByString:@"\n"];
+    int instantNum = [[fileDataArray objectAtIndex:0] intValue];
+    
+    comboItemNumb = instantNum;
+    CLN = (int)comboItemNumb;
     if(!InitialData){
         [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];
         [[NSFileManager defaultManager] createFileAtPath:pathCL contents:nil attributes:nil];
+        [[NSString stringWithFormat:@"%d", UCN] writeToFile:pathCL atomically:YES encoding:NSUTF8StringEncoding error:nil];
         
-        NSString *data1 = @"0,1,2,3\n####\n236A,0,0\n####\nA>A>A\nA>A>B";
+        comboItemNumb = UCN;
+        CLN = (int)comboItemNumb;
+        NSString *data1 = @"A>A>A\nA>A>B";
         
-        NSString *data2 = @"0,1,2,3\n####\n236A,0,0\n####\nA>A>A\nA>A>B";
+        NSString *data2 = @"A>A>B\nA>A>C";
         
-        for (int i=1; i<=comboItemNumb; i++) {
+        for (int i=1; i<=UCN; i++) {
             NSString *fdata = @"data/ComboList/CLdata";
             
             fdata = [fdata stringByAppendingFormat:@"%d.txt", i];
-            
+            /*
             switch (i) {
                 case 1:
                     [data1 writeToFile:fdata atomically:YES encoding:NSUTF8StringEncoding error:nil];
@@ -3470,15 +3485,13 @@ bool eHandLFlag = false;
                 default:
                     
                     break;
-            }
-            
+            }*/
+            [@"" writeToFile:fdata atomically:YES encoding:NSUTF8StringEncoding error:nil];
         }
-        
     }
     
     NSArray *fileDataArray2;
-    for (int i = 0; i< itemNumb; i++){
-        COMMANDS *CStop = UC[i].CM.cs;
+    for (int i = 0; i< CLN; i++){
         COMBO *COtop = UC[i].CM.co;
         
         NSString *fdata = @"data/ComboList/CLdata";
@@ -3486,47 +3499,16 @@ bool eHandLFlag = false;
         fdata = [fdata stringByAppendingFormat:@"%d.txt", i+1];
         
         fileData = [NSString stringWithContentsOfFile:fdata encoding:NSUTF8StringEncoding error:nil];
-        fileDataArray2 = [fileData componentsSeparatedByString:@"\n####\n"];
-        
-        NSArray *items = [[fileDataArray2 objectAtIndex:0] componentsSeparatedByString:@","];
-        
-        /*
-        UC[i].CM.A = [[items objectAtIndex:0] intValue];
-        UC[i].CM.B = [[items objectAtIndex:1] intValue];
-        UC[i].CM.C = [[items objectAtIndex:2] intValue];
-        UC[i].CM.D = [[items objectAtIndex:3] intValue];
-        */
-        fileDataArray = [[fileDataArray2 objectAtIndex:1] componentsSeparatedByString:@"\n"];
-        
-        for(int k = 0;k < [fileDataArray count];k++){
-            if (k == 0) {
-                UC[i].CM.cs = calloc(1, sizeof(COMMANDS));
-                CStop = UC[i].CM.cs;
-            }
-            items = [[fileDataArray objectAtIndex:k] componentsSeparatedByString:@","];
-            
-            NSLog(@"%@", UC[i].CM.cs->cmd);
-            
-            UC[i].CM.cs->cmd = [[items objectAtIndex:0] retain];
-            UC[i].CM.cs->waza = [[items objectAtIndex:1] intValue];
-            UC[i].CM.cs->hasei = [[items objectAtIndex:2] retain];
-            
-            UC[i].CM.cs->next = calloc(1, sizeof(COMMANDS));
-            UC[i].CM.cs = UC[i].CM.cs->next;
-        }
-        UC[i].CM.cs = NULL;
+        fileDataArray2 = [fileData componentsSeparatedByString:@"\n"];
         
-        fileDataArray = [[fileDataArray2 objectAtIndex:2] componentsSeparatedByString:@"\n"];
         
-        
-        for(int k = 0;k < [fileDataArray count];k++){
+        for(int k = 0;k < [fileDataArray2 count] && ![[fileDataArray2 objectAtIndex:k] isEqualToString:@""];k++){
             if (k == 0) {
                 UC[i].CM.co = calloc(1, sizeof(COMBO));
                 COtop = UC[i].CM.co;
             }
-            items = [[fileDataArray objectAtIndex:k] componentsSeparatedByString:@","];
             
-            UC[i].CM.co->mbo = [[items objectAtIndex:0] retain];
+            UC[i].CM.co->mbo = [[fileDataArray2 objectAtIndex:k] retain];
             
             UC[i].CM.co->next = calloc(1, sizeof(COMBO));
             UC[i].CM.co = UC[i].CM.co->next;
@@ -3535,12 +3517,46 @@ bool eHandLFlag = false;
         
         
         UC[i].CM.co = COtop;
-        UC[i].CM.cs = CStop;
     }
 
 
 }
 
+-(void)saveDataCL{
+
+    NSString *directoryPath;
+    
+    directoryPath = [[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent];
+    [[NSFileManager defaultManager] changeCurrentDirectoryPath:directoryPath];
+    
+    char *cwd;
+    cwd = getcwd(NULL, 0);
+    
+    
+    
+    for (int i=0; i<CLN; i++) {
+        NSString *fdata = @"data/ComboList/CLdata";
+        fdata = [fdata stringByAppendingFormat:@"%d.txt", i+1];
+        
+        NSString *fileData = @"";
+        
+        COMBO *cTop = UC[i].CM.co;
+        int p = 0;
+        while(UC[i].CM.co){
+            if(p > 0)
+                fileData = [fileData stringByAppendingString:@"\n"];
+
+        fileData = [fileData stringByAppendingString:[NSString stringWithFormat:@"%@", UC[i].CM.co->mbo]];
+            
+            p++;
+            UC[i].CM.co = UC[i].CM.co->next;
+        }UC[i].CM.co = cTop;
+
+        [fileData writeToFile:fdata atomically:YES encoding:NSUTF8StringEncoding error:nil];
+    }
+
+}
+
 -(void)initFileDirectoryAttack{
     NSString *directoryPath;
     
@@ -3668,7 +3684,11 @@ bool eHandLFlag = false;
         UC[i].A->dmgExtend = [[items objectAtIndex:4] intValue];
         UC[i].A->imagine = [[items objectAtIndex:5] intValue];
         
-        UC[i].A->cmd = [[fileDataArray objectAtIndex:5] retain];
+        items = [[fileDataArray objectAtIndex:5] componentsSeparatedByString:@","];
+            
+        UC[i].A->cmd = [[items objectAtIndex:0] retain];
+        if([items count] >= 2)
+            UC[i].A->hasei = [[items objectAtIndex:1] intValue];
             
         items = [[fileDataArray objectAtIndex:6] componentsSeparatedByString:@","];
         
@@ -3993,7 +4013,11 @@ bool eHandLFlag = false;
             LC[i].A->dmgExtend = [[items objectAtIndex:4] intValue];
             LC[i].A->imagine = [[items objectAtIndex:5] intValue];
             
-            LC[i].A->cmd = [[fileDataArray objectAtIndex:5] retain];
+            items = [[fileDataArray objectAtIndex:5] componentsSeparatedByString:@","];
+            
+            LC[i].A->cmd = [[items objectAtIndex:0] retain];
+            if([items count] >= 2)
+                LC[i].A->hasei = [[items objectAtIndex:1] intValue];
             LC[i].A->msg = @"";
             
             //[self AddDAMAGE:&UC[i].A->D :0];
@@ -4319,7 +4343,11 @@ bool eHandLFlag = false;
             EQ[i].A->AN.movName = [[items objectAtIndex:0] retain];
             else EQ[i].A->AN.movName = @"";
             EQ[i].A->AN.frame = [[items objectAtIndex:1] intValue];
-            EQ[i].A->cmd = [[fileDataArray objectAtIndex:5] retain];
+            items = [[fileDataArray objectAtIndex:5] componentsSeparatedByString:@","];
+            
+            EQ[i].A->cmd = [[items objectAtIndex:0] retain];
+            if([items count] >= 2)
+                EQ[i].A->hasei = [[items objectAtIndex:1] intValue];
             EQ[i].A->msg = @"";
             
             //[self AddDAMAGE:&UC[i].A->D :0];
@@ -5895,12 +5923,7 @@ bool eHandLFlag = false;
     }
     
 }
--(IBAction)insertComboList:(id)sender{
 
-}
--(IBAction)removeComboList:(id)sender{
-    
-}
 
 -(IBAction)submitAttackList:(id)sender{
     
@@ -7109,6 +7132,12 @@ int omfgErase() {
     [comboListMA removeAllObjects];
     [self didChangeValueForKey:@"comboListMA"];
     
+    
+    [AMbtnA addItemWithTitle:@"なし"];
+    [AMbtnB addItemWithTitle:@"なし"];
+    [AMbtnC addItemWithTitle:@"なし"];
+    [AMbtnD addItemWithTitle:@"なし"];
+    
     ATTACK *Atop = UC[clickIndex].A;
     while (UC[clickIndex].A != NULL) {
         if(UC[clickIndex].A->name != NULL){
@@ -7154,8 +7183,7 @@ int omfgErase() {
     
     
     COMBO *Ctop = UC[clickIndex].CM.co;
-    if(UC[clickIndex].CM.co != NULL)
-    while (UC[clickIndex].CM.co->mbo != NULL) {
+    while (UC[clickIndex].CM.co != NULL) {
         NSMutableDictionary* dict = [NSMutableDictionary new];
         [dict setValue:[NSString stringWithFormat:@"%@", UC[clickIndex].CM.co->mbo] forKey:@"name"];
         [self willChangeValueForKey:@"comboListMA"];
@@ -7166,10 +7194,10 @@ int omfgErase() {
     UC[clickIndex].CM.co = Ctop;
     
     
-    [AMbtnA selectItemAtIndex:UC[clickIndex].CM.A];
-    [AMbtnB selectItemAtIndex:UC[clickIndex].CM.B];
-    [AMbtnC selectItemAtIndex:UC[clickIndex].CM.C];
-    [AMbtnD selectItemAtIndex:UC[clickIndex].CM.D];
+    [AMbtnA selectItemAtIndex:UC[clickIndex].CM.A+1];
+    [AMbtnB selectItemAtIndex:UC[clickIndex].CM.B+1];
+    [AMbtnC selectItemAtIndex:UC[clickIndex].CM.C+1];
+    [AMbtnD selectItemAtIndex:UC[clickIndex].CM.D+1];
     
     
     
@@ -7197,10 +7225,10 @@ int omfgErase() {
 
 -(IBAction)attackListTotalSubmit:(id)sender{
     
-    UC[clickIndex].CM.A = (int)[AMbtnA indexOfSelectedItem];
-    UC[clickIndex].CM.B = (int)[AMbtnB indexOfSelectedItem];
-    UC[clickIndex].CM.C = (int)[AMbtnC indexOfSelectedItem];
-    UC[clickIndex].CM.D = (int)[AMbtnD indexOfSelectedItem];
+    UC[clickIndex].CM.A = (int)[AMbtnA indexOfSelectedItem]-1;
+    UC[clickIndex].CM.B = (int)[AMbtnB indexOfSelectedItem]-1;
+    UC[clickIndex].CM.C = (int)[AMbtnC indexOfSelectedItem]-1;
+    UC[clickIndex].CM.D = (int)[AMbtnD indexOfSelectedItem]-1;
     
     ATTACK *aTop2 = UC[clickIndex].A;
     while (UC[clickIndex].A) {
@@ -7220,7 +7248,27 @@ int omfgErase() {
         
         UC[clickIndex].A = aTop;
     }
+    
+    COMBO *cTop = UC[clickIndex].CM.co;
+    for(int i = 0;i < [comboListMA count];i++){
+        if (i == 0) {
+            UC[clickIndex].CM.co =calloc(1, sizeof(COMBO));
+            cTop = UC[clickIndex].CM.co;
+        }
+        UC[clickIndex].CM.co->mbo = [[comboListMA[i] valueForKeyPath:@"name"] retain];
+        
+        if(i+1 < [comboListMA count]){
+            UC[clickIndex].CM.co->next =calloc(1, sizeof(COMBO));
+        }
+        UC[clickIndex].CM.co = UC[clickIndex].CM.co->next;
+    }UC[clickIndex].CM.co = cTop;
+    
+    
+    
+    
+    [self saveDataCL];
     [UCLPanelAttackList close];
+    
 }
 -(IBAction)attackListOpenBtn:(id)sender{
     clickedRowAT = -1;
@@ -7332,8 +7380,82 @@ int omfgErase() {
 
 
 }
--(IBAction)comboListAdd:(id)sender{}
--(IBAction)comboListRemove:(id)sender{}
+-(IBAction)comboListAdd:(id)sender{
+    if(1){
+        NSMutableDictionary *dict = [NSMutableDictionary new];
+        
+        if([comboListMA count] == 0){
+            
+            [self willChangeValueForKey:@"comboListMA"];
+            [comboListMA insertObject:dict atIndex:[comboListMA count]];
+            [self didChangeValueForKey:@"comboListMA"];
+            [comboListAC setSelectionIndex:999];
+        }else if(CMBrow == -1){
+            
+            [self willChangeValueForKey:@"comboListMA"];
+            [comboListMA insertObject:dict atIndex:[comboListMA count]];
+            [self didChangeValueForKey:@"comboListMA"];
+            [comboListAC setSelectionIndex:999];
+            
+        }else if(CMBrow > 0){
+            
+            [self willChangeValueForKey:@"comboListMA"];
+            [comboListMA insertObject:dict atIndex:CMDrow];
+            [self didChangeValueForKey:@"comboListMA"];
+            [comboListAC setSelectionIndex:999];
+            
+        }else{
+            
+            [self willChangeValueForKey:@"comboListMA"];
+            [comboListMA insertObject:dict atIndex:comboListMA];
+            [self didChangeValueForKey:@"comboListMA"];
+            [comboListAC setSelectionIndex:999];
+        }
+        
+        
+    }
+
+
+
+
+
+}
+-(IBAction)comboListRemove:(id)sender{
+
+    if(1){
+        if([comboListMA count] == 0){
+            return;
+        }else if(CMBrow == -1){
+            
+            [self willChangeValueForKey:@"comboListMA"];
+            [comboListMA removeObjectAtIndex:[comboListMA count]-1];
+            [self didChangeValueForKey:@"comboListMA"];
+            [comboListAC setSelectionIndex:999];
+            
+        }else if(CMBrow > 0){
+            
+            [self willChangeValueForKey:@"comboListMA"];
+            [comboListMA removeObjectAtIndex:CMBrow];
+            [self didChangeValueForKey:@"comboListMA"];
+            [comboListAC setSelectionIndex:999];
+            
+            
+        }else{
+            
+            [self willChangeValueForKey:@"comboListMA"];
+            [comboListMA removeObjectAtIndex:CMBrow];
+            [self didChangeValueForKey:@"comboListMA"];
+            [comboListAC setSelectionIndex:999];
+            
+            
+        }
+        
+    }
+    
+    CMBrow = -1;
+
+
+}
 
 
 -(IBAction)addSubjMark:(id)sender{
index 3ac3162..778baa4 100755 (executable)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="14F1713" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.AVKitIBPlugin" version="9532"/>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="photo" image="タイトル" id="3836"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" id="558">
-                        <rect key="frame" x="18" y="443" width="118" height="17"/>
+                        <rect key="frame" x="18" y="443" width="126" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.63" id="559">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.631" id="559">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                 <outlet property="eventDetailSelectionWindow" destination="6Ho-16-Ie6" id="9aE-ye-u7f"/>
                 <outlet property="eventDetailWindow" destination="rCv-M4-34U" id="FCp-CR-ga7"/>
                 <outlet property="eventEndGameCondition" destination="TCU-hD-KGw" id="fgG-4R-k09"/>
+                <outlet property="eventGuildBC1" destination="Qnm-JT-CPj" id="4wH-EM-IsT"/>
+                <outlet property="eventGuildBC2" destination="s2R-z8-eyu" id="Va3-4U-Cj9"/>
+                <outlet property="eventGuildListAC" destination="Efj-F8-NdQ" id="cjq-E0-7la"/>
+                <outlet property="eventGuildListTV" destination="ExF-We-v24" id="7AJ-yj-yEP"/>
+                <outlet property="eventGuildListWindow" destination="Yeo-Ja-ffL" id="dEX-Fg-vlx"/>
+                <outlet property="eventGuildTF1" destination="1iP-Yx-h8C" id="wiK-mF-jvB"/>
+                <outlet property="eventGuildTF2" destination="gE0-2j-01a" id="zea-BH-iAg"/>
                 <outlet property="eventListAC" destination="v8V-gL-u6H" id="RBU-bZ-aJb"/>
                 <outlet property="eventListTV" destination="z7M-O3-mGg" id="Emr-r5-F22"/>
                 <outlet property="eventPlayerSetPUB1" destination="GDc-cE-cYz" id="sJ6-Xr-Pgc"/>
                 <outlet property="levelWindow" destination="N2U-Rv-jyJ" id="3TT-Jv-15v"/>
             </connections>
         </customObject>
+        <arrayController id="Efj-F8-NdQ" userLabel="eventGuildListAC">
+            <connections>
+                <binding destination="3826" name="contentArray" keyPath="eventGuildListMA" id="SFi-tR-3G6"/>
+            </connections>
+        </arrayController>
         <arrayController id="p1U-wU-xM5" userLabel="EDresourceAC1">
             <connections>
                 <binding destination="3826" name="contentArray" keyPath="EDresourceMA1" id="MuP-Pq-fQn"/>
                 <outlet property="BCLUnitResearchPanel" destination="2386" id="4927"/>
                 <outlet property="BCLregisterPanel" destination="10572" id="10648"/>
                 <outlet property="BTNcapture" destination="14110" id="14116"/>
+                <outlet property="BTNguild" destination="V7Z-mT-BLh" id="LPc-QS-GLh"/>
                 <outlet property="BTNinroads" destination="2218" id="4870"/>
                 <outlet property="IVimg" destination="1617" id="4929"/>
                 <outlet property="IVimgBig" destination="1666" id="4931"/>
                             <action selector="researchListDelete:" target="2629" id="12437"/>
                         </connections>
                     </button>
+                    <button id="V7Z-mT-BLh">
+                        <rect key="frame" x="243" y="18" width="100" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="ギルドフラグ" bezelStyle="regularSquare" imagePosition="left" inset="2" id="pOn-O7-1nc">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" size="13" name="HiraKakuProN-W3"/>
+                        </buttonCell>
+                    </button>
                 </subviews>
             </view>
             <point key="canvasLocation" x="1381" y="17"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </tokenFieldCell>
                     </tokenField>
+                    <button verticalHuggingPriority="750" id="lWF-8k-3nw">
+                        <rect key="frame" x="532" y="67" width="105" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="ギルド登録" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="vcP-e5-Aba">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" size="13" name="HiraKakuProN-W3"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="eventGuildBtn:" target="3826" id="6hw-6a-Y29"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
         </window>
                     </button>
                 </subviews>
             </view>
-            <point key="canvasLocation" x="1143" y="2980.5"/>
+            <point key="canvasLocation" x="946" y="2902.5"/>
         </window>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" animationBehavior="default" id="G95-63-pDA" userLabel="立ち絵バック" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" utility="YES"/>
                 </subviews>
             </view>
         </window>
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="Yeo-Ja-ffL" userLabel="ギルド登録リスト">
+            <windowStyleMask key="styleMask" titled="YES"/>
+            <rect key="contentRect" x="196" y="207" width="480" height="480"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
+            <view key="contentView" id="FIG-GK-plI">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button verticalHuggingPriority="750" id="gVd-el-nbG">
+                        <rect key="frame" x="392" y="13" width="66" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="決定" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7Qa-K9-QhN">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" size="13" name="HiraKakuProN-W3"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="eventGuildBtnSubmit:" target="3826" id="CjL-Gy-cd2"/>
+                        </connections>
+                    </button>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="RL6-pA-TTO">
+                        <rect key="frame" x="361" y="381" width="121" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="表示ユニット最大数" id="skP-SP-2ta">
+                            <font key="font" size="13" name="HiraKakuProN-W3"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="1iP-Yx-h8C">
+                        <rect key="frame" x="373" y="339" width="30" height="22"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="mgA-nH-JtH">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="oIw-Ce-HjG">
+                        <rect key="frame" x="409" y="342" width="13" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="~" id="Qqa-Uf-5IA">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="gE0-2j-01a">
+                        <rect key="frame" x="430" y="339" width="30" height="22"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="8YW-mm-9Nk">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="66" horizontalPageScroll="10" verticalLineScroll="66" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="sU1-CA-TOf">
+                        <rect key="frame" x="-1" y="-1" width="362" height="482"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <clipView key="contentView" id="Ojr-rK-r3t">
+                            <rect key="frame" x="1" y="17" width="360" height="464"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="64" headerView="hNS-IZ-It6" id="ExF-We-v24">
+                                    <rect key="frame" x="0.0" y="0.0" width="360" height="66"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <size key="intercellSpacing" width="3" height="2"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+                                    <tableColumns>
+                                        <tableColumn editable="NO" width="66.9296875" minWidth="40" maxWidth="1000" id="ZOD-E4-T0g">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="画像">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <imageCell key="dataCell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="y8g-h8-DHT"/>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="Efj-F8-NdQ" name="value" keyPath="arrangedObjects.img" id="kVi-EJ-mfa"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn editable="NO" width="232.88671875" minWidth="40" maxWidth="1000" id="7nS-IY-Vy7">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="情報">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Text" id="wod-gy-umk">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="Efj-F8-NdQ" name="value" keyPath="arrangedObjects.name" id="B2h-J6-PCZ">
+                                                    <dictionary key="options">
+                                                        <bool key="NSCreatesSortDescriptor" value="NO"/>
+                                                    </dictionary>
+                                                </binding>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn identifier="" width="51" minWidth="10" maxWidth="3.4028234663852886e+38" id="DGz-Rp-cXW">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="登録">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="5HC-6x-M3d">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="Efj-F8-NdQ" name="value" keyPath="arrangedObjects.chk" id="iXQ-Ko-ah2">
+                                                    <dictionary key="options">
+                                                        <bool key="NSCreatesSortDescriptor" value="NO"/>
+                                                    </dictionary>
+                                                </binding>
+                                            </connections>
+                                        </tableColumn>
+                                    </tableColumns>
+                                </tableView>
+                            </subviews>
+                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="jlZ-o3-fQX">
+                            <rect key="frame" x="1" y="465" width="363" height="16"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="rjk-V4-bac">
+                            <rect key="frame" x="224" y="17" width="15" height="102"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <tableHeaderView key="headerView" id="hNS-IZ-It6">
+                            <rect key="frame" x="0.0" y="0.0" width="360" height="17"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </tableHeaderView>
+                    </scrollView>
+                    <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autorecalculatesCellSize="YES" id="TVg-XI-sPk">
+                        <rect key="frame" x="375" y="281" width="74" height="38"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        <size key="cellSize" width="48" height="18"/>
+                        <size key="intercellSpacing" width="4" height="2"/>
+                        <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="Xtd-Su-zMx">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <cells>
+                            <column>
+                                <buttonCell type="radio" title="青軍" imagePosition="left" alignment="left" state="on" tag="1" inset="2" id="Qnm-JT-CPj">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <buttonCell type="radio" title="赤軍" imagePosition="left" alignment="left" inset="2" id="s2R-z8-eyu">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                            </column>
+                        </cells>
+                        <connections>
+                            <action selector="eventGuildBtnCell:" target="3826" id="y0o-af-iUw"/>
+                        </connections>
+                    </matrix>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="1022" y="3290"/>
+        </window>
     </objects>
     <resources>
         <image name="BackGround" width="32" height="32"/>