From e49a6be37239e0eb0c6b5ecb6812eee76aa9ea02 Mon Sep 17 00:00:00 2001 From: Killery Date: Tue, 2 Aug 2016 01:02:53 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B9=E3=83=86=E3=83=BC=E3=82=BF=E3=82=B9?= =?utf8?q?=E6=B1=BA=E5=AE=9A=E3=81=AE=E3=82=B9=E3=82=AF=E3=83=AA=E3=83=95?= =?utf8?q?=E3=82=9A=E3=83=88=E8=BF=BD=E5=8A=A0=E3=80=81=E5=AE=9F=E6=88=A6?= =?utf8?q?=E3=81=AB=E3=82=82=E3=82=BB=E3=83=BC=E3=83=95=E3=82=99=E3=83=86?= =?utf8?q?=E3=82=99=E3=83=BC=E3=82=BF=E3=81=AB=E3=82=82=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Awars III.xcodeproj/project.pbxproj | 24 +- Awars III/CommandView.m | 5 +- Awars III/FieldScene.h | 5 +- Awars III/FieldScene.m | 181 +++-- Awars III/MapEditor.h | 24 + Awars III/MapEditor.m | 17 +- Awars III/en.lproj/MainMenu.xib | 1363 +++++++++++++---------------------- Awars III/地形.png | Bin 580 -> 439 bytes Awars III/建物.png | Bin 862 -> 1365 bytes Awars III/駒.png | Bin 472 -> 688 bytes 10 files changed, 697 insertions(+), 922 deletions(-) mode change 100755 => 100644 Awars III/地形.png mode change 100755 => 100644 Awars III/建物.png mode change 100755 => 100644 Awars III/駒.png diff --git a/Awars III.xcodeproj/project.pbxproj b/Awars III.xcodeproj/project.pbxproj index 8083f20..5d229e1 100755 --- a/Awars III.xcodeproj/project.pbxproj +++ b/Awars III.xcodeproj/project.pbxproj @@ -143,9 +143,6 @@ C6CA8FFC18178F35003A54C8 /* ハイライト（黄）.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CA8FFB18178F35003A54C8 /* ハイライト（黄）.png */; }; C6CA8FFE18178F3C003A54C8 /* ハイライト（青）.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CA8FFD18178F3C003A54C8 /* ハイライト（青）.png */; }; C6CA900018178F40003A54C8 /* ハイライト（赤）.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CA8FFF18178F40003A54C8 /* ハイライト（赤）.png */; }; - C6CDEA36169D2A5C00088937 /* 駒.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEA33169D2A5C00088937 /* 駒.png */; }; - C6CDEA37169D2A5C00088937 /* 建物.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEA34169D2A5C00088937 /* 建物.png */; }; - C6CDEA38169D2A5C00088937 /* 地形.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEA35169D2A5C00088937 /* 地形.png */; }; C6CDEA4E169D39A200088937 /* bc1.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEA3A169D39A000088937 /* bc1.png */; }; C6CDEA4F169D39A200088937 /* bc2.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEA3B169D39A000088937 /* bc2.png */; }; C6CDEA50169D39A200088937 /* bc3.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEA3C169D39A000088937 /* bc3.png */; }; @@ -223,6 +220,9 @@ C6CDEB49169D4E6000088937 /* uc55.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEB11169D4E6000088937 /* uc55.png */; }; C6CDEB4A169D4E6000088937 /* uc56.png in Resources */ = {isa = PBXBuildFile; fileRef = C6CDEB12169D4E6000088937 /* uc56.png */; }; C6D4400016B5DFC4003C9C53 /* ScenarioEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = C6D43FFF16B5DFC4003C9C53 /* ScenarioEditor.m */; }; + C6D4D5731D4F9FD6005C2FAF /* 駒.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D4D5701D4F9FD6005C2FAF /* 駒.png */; }; + C6D4D5741D4F9FD6005C2FAF /* 建物.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D4D5711D4F9FD6005C2FAF /* 建物.png */; }; + C6D4D5751D4F9FD6005C2FAF /* 地形.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D4D5721D4F9FD6005C2FAF /* 地形.png */; }; C6D8974416EA0E16007543CE /* num1.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D8973016EA0E16007543CE /* num1.png */; }; C6D8974516EA0E16007543CE /* num2.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D8973116EA0E16007543CE /* num2.png */; }; C6D8974616EA0E16007543CE /* num3.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D8973216EA0E16007543CE /* num3.png */; }; @@ -502,9 +502,6 @@ C6CA8FFB18178F35003A54C8 /* ハイライト（黄）.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ハイライト（黄）.png"; sourceTree = ""; }; C6CA8FFD18178F3C003A54C8 /* ハイライト（青）.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ハイライト（青）.png"; sourceTree = ""; }; C6CA8FFF18178F40003A54C8 /* ハイライト（赤）.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ハイライト（赤）.png"; sourceTree = ""; }; - C6CDEA33169D2A5C00088937 /* 駒.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "駒.png"; sourceTree = ""; }; - C6CDEA34169D2A5C00088937 /* 建物.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "建物.png"; sourceTree = ""; }; - C6CDEA35169D2A5C00088937 /* 地形.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "地形.png"; sourceTree = ""; }; C6CDEA3A169D39A000088937 /* bc1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bc1.png; sourceTree = ""; }; C6CDEA3B169D39A000088937 /* bc2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bc2.png; sourceTree = ""; }; C6CDEA3C169D39A000088937 /* bc3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bc3.png; sourceTree = ""; }; @@ -583,6 +580,9 @@ C6CDEB12169D4E6000088937 /* uc56.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = uc56.png; sourceTree = ""; }; C6D43FFE16B5DFC4003C9C53 /* ScenarioEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScenarioEditor.h; sourceTree = ""; }; C6D43FFF16B5DFC4003C9C53 /* ScenarioEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScenarioEditor.m; sourceTree = ""; }; + C6D4D5701D4F9FD6005C2FAF /* 駒.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "駒.png"; sourceTree = ""; }; + C6D4D5711D4F9FD6005C2FAF /* 建物.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "建物.png"; sourceTree = ""; }; + C6D4D5721D4F9FD6005C2FAF /* 地形.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "地形.png"; sourceTree = ""; }; C6D8973016EA0E16007543CE /* num1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = num1.png; sourceTree = ""; }; C6D8973116EA0E16007543CE /* num2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = num2.png; sourceTree = ""; }; C6D8973216EA0E16007543CE /* num3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = num3.png; sourceTree = ""; }; @@ -1019,10 +1019,10 @@ C65A72B9188F34B200FC1FF1 /* lc22.png */, C65A72BA188F34B200FC1FF1 /* lc23.png */, C6C3697D189148FE00A10A87 /* lc24.png */, - C6CDEA33169D2A5C00088937 /* 駒.png */, - C6CDEA34169D2A5C00088937 /* 建物.png */, - C6CDEA35169D2A5C00088937 /* 地形.png */, C657E1C91882E3CE0035620D /* 駒大.png */, + C6D4D5701D4F9FD6005C2FAF /* 駒.png */, + C6D4D5711D4F9FD6005C2FAF /* 建物.png */, + C6D4D5721D4F9FD6005C2FAF /* 地形.png */, C6CA8FFB18178F35003A54C8 /* ハイライト（黄）.png */, C6CA8FFD18178F3C003A54C8 /* ハイライト（青）.png */, C6CA8FFF18178F40003A54C8 /* ハイライト（赤）.png */, @@ -1262,6 +1262,7 @@ C6E8DA68167E3A6A00BFEC32 /* mc16.png in Resources */, C6DC3C421A7ADCB0007514D1 /* to11.jpg in Resources */, C6E8DA69167E3A6A00BFEC32 /* mc17.png in Resources */, + C6D4D5731D4F9FD6005C2FAF /* 駒.png in Resources */, C6E8DA6A167E3A6A00BFEC32 /* mc18.png in Resources */, C6DC3C281A7AD108007514D1 /* test09.jpg in Resources */, C6E8DA6B167E3A6A00BFEC32 /* mc19.png in Resources */, @@ -1282,6 +1283,7 @@ C6825961169CBFFC0068BB20 /* BackGround.png in Resources */, C67849AE1893992C00CB7412 /* ucb33.png in Resources */, C61BF9FC169CE439009070DC /* siDafault.png in Resources */, + C6D4D5751D4F9FD6005C2FAF /* 地形.png in Resources */, C629F5EC18BD54C2001A42B0 /* アクセラレータ.jpg in Resources */, C61BF9FD169CE439009070DC /* siFreeMap.png in Resources */, C67849BC1893992C00CB7412 /* ucb47.png in Resources */, @@ -1293,9 +1295,6 @@ C6AD18B7169D1E9900783718 /* セレクター.png in Resources */, C67849A91893992C00CB7412 /* ucb28.png in Resources */, C61092A21C3C7D040089E054 /* SEdefaultNULL.png in Resources */, - C6CDEA36169D2A5C00088937 /* 駒.png in Resources */, - C6CDEA37169D2A5C00088937 /* 建物.png in Resources */, - C6CDEA38169D2A5C00088937 /* 地形.png in Resources */, C6CDEA4E169D39A200088937 /* bc1.png in Resources */, C6CDEA4F169D39A200088937 /* bc2.png in Resources */, C6CDEA50169D39A200088937 /* bc3.png in Resources */, @@ -1323,6 +1322,7 @@ C6CDEB13169D4E6000088937 /* uc1.png in Resources */, C6CDEB14169D4E6000088937 /* uc2.png in Resources */, C6CDEB15169D4E6000088937 /* uc3.png in Resources */, + C6D4D5741D4F9FD6005C2FAF /* 建物.png in Resources */, C6DC3C3F1A7ADCB0007514D1 /* to08.jpg in Resources */, C6CDEB16169D4E6000088937 /* uc4.png in Resources */, C6CDEB17169D4E6000088937 /* uc5.png in Resources */, diff --git a/Awars III/CommandView.m b/Awars III/CommandView.m index c6cf5b0..01b0164 100755 --- a/Awars III/CommandView.m +++ b/Awars III/CommandView.m @@ -31,6 +31,8 @@ NSRect seRect; seRect.size.height = 1*32; seRect.size.width = 1*32; + + CommandViewInst = self; } return self; @@ -92,7 +94,8 @@ [self DrawImage:chip3 x:0 y:1*32 cx:1 cy:0]; [self DrawImage:chip4 x:0 y:2*32 cx:2 cy:0]; - if(CommandSelected) [self DrawImage:chip5 x:0 y:SLCy*32 cx:0 cy:0]; + if(CommandSelected) + [self DrawImage:chip5 x:0 y:SLCy*32 cx:0 cy:0]; } @end diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h index 184c40d..a23267b 100755 --- a/Awars III/FieldScene.h +++ b/Awars III/FieldScene.h @@ -717,7 +717,7 @@ typedef struct _MAPSCRIPT7B{ typedef struct _MAPSCRIPT7{ - int type; + bool type; bool maxFlag; bool percentFlag; bool extendFlag; @@ -733,6 +733,9 @@ typedef struct _MAPSCRIPT7{ bool valueFlag; struct _MAPSCRIPT7B *B; + int S7Acnt; + int S7Bcnt; + }MAPSCRIPT7; typedef struct _MAPSCRIPT0{ diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m index c820e94..a007a7a 100755 --- a/Awars III/FieldScene.m +++ b/Awars III/FieldScene.m @@ -411,7 +411,8 @@ if(sdd.MS.D->P->type == 10) [self writeMapScript6:fp]; - + if(sdd.MS.D->P->type == 15) + [self writeMapScript7:fp]; sdd.MS.D->P = sdd.MS.D->P->next; }sdd.MS.D->P = SMSPtop; @@ -722,29 +723,69 @@ [self writeInt:fp val:sdd.MS.D->P->S6.RCfoodS]; [self writeInt:fp val:sdd.MS.D->P->S6.RCmoneyS]; - /* - int team; - - bool RCsupply; - bool RCfood; - bool RCmoney; - - bool RCsupplyAdd; - bool RCfoodAdd; - bool RCmoneyAdd; - - int RCsupplyValue; - int RCfoodValue; - int RCmoneyValue; - - int RCsupplySelect; - int RCfoodSelect; - int RCmoneySelect; - - bool RCsupplyS; - bool RCfoodS; - bool RCmoneyS; - */ +} + +-(void)writeMapScript7:(FILE*)fp{ + + [self writeInt:fp val:sdd.MS.D->P->S7.type]; + + [self writeInt:fp val:sdd.MS.D->P->S7.maxFlag]; + [self writeInt:fp val:sdd.MS.D->P->S7.percentFlag]; + [self writeInt:fp val:sdd.MS.D->P->S7.extendFlag]; + + [self writeInt:fp val:sdd.MS.D->P->S7.fluctuate]; + [self writeInt:fp val:sdd.MS.D->P->S7.valueType]; + + [self writeNSString:fp str:sdd.MS.D->P->S7.value]; + + [self writeInt:fp val:sdd.MS.D->P->S7.rdm]; + + + [self writeInt:fp val:sdd.MS.D->P->S7.teamFlag]; + [self writeInt:fp val:sdd.MS.D->P->S7.team]; + + [self writeInt:fp val:sdd.MS.D->P->S7.unitFlag]; + [self writeInt:fp val:sdd.MS.D->P->S7.valueFlag]; + + MS7Atop = sdd.MS.D->P->S7.A; + while (sdd.MS.D->P->S7.A) { + sdd.MS.D->P->S7.S7Acnt++; + sdd.MS.D->P->S7.A = sdd.MS.D->P->S7.A->next; + }sdd.MS.D->P->S7.A = MS7Atop; + + MS7Btop = sdd.MS.D->P->S7.B; + while (sdd.MS.D->P->S7.B) { + sdd.MS.D->P->S7.S7Bcnt++; + sdd.MS.D->P->S7.B = sdd.MS.D->P->S7.B->next; + }sdd.MS.D->P->S7.B = MS7Btop; + + [self writeInt:fp val:sdd.MS.D->P->S7.S7Acnt]; + [self writeInt:fp val:sdd.MS.D->P->S7.S7Bcnt]; + + + MS7Atop = sdd.MS.D->P->S7.A; + for(int i = 0;i < sdd.MS.D->P->S7.S7Acnt;i++){ + + [self writeInt:fp val:sdd.MS.D->P->S7.A->x]; + [self writeInt:fp val:sdd.MS.D->P->S7.A->y]; + [self writeInt:fp val:sdd.MS.D->P->S7.A->team]; + [self writeInt:fp val:sdd.MS.D->P->S7.A->unitNum]; + + sdd.MS.D->P->S7.A = sdd.MS.D->P->S7.A->next; + }sdd.MS.D->P->S7.A = MS7Atop; + + MS7Btop = sdd.MS.D->P->S7.B; + for(int i = 0;i < sdd.MS.D->P->S7.S7Bcnt;i++){ + + [self writeInt:fp val:sdd.MS.D->P->S7.B->x]; + [self writeInt:fp val:sdd.MS.D->P->S7.B->y]; + [self writeInt:fp val:sdd.MS.D->P->S7.B->team]; + [self writeInt:fp val:sdd.MS.D->P->S7.B->unitNum]; + [self writeInt:fp val:sdd.MS.D->P->S7.B->saveInt]; + + sdd.MS.D->P->S7.B = sdd.MS.D->P->S7.B->next; + }sdd.MS.D->P->S7.B = MS7Btop; + } -(void)writeMapScriptBGM:(FILE*)fp{ @@ -1528,29 +1569,69 @@ sdd2[datRow].MS.D->P->S6.RCfoodS = (int)[self readInt:fp]; sdd2[datRow].MS.D->P->S6.RCmoneyS = (int)[self readInt:fp]; - /* - int team; - - bool RCsupply; - bool RCfood; - bool RCmoney; - - bool RCsupplyAdd; - bool RCfoodAdd; - bool RCmoneyAdd; - - int RCsupplyValue; - int RCfoodValue; - int RCmoneyValue; - - int RCsupplySelect; - int RCfoodSelect; - int RCmoneySelect; - - bool RCsupplyS; - bool RCfoodS; - bool RCmoneyS; - */ +} + +-(void)readMapScript7:(FILE*)fp{ + + sdd2[datRow].MS.D->P->S7.type = (int)[self readInt:fp]; + + sdd2[datRow].MS.D->P->S7.maxFlag = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.percentFlag = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.type = (int)[self readInt:fp]; + + sdd2[datRow].MS.D->P->S7.fluctuate = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.valueType = (int)[self readInt:fp]; + + sdd2[datRow].MS.D->P->S7.value = [[self readNSString:fp strOut:sdd2[datRow].MS.D->P->S7.value] retain]; + + sdd2[datRow].MS.D->P->S7.rdm = (int)[self readInt:fp]; + + sdd2[datRow].MS.D->P->S7.teamFlag = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.team = (int)[self readInt:fp]; + + sdd2[datRow].MS.D->P->S7.unitFlag = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.valueFlag = (int)[self readInt:fp]; + + + sdd2[datRow].MS.D->P->S7.S7Acnt = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.S7Bcnt = (int)[self readInt:fp]; + + for (int k = 0;k < sdd2[datRow].MS.D->P->S7.S7Acnt;k++) { + if(k == 0){ + sdd2[datRow].MS.D->P->S7.A = calloc(1, sizeof(MAPSCRIPT7A)); + if(k + 1 < sdd2[datRow].MS.D->P->S7.S7Acnt) + sdd2[datRow].MS.D->P->S7.A->next = calloc(1, sizeof(MAPSCRIPT7A)); + MS7Atop = sdd2[datRow].MS.D->P->S7.A; + }else if(k + 1 < sdd2[datRow].MS.D->P->S7.S7Acnt) + sdd2[datRow].MS.D->P->S7.A->next = calloc(1, sizeof(MAPSCRIPT7A)); + + sdd2[datRow].MS.D->P->S7.A->x = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.A->y = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.A->team = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.A->unitNum = (int)[self readInt:fp]; + + sdd2[datRow].MS.D->P->S7.A = sdd2[datRow].MS.D->P->S7.A->next; + }sdd2[datRow].MS.D->P->S7.A = MS7Atop; + + + for (int k = 0;k < sdd2[datRow].MS.D->P->S7.S7Bcnt;k++) { + if(k == 0){ + sdd2[datRow].MS.D->P->S7.B = calloc(1, sizeof(MAPSCRIPT7B)); + if(k + 1 < sdd2[datRow].MS.D->P->S7.S7Bcnt) + sdd2[datRow].MS.D->P->S7.B->next = calloc(1, sizeof(MAPSCRIPT7B)); + MS7Btop = sdd2[datRow].MS.D->P->S7.B; + }else if(k + 1 < sdd2[datRow].MS.D->P->S7.S7Bcnt) + sdd2[datRow].MS.D->P->S7.B->next = calloc(1, sizeof(MAPSCRIPT7B)); + + sdd2[datRow].MS.D->P->S7.B->x = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.B->y = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.B->team = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.B->unitNum = (int)[self readInt:fp]; + sdd2[datRow].MS.D->P->S7.B->saveInt = (int)[self readInt:fp]; + + sdd2[datRow].MS.D->P->S7.B = sdd2[datRow].MS.D->P->S7.B->next; + }sdd2[datRow].MS.D->P->S7.B = MS7Btop; + } -(void)readMapScriptBGM:(FILE*)fp{ @@ -17602,12 +17683,6 @@ SKIP1: sdd.MS = MS; - /* - sdd->UTop = UTop; - sdd->BTop = BTop; - */ - - [self saveStruct]; } diff --git a/Awars III/MapEditor.h b/Awars III/MapEditor.h index 2b63be9..84a4c42 100644 --- a/Awars III/MapEditor.h +++ b/Awars III/MapEditor.h @@ -661,8 +661,32 @@ NSTimer *timeMapEditor; IBOutlet NSArrayController *EDstatusAC3; IBOutlet NSTableView *EDstatusTV3; + + IBOutlet NSWindow *EDequipWindow; + IBOutlet NSButtonCell *EDequipBC1; + IBOutlet NSButtonCell *EDequipBC2; + IBOutlet NSButton *EDequipCB1; + IBOutlet NSButton *EDequipCB2; + IBOutlet NSButton *EDequipCB3; + NSMutableArray *EDequipMA1; + IBOutlet NSArrayController *EDequipAC1; + IBOutlet NSTableView *EDequipTV1; + NSMutableArray *EDequipMA2; + IBOutlet NSArrayController *EDequipAC2; + IBOutlet NSTableView *EDequipTV2; + NSMutableArray *EDequipMA3; + IBOutlet NSArrayController *EDequipAC3; + IBOutlet NSTableView *EDequipTV3; + } +-(IBAction)EDequipSubmit:(id)sender; +-(IBAction)EDequipCancel:(id)sender; +-(IBAction)EDequipPlaceAdd:(id)sender; +-(IBAction)EDequipValueAdd:(id)sender; +-(IBAction)EDequipPlaceDel:(id)sender; +-(IBAction)EDequipValueDel:(id)sender; + -(IBAction)EDstatusSubmit:(id)sender; -(IBAction)EDstatusCancel:(id)sender; -(IBAction)EDstatusPlaceAdd:(id)sender; diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m index 438e3f0..22f8675 100755 --- a/Awars III/MapEditor.m +++ b/Awars III/MapEditor.m @@ -385,7 +385,22 @@ } if(MSDTOPP) NSLog(@"%d", MSDTOPP->index); */ - if(SLSx == 2){ + if(SLSx == 0){ + [topIV setImage:MC[SLindexU].img]; + [topIV setImageScaling:NSScaleToFit]; + + + [topName setStringValue:[NSString stringWithFormat:@"%@", MC[SLindexU].name]]; + + [topHealth setStringValue:[NSString stringWithFormat:@"地形修正 %d％", MC[SLindexU].dmgfix]]; + }else if(SLSx == 1){ + [topIV setImage:BC[SLindexU].img]; + [topIV setImageScaling:NSScaleToFit]; + + [topName setStringValue:[NSString stringWithFormat:@"%@", BC[SLindexU].name]]; + + [topHealth setStringValue:[NSString stringWithFormat:@"地形修正 %d％", BC[SLindexU].dmgfix]]; + }else if(SLSx == 2){ [topIV setImage:UC[SLindexU].imgb]; [topIV setImageScaling:NSScaleToFit]; diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib index 3733930..48850ad 100755 --- a/Awars III/en.lproj/MainMenu.xib +++ b/Awars III/en.lproj/MainMenu.xib @@ -720,14 +720,19 @@ + + + + + + + + + - - - - @@ -751,15 +756,9 @@ - - - - - - @@ -791,24 +790,9 @@ - - - - - - - - - - - - - - - @@ -830,8 +814,6 @@ - - @@ -2425,7 +2407,7 @@ - + @@ -8214,26 +8196,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -8314,6 +8276,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -9081,7 +9063,7 @@ - + @@ -10349,7 +10331,7 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + @@ -15372,11 +15327,11 @@ - - + + - + @@ -15578,45 +15533,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15762,11 +15678,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17339,11 +17321,11 @@ - - + + - + @@ -17447,11 +17429,11 @@ - - + + - + @@ -17555,29 +17537,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -17621,13 +17580,36 @@ + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -17672,12 +17654,12 @@ - - + + - - + + @@ -17695,37 +17677,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17851,12 +17802,12 @@ - + - + @@ -18019,206 +17970,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - - - - - + - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18283,464 +18065,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + @@ -23157,7 +22498,7 @@ - + @@ -23311,6 +22652,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Awars III/地形.png b/Awars III/地形.png old mode 100755 new mode 100644 index 6f66ea4a9b954a304b032fb82b61c8da3f27a503..70c5a3af1621baa7e188d683e2ac8b1be6186ed2 GIT binary patch delta 424 zcmV;Z0ayOS1h)f_8Gi!+002a!ipBr{0E$pdR7L;){{R30^78Wb_V)bz{OjxMoSdBX z_4VQ5;pgY)+S=O4$jI^W@m*bA`T6;=v9Z7;j$zr3%gkDhV)UHauX7L8GMLfZn!pDFZMU zX$pWN7UuU*)H1{Jfy3DbnQ2CcKR(2?DST$0<9;30M>uTn2PjM-=Ni@g98TLlMm S%p2?g0000K*f)Iy> zph-uCR$By>2A2YbS_GGnj~arK5Cj(&*M^|MhGsz;gotPnf*gv5@(&cDh?>!JpL@@D z?~U(%Uk)z%9WM8r^S;k{-uFE3drC}msH5pn*+qVo18nET(|>j^Z>h1{Nqr~NWp*X5 zGEBm05cOGj1D((jKmyD`JM7xh4C^ogr(g+QQt6#~HHagLM46lj?3zV1WUiZV-HTxx zUzz<$iYy55+X%7$apE!KD!heph!tqF>k{bG<+kk75%qmWmudmNSs#%;g6}@5ThGIb zG_PnSE|E$=eSa%(9>!qM;U9oVJW3U@5<@&G#|gL{NVWI`y>J<3;ST(SsoaTZque*( zsSkE1-fB0HD>h&Ct#y5&r9(WFtZJ^U==6VPj9l6-n0?gv0MDouOzGSL`(dZ5euYJs zG}sayRD4DH1s~xtT!8oR0q#b)f*Zs|E?deo=9AE^R)6UhYzB*F1=f(_^4>SQ!aRoo z+jI3!ERHWkkLi?-I!~hu&iPp^!)NGoYxdif{pq==9UeNK?bRge3^x@*t)lEC?nSfz zaGT$=@wH*X#4>(?8TYFmfr=DHK^FygG_RR%$3&9*iWL`~8tH~{QvY4Z;9B-%wEm9( z{~kHmzAvE22P3J4ZUm^Mj(rV@8WPo2pe~@%MaMv*zZyho9qk7R1ONa407*qoM6N<$ Ef?(qd>;M1& diff --git a/Awars III/建物.png b/Awars III/建物.png old mode 100755 new mode 100644 index efbe73bb2a10660287f3b3f2866708731d7650bb..7f5683b5f6a30d2f5669e9b1dce912cc0817cfeb GIT binary patch delta 1347 zcmV-J1-$y+2Gt6XBYyx1a7bBm000XU000XU0RWnu7ytkO2XskIMF-#r0S^x}|12`W z0000;X;fHrLvL+uWo~o;00000LsCUSR8LYmAZKJPYH(#|Aa*e>Fd!&(b7^j8AW2F` zAWBe0M<8}KGAS$|WMyVyb!>DXadlyAX>@rC+S|~U000D_NqB>dB zsY&c% z)YPe|DK5zP1Nbj^41XTVq3gP?>jMJ=0Fa%X{rU4}zu!+O-PqXh`~6<8S5?*3)m21{ zMxzNiei0-*9TBIervae8zP`G;y05RVr>DnkHZ#V`%74moa&izcGcz+gJ6jaR?d|Pk zSsI1`33I=`zBZXm@7}#zU0vl)rlh1W#t0!i0067i+SJta;ll@q!{Ktdl5s#Xb0kS} zI-P_Nx7*#=*tog5>GgUUV=F5wfk0qpW`@_pZnsZPPFgIMqy%xZelLz;7>u#X%F6Zi zb-&;L@_*&a($Z2%l1wI3d3m|p?GA-PSy@?c-@a{YYXbmPRd1XVw>qf;K@ch`Dm)$! zwlqM-EMBwg9!kjySsaNd4JjAaQvP%05Hb7y1GBt*QrxrKKgO)0xoyI}}(f7TyCK4o6{O z;q2_J$Kw$MVSax8$&)9|&CT(yS5i`Pi-N=iu~^J%wZ4A+`s2rsilSs>WW)=@gMX5e z5>3;Nj*e<-YQo_#CqTrXKY!j~5jXnu^proM+S=O3j~^c&9~T!F$A9zf+qa#a9Z8a0 zE|;$BySuxWmzTj{aCCI^`}glR?Yc2%Iy*amT`x*~KHuTtq0i?-#Dao?xPnigJ|W_x zN00XQ_P9%g5J3=JF4w`q!3_~NEq{teqjPg}03gdUXOd<4{rmUD#l?gWPO!GN*3#0# zV=mNeHitr?gj4+{!S(euAF~q^6MT^IyU5ez2J(-BAjq<8Hk-eG{fdaXuHU!FoQA9E z?d=5sQ51R0!96S-j;jnQR zz_s8A-Mg-M5?GzT!!e^q|#|{O`Bxe*mjkPB&)o!C?RZ002ovPDHLk FV1gCZgPZ^W delta 840 zcmV-O1GoIu3f=~gBYy)WNkl7Kd7=FL+o0*;2pV`0e*mi{=MM}7qBN+cT2{-h-P!HT&d>La8RMi~ zJxIf0-@})g_kG^y$@_fo3{turSjfN&N$zp~PXe|!I(uBl8h@cy&CfIQ^K1Y&JLP5^ zW3ZaPg}5dl8v=5g8b#z}%i}|lSlZ49;x3FCBUYiUjE0ovjli;{S4R_F4}T+^ z+akoTm(r&MA*WR>`((qTS^>Z+*p*GH@IsCQf*aMm%hO%b_al8s zQkH#x-6knL`t)spj(BH|$52NAfEM>w^=%1miLmrCqkve}F0}@mPeS!94PB6v?T*&( zq;JQ#i&f`{X!NMjC#j|h%RU%RePMVfZ$9uRnA;+^Mt|9ca5`5UK5Xe(qcmu!k8OBo zlx|w)icqZG186V#=w?D>OcwLW2TIEpW4u>XHqzoX66waw=dZt}l(tCe^I~ipA?`AZ zfP-!aLLw0G{pFgjhe9bvRr6zarChX12UL3?7>v*4<#43kp%q`Du0?3(w5lf|e2$3G z0P!p`0e=K}2X-t6CA|sM(}nka?t`FQ5xINcKTIV$_u2V%MrOcG8kI4hx~@PVb6g$n zl~blRw%dRthJpz%*hJ3tlvN%{t5s3jnOJ+!Deay?tr(YM9ao8Q>1#fj=C@ z8+N0v0IR)n%j(qA5f-G9y62$&NSnvQ`vIQ`~uq)p{qUVGBe z13qeQ0b1!VjNXZNs7UQAQ{<-e~q1m^XyVNt`Pc^#M+(Ac7XZ_y8|G(lm4 SmU&|U0000Fd!&(b7^j8AW2F` zAWBe0M<8}MFexk`adlyAX>@rYJs>$S3aX674gdfF{z*hZRDVdv?UpUC;y@IJr_-5| zLIoc|5-^B55(G4<#(*NhG(qtnFa*J0z~eCdfGQFa6rd3Z0%?LlU?`%{PG?q3cEjF# zTY6bYR@_&$NzZw5KHlj77D2x6GsYT?20}t!7-L=6UDu7pVqXV8Y|daX2m%X&P%f9B-y+ZR#((26PxP^Hgbc%&OeXwGO6j)& zeD`^}TCH}!oe)ArQKFb2Y{-<-)oKL*&~?39t%{=fp|QMr_`W}#PGwncHk-C> zf3`wI1p*L4$K%m)oKmTD?|_#9L{U7S&j0{fmOl^q1prEEGMNMbT(8%s`x6Ergrw7H zNs_kP?SESU+(d+s&1UnK7C{I#O{0{WrpbHt`XOht+0kfZnkJw2b9&&EcDv0O<7+Ai z0>;>N-PcsWg)xQ@@)8{ec$(a z_HQ^Y%H4gp+oe(|RaN;tOp>JGa2RqIy4NoaiW15}%K3zB00000NkvXXu0mjfB1j*i delta 447 zcmV;w0YLt+1=s_SBYy#(NklRnXRtdV8(AI)>}XT}flPH<#SK-+S(PzTfA4 za#FIFhA!EaT`!Z;T~R**n(S{XtlV-~t)>LaQHI}Gkl51fK!1;WhY7A=r2_<;Jxm4I zc_j6~P};h-g-2!!Rx^Q77pxaZK|D`PArU6oW}#QpTvqB6aG1a#hy_iS(PrY0w3S%M zGMC{%r#nc$QlEg+1Q3!LfPl1Z-h=azm{b%2N9M3@$x3pQRU$c!mO zzJPTe0bk#JcYh!;SPjg4E17qWOK1|iI(NTKYK=t|(t?X3M~0+eTBTWL{+@A|33Kz^ zhvx^oz_TD5Kr1pCWK?6XY@S52%i>#lrOz|FiHe>isDn{`Ci#MBY>hoUdwYMyVA pZ;`75t^hwpzD2GMxB?oUq7U}@XA04}Rhs|+002ovPDHLkV1nPl%w+%o -- 2.11.0