leader->leadership, power->strength

hwe/templates/cityGeneral.php

@@ -4,7 +4,7 @@
     data-general-wounded="<?=$wounded?>"
     data-general-name="<?=$this->e($name)?>"
     data-general-leadership="<?=$leadership?>"
-    data-general-power="<?=$power?>"
+    data-general-strength="<?=$strength?>"
     data-general-intel="<?=$intel?>"
     data-general-level="<?=$level?>"
     data-general-leadership-bonus="<?=$leadershipBonus?>"
@@ -23,7 +23,7 @@
     <td height="64"><img class='generalIcon' width='64' height='64' src='<?=$iconPath?>'></td>
     <td><?=$nameText?></td>
     <td><?=$leadershipText?><?=$leadershipBonusText?></td>
-    <td><?=$powerText?></td>
+    <td><?=$strengthText?></td>
     <td><?=$intelText?></td>
     <td class="general_level"><?=$levelText?></td>
 <?php if($ourGeneral): ?>

hwe/templates/generalList.php

@@ -24,8 +24,8 @@
     data-is-npc="<?=$general['npc']>=2?'true':'false'?>"
     data-general-wounded="<?=$general['injury']?>"
     data-general-name="<?=$general['name']?>"
-    data-general-leadership="<?=$general['leader']?>"
-    data-general-power="<?=$general['power']?>"
+    data-general-leadership="<?=$general['leadership']?>"
+    data-general-strength="<?=$general['strength']?>"
     data-general-intel="<?=$general['intel']?>"
     data-general-level="<?=$general['expLevelText']?>"
     data-general-leadership-bonus="<?=$general['lbonus']?>"
@@ -37,7 +37,7 @@
 >
     <td class='i_name center'><span class='t_name'><?=$general['nameText']?></span><br
     >Lv <span class='t_explevel'><?=$general['expLevelText']?></span></td>
-    <td class='i_stat center'><?=$general['leaderText']?>∥<?=$general['powerText']?>∥<?=$general['intelText']?></td>
+    <td class='i_stat center'><?=$general['leadershipText']?>∥<?=$general['strengthText']?>∥<?=$general['intelText']?></td>
     <td class='i_troop center'><?=$general['troopText']?></td>
     <td class='i_gold center'><?=$general['gold']?></td>
     <td class='i_rice center'><?=$general['rice']?></td>

hwe/templates/recruitCrewForm.php

@@ -17,7 +17,7 @@
     <tr>
         <td colspan=11 align=center class='bg2'>
             현재 기술력 : <?=$techLevelText?>
-            현재 통솔 : <?=$leader?><?=($leader!=$fullLeader)?"({$fullLeader})":''?>
+            현재 통솔 : <?=$leadership?><?=($leadership!=$fullLeadership)?"({$fullLeadership})":''?>
             현재 병종 : <?=$crewTypeName?>
             현재 병사 : <?=$crew?>
             현재 자금 : <?=$gold?>
@@ -87,8 +87,8 @@
 </form>
 <script>
 var currentTech = <?=$tech?>;
-var leader = <?=$leader?>;
-var fullLeader = <?=$fullLeader?>;
+var leadership = <?=$leadership?>;
+var fullLeadership = <?=$fullLeadership?>;
 var currentCrewType = <?=$crewType?>;
 var currentCrew = <?=$crew?>;
 var currentGold = <?=$gold?>;
@@ -131,7 +131,7 @@ $(function(){
         var crewtype = parseInt($parent.data('crewtype'));
         var $input = $parent.find('.form_double:eq(0)');
 
-        var fillValue = Math.round(leader / 2);
+        var fillValue = Math.round(leadership / 2);
         $formCrewtype.val(crewtype);
         $input.val(fillValue).change();
         return false;
@@ -143,9 +143,9 @@ $(function(){
         var crewtype = parseInt($parent.data('crewtype'));
         var $input = $parent.find('.form_double:eq(0)');
 
-        var fillValue = Math.ceil((leader*100 - currentCrew)/100);
+        var fillValue = Math.ceil((leadership*100 - currentCrew)/100);
         if(crewtype != currentCrewType){
-            fillValue = leader;
+            fillValue = leadership;
         }
         $formCrewtype.val(crewtype);
         $input.val(fillValue).change();
@@ -158,7 +158,7 @@ $(function(){
         var crewtype = parseInt($parent.data('crewtype'));
         var $input = $parent.find('.form_double:eq(0)');
 
-        var fillValue = fullLeader + 15;
+        var fillValue = fullLeadership + 15;
         $formCrewtype.val(crewtype);
         $input.val(fillValue).change();
         return false;