diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index 5b9057b0..0a741dd6 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -280,7 +280,7 @@ foreach($generals as $general){
if($ourGeneral && !$isNPC){
$turnText = [];
- $generalObj = new General($general, null, null, null, null, false);
+ $generalObj = new General($general, null, null, null, null, null, false);
foreach($generalTurnList[$generalObj->getID()] as $turnRawIdx=>$turn){
$turnIdx = $turnRawIdx+1;
$turnText[] = "{$turnIdx} : $turn";
diff --git a/hwe/genDatabase.txt b/hwe/genDatabase.txt
index 53d935c9..166c77eb 100644
--- a/hwe/genDatabase.txt
+++ b/hwe/genDatabase.txt
@@ -165,7 +165,7 @@
128, "설종",1163, 0, "낙양", 27, 33, 67, 0, 187, 243, "유지", "-"); $gencount++;
69, "성의",1164, 0, "낙양", 45, 64, 22, 0, 168, 211, "재간", "-"); $gencount++;
129, "소비",1165, 0, "낙양", 67, 63, 49, 0, 172, 221, "대의", "-"); $gencount++;
- 76, "손건",1166, 0, "낙양", 42, 33, 73, 0, 165, 215, "대의", "거상"); $gencount++;
+ 76, "손건",1166, 0, "낙양", 42, 33, 73, 0, 165, 215, "대의", null); $gencount++;
125, "손견",1167, 0, "낙양", 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"); $gencount++;
126, "손광",1168, 0, "낙양", 63, 54, 58, 0, 186, 207, "유지", "-"); $gencount++;
125, "손권",1169, 0, "낙양", 90, 77, 83, 0, 182, 252, "할거", "수비"); $gencount++;
diff --git a/hwe/install.php b/hwe/install.php
index d9c84da3..2067d806 100644
--- a/hwe/install.php
+++ b/hwe/install.php
@@ -175,6 +175,9 @@ if($session->userGrade < 5 && !$allowReset){
+
유효 시간
diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index 213f5a0d..9214cb68 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -17,6 +17,7 @@ function getAutorunInfo($autorunOption){
case 'recruit_high': $auto_info['징병'] = '모병'; break;
case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
case 'battle': $auto_info['출병'] = '출병'; break;
+ case 'chief': $auto_info['사령턴'] = '사령턴'; break;
}
}
$limit = Util::toInt($autorunOption['limit_minutes']);
diff --git a/hwe/sammo/AutorunGeneralPolicy.php b/hwe/sammo/AutorunGeneralPolicy.php
index e0f6170d..65bfd084 100644
--- a/hwe/sammo/AutorunGeneralPolicy.php
+++ b/hwe/sammo/AutorunGeneralPolicy.php
@@ -113,7 +113,7 @@ class AutorunGeneralPolicy{
}
- function __construct(General $general, $aiOptions){
+ function __construct(General $general, $aiOptions, array $nationPolicy, array $serverPolicy, array $nation, array $env){
//TODO: 국가 정책을 받아와야함
$this->priority = static::$default_priority;
diff --git a/hwe/sammo/AutorunNationPolicy.php b/hwe/sammo/AutorunNationPolicy.php
index b33dbe48..99f2f2f6 100644
--- a/hwe/sammo/AutorunNationPolicy.php
+++ b/hwe/sammo/AutorunNationPolicy.php
@@ -141,18 +141,18 @@ class AutorunNationPolicy {
public $properWarTrainAtmos = 90;
- function __construct(General $general, array $nationPolicy, array $serverPolicy, array $nation, array $env)
+ function __construct(General $general, $aiOptions, array $nationPolicy, array $serverPolicy, array $nation, array $env)
{
foreach($serverPolicy as $policy=>$value){
if(!property_exists($this, $policy)){
- throw new \InvalidArgumentException($policy);
+ continue;
}
$this->$policy = $value;
}
foreach($nationPolicy as $policy){
if(!property_exists($this, $policy)){
- throw new \InvalidArgumentException($policy);
+ continue;
}
$this->$policy = $value;
}
@@ -197,5 +197,36 @@ class AutorunNationPolicy {
if($this->reqHumanWarRecommandRice === 0){
$this->reqHumanWarRecommandRice = Util::round(max(30000, $this->reqHumanWarRecommandRice * 3), -2);
}
+
+ if($general->getVar('npc') >= 2){
+ return;
+ }
+
+ if(!key_exists('chief', $aiOptions)){
+ $this->can부대전방발령 = false;
+ $this->can부대후방발령 = false;
+
+ $this->can부대유저장후방발령 = false;
+ $this->can유저장후방발령 = false;
+ $this->can유저장전방발령 = false;
+ $this->can유저장구출발령 = false;
+ $this->can유저장내정발령 = false;
+
+ $this->canNPC후방발령 = false;
+ $this->canNPC전방발령 = false;
+ $this->canNPC구출발령 = false;
+ $this->canNPC내정발령 = false;
+
+ $this->can유저장긴급포상 = false;
+ $this->can유저장포상 = false;
+ //$this->can유저장몰수 = false;
+
+ $this->canNPC긴급포상 = false;
+ $this->canNPC포상 = false;
+ $this->canNPC몰수 = false;
+
+ $this->can선전포고 = false;
+ $this->can천도 = false;
+ }
}
}
diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index af6c6c3f..d1c7b2bf 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -987,7 +987,7 @@ class General implements iAction{
if(key_exists($generalID, $rawRanks) && count($rawRanks[$generalID]??[]) !== count($rankColumn)){
throw new \RuntimeException('column의 수가 일치하지 않음 : '.$generalID);
}
- $result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID]??null, null, $year, $month, $constructMode > 1);
+ $result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID]??null, null, null, $year, $month, $constructMode > 1);
}
return $result;
@@ -1020,7 +1020,7 @@ class General implements iAction{
}
- $general = new static($rawGeneral, $rawRankValues, null, $year, $month, $constructMode > 1);
+ $general = new static($rawGeneral, $rawRankValues, null, null, $year, $month, $constructMode > 1);
return $general;
}
diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index f5172190..9d6e737c 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -114,8 +114,8 @@ class GeneralAI
$serverPolicy = KVStorage::getStorage($db, 'autorun_nation_policy_0');
$nationPolicy = KVStorage::getStorage($db, "autorun_nation_policy_{$this->nation['nation']}");
- $this->nationPolicy = new AutorunNationPolicy($general, $nationPolicy->getAll(), $serverPolicy->getAll(), $this->nation, $this->env);
- $this->generalPolicy = new AutorunGeneralPolicy($general, $this->env['autorun_user']['options']??[]);
+ $this->nationPolicy = new AutorunNationPolicy($general, $this->env['autorun_user']['options']??[], $nationPolicy->getAll(), $serverPolicy->getAll(), $this->nation, $this->env);
+ $this->generalPolicy = new AutorunGeneralPolicy($general, $this->env['autorun_user']['options']??[], $nationPolicy->getAll(), $serverPolicy->getAll(), $this->nation, $this->env);
$this->nation['aux'] = Json::decode($this->nation['aux']??'{}');
diff --git a/hwe/sammo/SpecialityHelper.php b/hwe/sammo/SpecialityHelper.php
index ab6d005d..c633bb0a 100644
--- a/hwe/sammo/SpecialityHelper.php
+++ b/hwe/sammo/SpecialityHelper.php
@@ -33,7 +33,7 @@ class SpecialityHelper{
if(static::$domesticInv){
if(!key_exists($type, static::$domesticInv)){
- throw new \InvalidArgumentException('올바르지 않은 특기명:',$type);
+ throw new \InvalidArgumentException('올바르지 않은 특기명:'.$type);
}
return static::$domesticInv[$type];
}
@@ -43,6 +43,9 @@ class SpecialityHelper{
$cache[$classObj->getName()] = $className;
}
static::$domesticInv = $cache;
+ if(!key_exists($type, $cache)){
+ throw new \InvalidArgumentException('올바르지 않은 특기명:'.$type);
+ }
return $cache[$type];
}
@@ -53,7 +56,7 @@ class SpecialityHelper{
if(static::$warInv){
if(!key_exists($type, static::$warInv)){
- throw new \InvalidArgumentException('올바르지 않은 특기명:',$type);
+ throw new \InvalidArgumentException('올바르지 않은 특기명:'.$type);
}
return static::$warInv[$type];
}
@@ -62,6 +65,9 @@ class SpecialityHelper{
foreach(static::getSpecialWarList(false) as $className=>$classObj){
$cache[$classObj->getName()] = $className;
}
+ if(!key_exists($type, $cache)){
+ throw new \InvalidArgumentException('올바르지 않은 특기명:'.$type);
+ }
static::$warInv = $cache;
return $cache[$type];
}
diff --git a/hwe/scenario/scenario_1010.json b/hwe/scenario/scenario_1010.json
index 6f59e4be..1a39d070 100644
--- a/hwe/scenario/scenario_1010.json
+++ b/hwe/scenario/scenario_1010.json
@@ -182,7 +182,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 1, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍", "나는 강동의 호랑이 손견이올씨다!"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 0, null, 90, 77, 83, 0, 182, 252, "할거", "수비"],
diff --git a/hwe/scenario/scenario_1020.json b/hwe/scenario/scenario_1020.json
index 4cc5d17c..d6ce37d6 100644
--- a/hwe/scenario/scenario_1020.json
+++ b/hwe/scenario/scenario_1020.json
@@ -315,7 +315,7 @@
[ 128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 10, null, 45, 64, 22, 0, 168, 211, "재간", null],
[ 129, "소비",1165, 0, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", null],
[ 125, "손견",1167, 7, null, 96, 95, 76,12, 156, 192, "왕좌", "무쌍", "강동의 호랑이. 손견 여기 있소!"],
[ 126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[ 125, "손권",1169, 0, null, 90, 77, 83, 0, 182, 252, "할거", "수비"],
diff --git a/hwe/scenario/scenario_1030.json b/hwe/scenario/scenario_1030.json
index 10b6ee0f..331c7feb 100644
--- a/hwe/scenario/scenario_1030.json
+++ b/hwe/scenario/scenario_1030.json
@@ -247,7 +247,7 @@
[ 128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 7, null, 45, 64, 22, 0, 168, 211, "재간", null],
[ 129, "소비",1165, 3, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 12, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 12, null, 42, 33, 73, 0, 165, 215, "대의", null],
[ 125, "손견",1167, 9, null, 96, 95, 76,12, 156, 192, "왕좌", "무쌍"],
[ 126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[ 125, "손권",1169, 0, null, 90, 77, 83, 0, 182, 252, "할거", "수비"],
diff --git a/hwe/scenario/scenario_1040.json b/hwe/scenario/scenario_1040.json
index 19007acf..c343ebcf 100644
--- a/hwe/scenario/scenario_1040.json
+++ b/hwe/scenario/scenario_1040.json
@@ -222,7 +222,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 8, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 4, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 7, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 7, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 3, null, 90, 77, 83, 0, 182, 252, "할거", "수비"],
diff --git a/hwe/scenario/scenario_1050.json b/hwe/scenario/scenario_1050.json
index 0be720fd..ec97e58d 100644
--- a/hwe/scenario/scenario_1050.json
+++ b/hwe/scenario/scenario_1050.json
@@ -202,7 +202,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 6, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 4, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 8, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 8, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83, 0, 182, 252, "할거", "수비"],
diff --git a/hwe/scenario/scenario_1060.json b/hwe/scenario/scenario_1060.json
index 21105369..42a1fed8 100644
--- a/hwe/scenario/scenario_1060.json
+++ b/hwe/scenario/scenario_1060.json
@@ -208,7 +208,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 5, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 3, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 6, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 6, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83,12, 182, 252, "할거", "수비", "지세를 이용해 세력을 굳히자..."],
diff --git a/hwe/scenario/scenario_1070.json b/hwe/scenario/scenario_1070.json
index bf7b8f08..d4aff9e3 100644
--- a/hwe/scenario/scenario_1070.json
+++ b/hwe/scenario/scenario_1070.json
@@ -214,7 +214,7 @@
[128, "설종",1163, 2, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 5, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 2, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 4, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 4, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83,12, 182, 252, "할거", "수비", "선친께서 물려주신 이 땅을 내어줄 수는 없다."],
diff --git a/hwe/scenario/scenario_1080.json b/hwe/scenario/scenario_1080.json
index 68648e9b..8b13861f 100644
--- a/hwe/scenario/scenario_1080.json
+++ b/hwe/scenario/scenario_1080.json
@@ -200,7 +200,7 @@
[128, "설종",1163, 2, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 2, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 3, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 3, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83,12, 182, 252, "할거", "수비", "형주를 얻으려면 어찌 해야 할꼬..."],
diff --git a/hwe/scenario/scenario_1090.json b/hwe/scenario/scenario_1090.json
index a4df9928..3e2fa282 100644
--- a/hwe/scenario/scenario_1090.json
+++ b/hwe/scenario/scenario_1090.json
@@ -193,7 +193,7 @@
[128, "설종",1163, 2, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 2, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83,12, 182, 252, "할거", "수비", "형주를 얻으려면 어찌 해야 할꼬..."],
diff --git a/hwe/scenario/scenario_1100.json b/hwe/scenario/scenario_1100.json
index 45a157af..c6dfc7ec 100644
--- a/hwe/scenario/scenario_1100.json
+++ b/hwe/scenario/scenario_1100.json
@@ -196,7 +196,7 @@
[128, "설종",1163, 2, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83,12, 182, 252, "할거", "수비", "형주를 얻었으니 내실에 힘을 써야겠군..."],
diff --git a/hwe/scenario/scenario_1110.json b/hwe/scenario/scenario_1110.json
index 01fedf0c..dddad2ef 100644
--- a/hwe/scenario/scenario_1110.json
+++ b/hwe/scenario/scenario_1110.json
@@ -194,7 +194,7 @@
[128, "설종",1163, 2, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83,12, 182, 252, "할거", "수비", "형주를 얻으려면 어찌 해야 할꼬..."],
diff --git a/hwe/scenario/scenario_1120.json b/hwe/scenario/scenario_1120.json
index 908d8d91..e6b216c3 100644
--- a/hwe/scenario/scenario_1120.json
+++ b/hwe/scenario/scenario_1120.json
@@ -215,7 +215,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지", null],
[ 69, "성의",1164, 6, null, 45, 64, 22, 0, 168, 211, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 172, 221, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의", null],
[125, "손견",1167, 4, null, 96, 95, 76, 0, 156, 192, "왕좌", "무쌍", "나는 강동의 호랑이 손견이올씨다!"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지", null],
[125, "손권",1169, 0, null, 90, 77, 83, 0, 182, 252, "할거", "수비"],
diff --git a/hwe/scenario/scenario_2010.json b/hwe/scenario/scenario_2010.json
index bac73f8d..fb92a8c1 100644
--- a/hwe/scenario/scenario_2010.json
+++ b/hwe/scenario/scenario_2010.json
@@ -175,7 +175,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 160, 300, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 160, 300, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 160, 300, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 160, 300, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 160, 300, "유지", null],
[125, "손권",1169, 0, null, 90, 77, 83, 0, 160, 300, "할거", "수비"],
diff --git a/hwe/scenario/scenario_2011.json b/hwe/scenario/scenario_2011.json
index a2a109a6..53c6684e 100644
--- a/hwe/scenario/scenario_2011.json
+++ b/hwe/scenario/scenario_2011.json
@@ -181,7 +181,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 160, 300, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 160, 300, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 160, 300, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 160, 300, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 160, 300, "유지", null],
[125, "손권",1169, 0, null, 90, 77, 83, 0, 160, 300, "할거", "수비"],
diff --git a/hwe/scenario/scenario_2012.json b/hwe/scenario/scenario_2012.json
index 2ab93028..31663c9d 100644
--- a/hwe/scenario/scenario_2012.json
+++ b/hwe/scenario/scenario_2012.json
@@ -184,7 +184,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 160, 300, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 160, 300, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 160, 300, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 160, 300, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 160, 300, "유지", null],
[125, "손권",1169, 0, null, 90, 77, 83, 0, 160, 300, "할거", "수비"],
diff --git a/hwe/scenario/scenario_2020.json b/hwe/scenario/scenario_2020.json
index 8280816e..803c2d48 100644
--- a/hwe/scenario/scenario_2020.json
+++ b/hwe/scenario/scenario_2020.json
@@ -184,7 +184,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 160, 300, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 160, 300, "재간", null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 160, 300, "대의", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", null],
[125, "손견",1167, 2, null, 96, 95, 76,12, 160, 300, "왕좌", "무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 160, 300, "유지", null],
[125, "손권",1169, 2, null, 90, 77, 83, 0, 160, 300, "할거", "수비"],
diff --git a/hwe/scenario/scenario_2030.json b/hwe/scenario/scenario_2030.json
index ba3dfa2e..2fbb525a 100644
--- a/hwe/scenario/scenario_2030.json
+++ b/hwe/scenario/scenario_2030.json
@@ -90,7 +90,7 @@
[-150,"하후연묘재", -1, -2, null, 65, 15, 67, 0, 165, 300,"유지","반계", "묘섭 베타서버 운영중입니다. 많이 찾아주세욤~"],
[-150, "환선", -1, -2, null, 60, 76, 24, 0, 165, 300,"패권","돌격", ""],
[-150, "황월영", -1, -2, null, 72, 10, 68, 0, 165, 300,"대의","인덕", ""],
- [-150, "허기", -1, -2, null, 64, 12, 77, 0, 165, 300,"출세","거상", ""],
+ [-150, "허기", -1, -2, null, 64, 12, 77, 0, 165, 300,"출세",null, ""],
[-150, "형왔다", -1, -2, null, 64, 72, 27, 0, 165, 300,"의협","기병", "형왔다~"],
[-150, "헹이", -1, -2, null, 75, 16, 73, 0, 165, 300,"의협","환술", "다 헹궈버리겠다~ ㅇ<-<"],
[-150, "효주곰", -1, -2, null, 54, 32, 77, 0, 165, 300,"유지","경작", "순수한 효주곰이에여 >_<"],
diff --git a/hwe/scenario/scenario_2040.json b/hwe/scenario/scenario_2040.json
index 6a298f87..04cc65c7 100644
--- a/hwe/scenario/scenario_2040.json
+++ b/hwe/scenario/scenario_2040.json
@@ -175,7 +175,7 @@
[128, "설종",1163, 0, null, 27, 33, 67, 0, 187, 243, "유지",null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 168, 211, "재간",null],
[129, "소비",1165, 0, null, 67, 63, 49, 0, 172, 221, "대의",null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의","거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 165, 215, "대의",null],
[125, "손견",1167, 0, null, 96, 95, 76, 0, 156, 192, "왕좌","무쌍"],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 186, 207, "유지",null],
[125, "손권",1169, 0, null, 90, 77, 83, 0, 182, 252, "할거","수비"],
diff --git a/hwe/scenario/scenario_2050.json b/hwe/scenario/scenario_2050.json
index 2d0cd2a4..71b8b359 100644
--- a/hwe/scenario/scenario_2050.json
+++ b/hwe/scenario/scenario_2050.json
@@ -91,7 +91,7 @@
[-150,"하후연묘재", -1, 1, null, 65, 15, 67, 0, 165, 300,"유지","반계", "묘섭 베타서버 운영중입니다. 많이 찾아주세욤~"],
[-150, "환선", -1, 1, null, 60, 76, 24, 0, 165, 300,"패권","돌격", ""],
[-150, "황월영", -1, 1, null, 72, 10, 68, 0, 165, 300,"대의","인덕", ""],
- [-150, "허기", -1, 1, null, 64, 12, 77, 0, 165, 300,"출세","거상", ""],
+ [-150, "허기", -1, 1, null, 64, 12, 77, 0, 165, 300,"출세",null, ""],
[-150, "형왔다", -1, 1, null, 64, 72, 27, 0, 165, 300,"의협","기병", "형왔다~"],
[-150, "헹이", -1, 1, null, 75, 16, 73, 0, 165, 300,"의협","환술", "다 헹궈버리겠다~ ㅇ<-<"],
[-150, "효주곰", -1, 1, null, 54, 32, 77, 0, 165, 300,"유지","경작", "순수한 효주곰이에여 >_<"],
diff --git a/hwe/scenario/scenario_2070.json b/hwe/scenario/scenario_2070.json
index 9173ccb5..73dfdee1 100644
--- a/hwe/scenario/scenario_2070.json
+++ b/hwe/scenario/scenario_2070.json
@@ -80,7 +80,7 @@
[131, "설영",1162, 0, null, 46, 23, 64, 0, 160, 300, "유지", null],
[128, "설종",1163, 0, null, 27, 33, 67, 0, 160, 300, "유지", null],
[ 69, "성의",1164, 0, null, 45, 64, 22, 0, 160, 300, "재간", null],
- [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건",1166, 0, null, 42, 33, 73, 0, 160, 300, "대의", null],
[126, "손광",1168, 0, null, 63, 54, 58, 0, 160, 300, "유지", null],
[126, "손랑",1170, 0, null, 27, 54, 28, 0, 160, 300, "안전", null],
[126, "손등",1171, 0, null, 52, 39, 77, 0, 160, 300, "할거", null],
diff --git a/hwe/scenario/scenario_2100.json b/hwe/scenario/scenario_2100.json
index 5b135bfb..b9bc5dd8 100644
--- a/hwe/scenario/scenario_2100.json
+++ b/hwe/scenario/scenario_2100.json
@@ -179,7 +179,7 @@
[128, "설종", 1163, 0, null, 26, 14, 66, 0, 160, 300, "유지", null],
[ 69, "성의", 1164, 0, null, 38, 64, 10, 0, 160, 300, "재간", null],
[129, "소비", 1165, 0, null, 45, 49, 19, 0, 160, 300, "대의", null],
- [ 76, "손건", 1166, 0, null, 37, 14, 67, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건", 1166, 0, null, 37, 14, 67, 0, 160, 300, "대의", null],
[125, "손견", 1167, 0, null, 55, 69, 28, 0, 160, 300, "왕좌", "무쌍"],
[126, "손광", 1168, 0, null, 44, 21, 46, 0, 160, 300, "유지", null],
[125, "손권", 1169, 0, null, 53, 29, 61, 0, 160, 300, "할거", "수비"],
diff --git a/hwe/scenario/scenario_2101.json b/hwe/scenario/scenario_2101.json
index f2bfdc9e..a136e7c6 100644
--- a/hwe/scenario/scenario_2101.json
+++ b/hwe/scenario/scenario_2101.json
@@ -182,7 +182,7 @@
[128, "설종", 1163, 0, null, 26, 14, 66, 0, 160, 300, "유지", null],
[ 69, "성의", 1164, 0, null, 38, 64, 10, 0, 160, 300, "재간", null],
[129, "소비", 1165, 0, null, 45, 49, 19, 0, 160, 300, "대의", null],
- [ 76, "손건", 1166, 0, null, 37, 14, 67, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건", 1166, 0, null, 37, 14, 67, 0, 160, 300, "대의", null],
[125, "손견", 1167, 0, null, 55, 69, 28, 0, 160, 300, "왕좌", "무쌍"],
[126, "손광", 1168, 0, null, 44, 21, 46, 0, 160, 300, "유지", null],
[125, "손권", 1169, 0, null, 53, 29, 61, 0, 160, 300, "할거", "수비"],
diff --git a/hwe/scenario/scenario_2102.json b/hwe/scenario/scenario_2102.json
index 8257dbe7..16669da0 100644
--- a/hwe/scenario/scenario_2102.json
+++ b/hwe/scenario/scenario_2102.json
@@ -185,7 +185,7 @@
[128, "설종", 1163, 0, null, 26, 14, 66, 0, 160, 300, "유지", null],
[ 69, "성의", 1164, 0, null, 38, 64, 10, 0, 160, 300, "재간", null],
[129, "소비", 1165, 0, null, 45, 49, 19, 0, 160, 300, "대의", null],
- [ 76, "손건", 1166, 0, null, 37, 14, 67, 0, 160, 300, "대의", "거상"],
+ [ 76, "손건", 1166, 0, null, 37, 14, 67, 0, 160, 300, "대의", null],
[125, "손견", 1167, 0, null, 55, 69, 28, 0, 160, 300, "왕좌", "무쌍"],
[126, "손광", 1168, 0, null, 44, 21, 46, 0, 160, 300, "유지", null],
[125, "손권", 1169, 0, null, 53, 29, 61, 0, 160, 300, "할거", "수비"],
diff --git a/hwe/scenario/unit/basic.php b/hwe/scenario/unit/basic.php
index f3a3acfb..e3d00bbb 100644
--- a/hwe/scenario/unit/basic.php
+++ b/hwe/scenario/unit/basic.php
@@ -3,7 +3,7 @@ namespace sammo;
class GameUnitConst extends GameUnitConstBase
{
- const DEFAULT_CREWTYPE = 0;
+ const DEFAULT_CREWTYPE = 1100;
protected static $_buildData = [
[