totaltech, tech를 float tech로 일원화, NPC가 기술레벨 10을 넘으면 기연 안하는 버그 수정

hwe/sammo/Engine/Personnel.php

@@ -92,16 +92,6 @@ class Personnel{
             return [$result, $reason];
         }
 
-        $scoutNationGeneralCnt = $db->queryFirstField(
-            'SELECT COUNT(`no`) FROM general WHERE nation = %i', 
-            $this->nation['nation']
-        );
-
-        $originalNationGeneralCnt = $db->queryFirstField(
-            'SELECT COUNT(`no`) FROM general WHERE nation = %i', 
-            $general['nation']
-        );
-
         $isTroopLeader = false;
         if($general['troop']){
             $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop = %i', $general['troop']);
@@ -110,16 +100,6 @@ class Personnel{
             }
         }
 
-        $scoutNationGeneralCnt+=1;
-        if($scoutNationGeneralCnt < GameConst::$initialNationGenLimit){
-            $scoutNationGeneralCnt = GameConst::$initialNationGenLimit;
-        }
-
-        $originalNationGeneralCnt-=1;
-        if($originalNationGeneralCnt < GameConst::$initialNationGenLimit){
-            $originalNationGeneralCnt = GameConst::$initialNationGenLimit;
-        }
-
         $joinedNations = Json::decode($general['nations']);
         $joinedNations[] = $this->nation['nation'];
 
@@ -139,13 +119,11 @@ class Personnel{
         ];
 
         $setOriginalNationValues = [
-            'totaltech'=>$db->sqleval('tech * %i', $originalNationGeneralCnt),
-            'gennum'=>$originalNationGeneralCnt
+            'gennum'=>$db->sqleval('gennum - 1')
         ];
 
         $setScoutNationValues = [
-            'totaltech'=>$db->sqleval('tech * %i', $scoutNationGeneralCnt),
-            'gennum'=>$scoutNationGeneralCnt
+            'gennum'=>$db->sqleval('gennum + 1')
         ];
 
         $setOriginalCityValues = [];

hwe/sammo/Scenario/Nation.php

@@ -97,7 +97,6 @@ class Nation{
             'surlimit'=>72,
             'scoutmsg'=>$this->infoText,
             'tech'=>$this->tech,
-            'totaltech'=>0,
             'level'=>$this->nationLevel,
             'type'=>$type,
         ]);
@@ -139,7 +138,6 @@ class Nation{
         $db = DB::db();
         $db->update('nation', [
             'gennum'=>$npc_cnt,
-            'totaltech'=>$this->tech*$npc_cnt
         ], 'nation=%i', $this->id);
 
         //군주가 없는지 확인