weap -> weapon

hwe/sammo/Command/General/che_군량매매.php

@@ -30,7 +30,7 @@ class che_군량매매 extends Command\GeneralCommand{
 
     static $itemMap = [
         'horse'=>'명마',
-        'weap'=>'무기',
+        'weapon'=>'무기',
         'book'=>'서적',
         'item'=>'도구',
     ];

hwe/sammo/Command/General/che_장비매매.php

@@ -30,7 +30,7 @@ class che_장비매매 extends Command\GeneralCommand{
 
     static $itemMap = [
         'horse'=>'명마',
-        'weap'=>'무기',
+        'weapon'=>'무기',
         'book'=>'서적',
         'item'=>'도구',
     ];

hwe/sammo/Command/General/che_화계.php

@@ -218,7 +218,7 @@ class che_화계 extends Command\GeneralCommand{
         [$year, $month] = [$env['year'], $env['month']];
         
         foreach($db->query(
-            'SELECT `no`,name,city,nation,level,leadership,horse,strength,weap,intel,book,item,last_turn,injury,special,special2 FROM general WHERE city = %i',
+            'SELECT `no`,name,city,nation,level,leadership,horse,strength,weapon,intel,book,item,last_turn,injury,special,special2 FROM general WHERE city = %i',
             $destCityID,
             $destNationID
         ) as $rawDestCityGeneral){

hwe/sammo/General.php

@@ -78,7 +78,7 @@ class General implements iAction{
         $this->personalityObj = new $personalityClass;
         
         $this->itemObjs['horse'] = buildItemClass($raw['horse']);
-        $this->itemObjs['weapon'] = buildItemClass($raw['weap']);
+        $this->itemObjs['weapon'] = buildItemClass($raw['weapon']);
         $this->itemObjs['book'] = buildItemClass($raw['book']);
         $this->itemObjs['item'] = buildItemClass($raw['item']);
     }
@@ -612,11 +612,11 @@ class General implements iAction{
         $defaultEventColumn = [
             'no', 'name', 'city', 'nation', 'level',
             'special', 'special2', 'personal',
-            'horse', 'weap', 'book', 'item', 'last_turn'
+            'horse', 'weapon', 'book', 'item', 'last_turn'
         ];
         $fullColumn = [
             'no', 'name', 'name2', 'picture', 'imgsvr', 'nation', 'nations', 'city', 'troop', 'injury', 'affinity', 
-            'leadership', 'leadership2', 'strength', 'strength2', 'intel', 'intel2', 'weap', 'book', 'horse', 'item', 
+            'leadership', 'leadership2', 'strength', 'strength2', 'intel', 'intel2', 'weapon', 'book', 'horse', 'item', 
             'experience', 'dedication', 'level', 'gold', 'rice', 'crew', 'crewtype', 'train', 'atmos', 'turntime',
             'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'startage', 'belong',
             'personal', 'special', 'special2', 'mode', 'npc', 'npc_org', 'deadyear', 'npcmsg',