ゲームのAT調整

diff --git a/Awars III/EventScene.h b/Awars III/EventScene.h
index 4610459..9fca0d6 100755 (executable)
--- a/Awars III/EventScene.h
+++ b/Awars III/EventScene.h
@@ -48,6 +48,8 @@ bool FieldSceneInitFlag;
 
 bool EventViewDraw;
 
+int esSceneProc;
+
 @interface EventScene : NSObject
 {
     NSTimer *timer;

diff --git a/Awars III/EventScene.m b/Awars III/EventScene.m
index aab2634..a7fd1bf 100755 (executable)
--- a/Awars III/EventScene.m
+++ b/Awars III/EventScene.m
@@ -76,6 +76,8 @@
         }
     }
     
+    
+    
    int dCount = 0;
     ST = evSTtop;
     if(!ST){
@@ -88,9 +90,8 @@
             [dialogTF setStringValue:@""];
             [faceIV setImage:nil];
             [wallIV setImage:nil];
-            [fsWindow makeKeyAndOrderFront:nil];
-            [esWindow close];
             FieldSceneInitFlag = true;
+            initMapFlag = true;
             EventViewDraw = true;
             UTop = NULL;
             if(MF[MFselectedRow+1].MS.battleSetMode){
@@ -113,10 +114,21 @@
             [dialogTF setStringValue:@""];
             [faceIV setImage:nil];
             [wallIV setImage:nil];
-            [titleWindow makeKeyAndOrderFront:nil];
-            [esWindow close];
+            if(esSceneProc == 0){
+                [titleWindow makeKeyAndOrderFront:nil];
+                 esSceneProc++;
+            }
+            
             return;
         }
+    }else{
+        
+        if(esSceneProc == 0){
+            [esWindow setFrameOrigin:NSMakePoint(titleWindow.frame.origin.x, titleWindow.frame.origin.y)];
+            [esWindow makeKeyAndOrderFront:nil];
+            [titleWindow close];
+            esSceneProc++;
+        }
     }
     
     if(jumpFlag){
@@ -219,7 +231,6 @@
         mapInitFlag = true;
         [MapViewInst loadMapChip];
         mapInitFlag = false;
-        [fsWindow makeKeyAndOrderFront:nil];
         [esWindow close];
         UTop = NULL;
         if(MF[MFselectedRow+1].MS.battleSetMode){
@@ -242,6 +253,7 @@
         postImageWall = NULL;
         evActive = true;
         FieldSceneInitFlag = true;
+        initMapFlag = true;
         
         startOrEndFlag = true;
         cnt = 0;

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index 7844db8..9e81540 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -301,6 +301,8 @@ bool guildRE2;
 int Gnum1;
 int Gnum2;
 
+int mapChipDataLoadProc;
+
 @interface FieldScene : NSObject
 {
     NSTimer *time;

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 95bc506..0bbdc8f 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -1148,6 +1148,7 @@
         }
 
         MS.D->ET3 = MS.D->ET1 + (double)deltaR;
+        MS.D->ET4 = MS.D->ET3;
         
         MSDPt = MS.D->P;
         while (MS.D->P) {
@@ -1527,6 +1528,7 @@
         
         [self initGuildList];
         cpuTurnEndFlag = false;
+        mapChipDataLoadProc = 0;
     }
     
     if(unitBreak){
@@ -1549,7 +1551,7 @@
         }
     }
     
-    [self EventFunc];
+    [self EventFunc:true];
     if(wtRdy3)
         return;
     
@@ -1628,6 +1630,12 @@
                         B = BTop;
                     }
                     
+                    eventTime++;
+                    U = UTop;
+                    
+                    [self EventFunc:false];
+                    pussyCumsOnlyOnceFlag = false;
+                    
                     goto lolwtfshit;
                 }
                 
@@ -1664,6 +1672,9 @@
             }
             eventTime++;
             U = UTop;
+            
+            [self EventFunc:false];
+            
             pussyCumsOnlyOnceFlag = false;
             wtRdy = false;
             
@@ -1731,10 +1742,7 @@
     }
     
     if(mapChipDataLoadFail){
-        
         [endGamePanel close];
-        [esWindow makeKeyAndOrderFront:nil];
-        [fsWindow close];
         
         endGameCondition = false;
         initMapFlag = false;
@@ -1750,6 +1758,18 @@
         
         mapChipDataLoadFail = false;
         return;
+    }else if(initMapFlag){
+        mapChipDataLoadProc++;
+    }
+    
+    if(mapChipDataLoadProc > 2)
+        mapChipDataLoadProc = 2;
+    
+    if(mapChipDataLoadProc == 1){
+        [fsWindow makeKeyAndOrderFront:nil];
+        [esWindow close];
+        [titleWindow close];
+        mapChipDataLoadProc++;
     }
     
     if(TeamCountFlag && !endGameCondition){
@@ -1825,9 +1845,11 @@
         }
         
         [endGamePanel close];
-        [esWindow makeKeyAndOrderFront:nil];
+
         [fsWindow close];
         
+        esSceneProc = 0;
+        
         [BGMsub stop];
         
         endGameCondition = false;
@@ -1861,6 +1883,8 @@
         [titleWindow makeKeyAndOrderFront:nil];
         [fsWindow close];
         
+        esSceneProc = 0;
+        
         [BGMsub stop];
         
         endGameCondition = false;
@@ -1902,9 +1926,10 @@
             return;
         }
         
-        [esWindow makeKeyAndOrderFront:nil];
         [fsWindow close];
         
+        esSceneProc = 0;
+        
         [BGMsub stop];
         
         endGameCondition = false;
@@ -2133,9 +2158,9 @@
 
 }
 
--(void)EventFunc{
+-(void)EventFunc:(bool)eventLoopProcFlag{
     
-    if(battleBegin && !pussyLoopFlag && !pussyCumsOnlyOnceFlag){
+    if(battleBegin && !pussyLoopFlag){
         wtRdy3 = true;
         bool proccessTrue = false;
         static bool onlyBigin = false;
@@ -2285,8 +2310,31 @@
                 }
             
             
-            if(MS.D->ET3 <= eventTime)
+            if(eventTime == MS.D->ET4){
                 proccessTrue = true;
+                if(MS.D->ETtype == 4){
+                    
+                    double deltaET = floor(MS.D->ET2) - floor(MS.D->ET1);
+                    int deltaR = 0;
+                    if(deltaET < 0) deltaET = 0;
+                    
+                    if(MS.D->ET1 <= eventTime && MS.D->ET2 >= eventTime){
+                        if(deltaET > 0) deltaR = rand()%(int)deltaET;
+                    }
+                    
+                    MS.D->ET3 = MS.D->ET1 + (double)deltaR;
+                    
+                    MS.D->ET4 += MS.D->ET3;
+                }
+                
+               // NSLog(@"%g %d", eventTime, P[0].resource);
+            }else{
+            
+                MS.D = MS.D->next;
+                
+                continue;
+            }
+            
             
             
             if(MS.D->type == -1 && !EventFailFlag)
@@ -2302,8 +2350,11 @@
             if(MS.D->endFlag)
                 continue;
             
+            if(!MS.D->ET4 == 0 && pussyCumsOnlyOnceFlag){
+                EventFailFlag = true;
+            }
             
-            if(EventFailFlag){
+            if(EventFailFlag  || !proccessTrue){
                 while (MS.D->P) {
                     MS.D->P->endFlag = true;
                     MS.D->P = MS.D->P->next;
@@ -2461,7 +2512,8 @@
         MF[MFselectedRow+1].MS.D = MS.D;
         cpuTurnEndFlag = false;
         battleSetUpIgnore = false;
-        pussyCumsOnlyOnceFlag = true;
+        if(!eventLoopProcFlag)
+            pussyCumsOnlyOnceFlag = true;
         wtRdy3 = false;
     }
 
@@ -2533,6 +2585,9 @@
     if(MS0->type == 37)
         Proc = TITLE_FLAG;
     
+
+        
+    
     switch(Proc){
             
         case MESSAGE_FLAG:
@@ -2541,6 +2596,7 @@
             coolTime = true;
             break;
         case SELECTION_FLAG:
+            
             MS0 = [self setSelection:MS0];
             coolTime = true;
             break;

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 2579dd3..83ed8c5 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -4265,7 +4265,6 @@
     
     
     if(FieldSceneInitFlag){
-        initMapFlag = true;
         FieldSceneInitFlag = false;
         
         NSRect seRect = NSMakeRect(0, 0, chipWidth*32, chipHeight*32);

diff --git a/Awars III/MapEditor.h b/Awars III/MapEditor.h
index 03b2082..dc23b7a 100644 (file)
--- a/Awars III/MapEditor.h
+++ b/Awars III/MapEditor.h
@@ -280,6 +280,7 @@ typedef struct _MAPSCRIPTD{
     double ET1;
     double ET2;
     double ET3;
+    double ET4;
     int ETtype;
     
     int *switch1;

diff --git a/Awars III/ScenarioList.m b/Awars III/ScenarioList.m
index d07e35e..3599d9d 100755 (executable)
--- a/Awars III/ScenarioList.m
+++ b/Awars III/ScenarioList.m
@@ -21,12 +21,7 @@
     MFselectedRow = scenarioNumb + 1;
     [SLPanel close];
     [NSApp stopModal];
-    NSPoint windowPoint;
-    windowPoint.x = [titleWindow frame].origin.x;
-    windowPoint.y = [titleWindow frame].origin.y;
-    [eventSceneWindow setFrameOrigin:windowPoint];
-    [eventSceneWindow makeKeyAndOrderFront:nil];
-    [titleWindow close];
+    esSceneProc = 0;
     evActive = true;
     
     [SLPanel close];
@@ -69,12 +64,7 @@
     MFselectedRow = scenarioNumb + 1;
     [SLPanel close];
     [NSApp stopModal];
-    NSPoint windowPoint;
-    windowPoint.x = [titleWindow frame].origin.x;
-    windowPoint.y = [titleWindow frame].origin.y;
-    [eventSceneWindow setFrameOrigin:windowPoint];
-    [eventSceneWindow makeKeyAndOrderFront:nil];
-    [titleWindow close];
+    esSceneProc = 0;
     evActive = true;
 }
 

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 684e6c4..c4857c0 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -8801,6 +8801,10 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="photo" id="10281"/>
                     </imageView>
+                    <customView id="aPb-WE-XhR" customClass="EventView">
+                        <rect key="frame" x="0.0" y="0.0" width="640" height="480"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
                     <box autoresizesSubviews="NO" title="Box" boxType="custom" borderType="line" titlePosition="noTitle" id="10247">
                         <rect key="frame" x="150" y="22" width="470" height="100"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -8870,10 +8874,6 @@
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" red="0.79993206520000004" green="0.75136146059999998" blue="0.72815454430000004" alpha="0.65000000000000002" colorSpace="calibratedRGB"/>
                     </box>
-                    <customView id="aPb-WE-XhR" customClass="EventView">
-                        <rect key="frame" x="0.0" y="0.0" width="640" height="480"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    </customView>
                 </subviews>
             </view>
             <point key="canvasLocation" x="-465" y="1846"/>