From e10620153bafa941288ed073699378300f026cd7 Mon Sep 17 00:00:00 2001 From: Killery Date: Sat, 20 Feb 2016 10:49:34 +0900 Subject: [PATCH] =?utf8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B7?= =?utf8?q?=E3=82=99=E4=B8=AD=E3=81=AB=E3=83=95=E3=83=AA=E3=83=BC=E3=82=B9?= =?utf8?q?=E3=82=99=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Awars III/FieldView.m | 2 +- Awars III/MapEditor.h | 12 ++++++++- Awars III/MapEditor.m | 20 +++++++++++++++ Awars III/MapView.m | 14 +++++++++-- Awars III/en.lproj/MainMenu.xib | 54 ++++++++++++++++++++++++++++++++++++++--- 5 files changed, 95 insertions(+), 7 deletions(-) diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m index c94bb3f..6ff922e 100755 --- a/Awars III/FieldView.m +++ b/Awars III/FieldView.m @@ -499,7 +499,7 @@ if(waitSwtichFlag) return; - if(CPUturn) return; + if(CPUturn && !messageDialog) return; if(messageDialog){ diff --git a/Awars III/MapEditor.h b/Awars III/MapEditor.h index 2c95ca2..09d1ec7 100644 --- a/Awars III/MapEditor.h +++ b/Awars III/MapEditor.h @@ -299,6 +299,10 @@ typedef struct _MAPSCRIPT{ int playerSet2; bool battleSetMode; + bool scenarioSetMode; + int scenarioNumbCrnt; + int scenarioNumbNext; + NSMutableArray *SCRPTname; struct _MAPSCRIPTD *D; @@ -414,6 +418,10 @@ bool EQmodeFlag; bool battleSetMode; int playerSet1; int playerSet2; +bool scenarioSetMode; +int scenarioNumbCrnt; +int scenarioNumbNext; + NSRect scCenter; NSInteger headerFrame; @@ -893,7 +901,9 @@ NSTimer *timeMapEditor; IBOutlet NSTableView *EDdissappearTV; IBOutlet NSWindow *EDdissappearSubmitWindow; - + IBOutlet NSButton *eventScenarioModeBtn; + IBOutlet NSTextField *eventScenarioCrntTF; + IBOutlet NSTextField *eventScenarioNextTF; } diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m index a25dc30..d20a6e0 100755 --- a/Awars III/MapEditor.m +++ b/Awars III/MapEditor.m @@ -1923,6 +1923,16 @@ [self initEventList]; + + scenarioSetMode = MF[MFselectedRow+1].MS.scenarioSetMode; + scenarioNumbCrnt = MF[MFselectedRow+1].MS.scenarioNumbCrnt; + scenarioNumbNext = MF[MFselectedRow+1].MS.scenarioNumbNext; + + [eventScenarioCrntTF setStringValue:[NSString stringWithFormat:@"%d", scenarioNumbCrnt]]; + [eventScenarioNextTF setStringValue:[NSString stringWithFormat:@"%d", scenarioNumbNext]]; + [eventScenarioModeBtn setState:scenarioSetMode]; + + [eventPlayerSetPUB1 selectItemAtIndex:playerSet1]; [eventPlayerSetPUB2 selectItemAtIndex:playerSet2]; [eventBattleDetailBtn setState:battleSetMode]; @@ -2202,6 +2212,16 @@ } -(IBAction)eventSubmit:(id)sender{ + + MF[MFselectedRow+1].MS.scenarioNumbCrnt = [eventScenarioCrntTF intValue]; + MF[MFselectedRow+1].MS.scenarioNumbNext = [eventScenarioNextTF intValue]; + MF[MFselectedRow+1].MS.scenarioSetMode = [eventScenarioModeBtn intValue]; + + scenarioSetMode = MF[MFselectedRow+1].MS.scenarioSetMode; + scenarioNumbCrnt = MF[MFselectedRow+1].MS.scenarioNumbCrnt; + scenarioNumbNext = MF[MFselectedRow+1].MS.scenarioNumbNext; + + [MapEditorWindow setFrame:NSMakeRect(scCenter.origin.x,scCenter.origin.y,640,480+headerFrame) display:YES]; EEGCslctFlag = false; eventPosFlag = false; diff --git a/Awars III/MapView.m b/Awars III/MapView.m index f475ee6..1e2284b 100644 --- a/Awars III/MapView.m +++ b/Awars III/MapView.m @@ -623,6 +623,15 @@ MF[MFselectedRow+1].MS.playerSet2 = playerSet2; MF[MFselectedRow+1].MS.battleSetMode = battleSetMode; + if([items count] > 3){ + scenarioSetMode = [[items objectAtIndex:3] intValue]; + scenarioNumbCrnt = [[items objectAtIndex:4] intValue]; + scenarioNumbNext = [[items objectAtIndex:5] intValue]; + MF[MFselectedRow+1].MS.scenarioSetMode = scenarioSetMode; + MF[MFselectedRow+1].MS.scenarioNumbCrnt = scenarioNumbCrnt; + MF[MFselectedRow+1].MS.scenarioNumbNext = scenarioNumbNext; + } + MAPSCRIPT MS = MF[MFselectedRow+1].MS; [MS.SCRPTname removeAllObjects]; MAPSCRIPTD *MSDtop = NULL; @@ -1765,8 +1774,9 @@ fileData = [fileData stringByAppendingFormat:@"----\n"]; - fileData = [fileData stringByAppendingFormat:@"%d,%d,%d\n", playerSet1, playerSet2, battleSetMode]; - + fileData = [fileData stringByAppendingFormat:@"%d,%d,%d,%d,%d,%d\n", + playerSet1, playerSet2, battleSetMode, + scenarioSetMode,scenarioNumbCrnt,scenarioNumbNext]; fileData = [fileData stringByAppendingFormat:@"========\nEVENT\n========\n"]; MAPSCRIPT MS = MF[MFselectedRow+1].MS; diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib index bfe04b9..a7c9fa0 100755 --- a/Awars III/en.lproj/MainMenu.xib +++ b/Awars III/en.lproj/MainMenu.xib @@ -762,6 +762,10 @@ + + + + @@ -11556,7 +11560,7 @@ - + @@ -11952,7 +11956,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14775,7 +14823,7 @@ - + -- 2.11.0