숙련도에 훈련과 사기 적용

che_close/func.php

@@ -1080,11 +1080,12 @@ function getGenDex($general, $type) {
     return $general["dex{$type}"];
 }
 
-function addGenDex($connect, $no, $type, $exp) {
+function addGenDex($connect, $no, $atmos, $train, $type, $exp) {
     $type = floor($type / 10) * 10;
     $dexType = "dex{$type}";
     if($type == 30) { $exp = round($exp * 0.90); }     //귀병은 90%효율
     elseif($type == 40) { $exp = round($exp * 0.90); } //차병은 90%효율
+    $exp = $exp * ($atmos+$train)/200; // 사기 + 훈련 / 200
 
     $query = "update general set {$dexType}={$dexType}+{$exp} where no='$no'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

che_close/func_process.php

@@ -1,5 +1,8 @@
 <?php
 
+define('DEFAULT_ATMOS', 100);
+define('DEFAULT_TRAIN', 100);
+
 /**
  * 장수의 통솔을 받아옴
  * 
@@ -955,7 +958,7 @@ function process_11($connect, &$general, $type) {
         $exp = $crew;
         $ded = $crew;
         // 숙련도 증가
-        addGenDex($connect, $general[no], $armtype, $crew);
+        addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $armtype, $crew);
         // 성격 보정
         $exp = CharExperience($exp, $general[personal]);
         $ded = CharDedication($ded, $general[personal]);
@@ -1021,7 +1024,7 @@ function process_13($connect, &$general) {
         $exp = 100;
         $ded = 70;
         // 숙련도 증가
-        addGenDex($connect, $general[no], $general[crewtype], round($general[crew]/100));
+        addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], round($general[crew]/100));
         // 성격 보정
         $exp = CharExperience($exp, $general[personal]);
         $ded = CharDedication($ded, $general[personal]);
@@ -1089,7 +1092,7 @@ function process_14($connect, &$general) {
         $exp = 100;
         $ded = 70;
         // 숙련도 증가
-        addGenDex($connect, $general[no], $general[crewtype], round($general[crew]/100));
+        addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], round($general[crew]/100));
         // 성격 보정
         $exp = CharExperience($exp, $general[personal]);
         $ded = CharDedication($ded, $general[personal]);
@@ -1159,7 +1162,7 @@ function process_15($connect, &$general) {
         $exp = 100 * 3;
         $ded = 70 * 3;
         // 숙련도 증가
-        addGenDex($connect, $general[no], $general[crewtype], round($general[crew]/100 * 3));
+        addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], round($general[crew]/100 * 3));
         // 성격 보정
         $exp = CharExperience($exp, $general[personal]);
         $ded = CharDedication($ded, $general[personal]);
@@ -1239,7 +1242,7 @@ function process_16($connect, &$general) {
         $query = "update city set state=43,term=3 where city='$destcity[city]'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         // 숙련도 증가
-        addGenDex($connect, $general[no], $general[crewtype], round($general[crew]/100));
+        addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], round($general[crew]/100));
         // 전투 처리
         $dead = processWar($connect, $general, $destcity);
 
@@ -3039,17 +3042,17 @@ function process_41($connect, &$general) {
 
         if($ratio < 33) {
             // 숙련도 증가
-            addGenDex($connect, $general[no], $general[crewtype], $crewexp);
+            addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], $crewexp);
             $log[count($log)] = "<C>●</>{$admin[month]}월:$crewstr 숙련도 향상이 <O>지지부진</>했습니다. <1>$date</>";
         } elseif($ratio < 66) {
             $exp = $exp * 2;
             // 숙련도 증가
-            addGenDex($connect, $general[no], $general[crewtype], $crewexp * 2);
+            addGenDex($connect, $general[no],DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], $crewexp * 2);
             $log[count($log)] = "<C>●</>{$admin[month]}월:$crewstr 숙련도가 향상되었습니다. <1>$date</>";
         } else {
             $exp = $exp * 3;
             // 숙련도 증가
-            addGenDex($connect, $general[no], $general[crewtype], $crewexp * 3);
+            addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], $crewexp * 3);
             $log[count($log)] = "<C>●</>{$admin[month]}월:$crewstr 숙련도가 <S>일취월장</>했습니다. <1>$date</>";
         }
 

che_close/process_war.php

@@ -404,8 +404,8 @@ function processWar($connect, $general, $city) {
             $query = "update general set crew='$general[crew]',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='$general[no]'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             // 숙련도 증가
-            addGenDex($connect, $general[no], $general[crewtype], $mykillnum);
+            addGenDex($connect, $general[no], $general[atmos], $general[train], $general[crewtype], $mykillnum);
-            addGenDex($connect, $general[no], 40, $mydeathnum);
+            addGenDex($connect, $general[no], $general[atmos], $general[train], 40, $mydeathnum);
             // 죽은수 기술로 누적
             $num = round($mydeathnum * 0.01);
             // 국가보정
@@ -1243,8 +1243,8 @@ function processWar($connect, $general, $city) {
             $query = "update general set injury='$oppose[injury]',crew='$oppose[crew]',killcrew=killcrew+'$opkillnum',deathcrew=deathcrew+'$opdeathnum' where no='$oppose[no]'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             // 숙련도 증가
-            addGenDex($connect, $oppose[no], $oppose[crewtype], $opkillnum * 0.9);
+            addGenDex($connect, $oppose[no], $oppose[atmos], $oppose[train], $oppose[crewtype], $opkillnum * 0.9);
-            addGenDex($connect, $oppose[no], $general[crewtype], $opdeathnum * 0.9);
+            addGenDex($connect, $oppose[no], $oppose[atmos], $oppose[train], $general[crewtype], $opdeathnum * 0.9);
             // 죽은수 기술로 누적
             $num = round($mydeathnum * 0.01);
             // 국가보정
@@ -1266,8 +1266,8 @@ function processWar($connect, $general, $city) {
             $query = "update general set injury='$general[injury]',crew='$general[crew]',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='$general[no]'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             // 숙련도 증가
-            addGenDex($connect, $general[no], $general[crewtype], $mykillnum);
+            addGenDex($connect, $general[no], $general[atmos], $general[train], $general[crewtype], $mykillnum);
-            addGenDex($connect, $general[no], $oppose[crewtype], $mydeathnum);
+            addGenDex($connect, $general[no], $general[atmos], $general[train], $oppose[crewtype], $mydeathnum);
             // 죽은수 기술로 누적
             $num = round($opdeathnum * 0.01);
             // 국가보정