diff --git a/hwe/j_board_article_add.php b/hwe/j_board_article_add.php index 580dc730..96fb6d27 100644 --- a/hwe/j_board_article_add.php +++ b/hwe/j_board_article_add.php @@ -62,7 +62,7 @@ $icon = GetImageURL($me['imgsvr'], $me['picture']); $db->insert('board', [ 'nation_no'=>$me['nation'], 'is_secret'=>$isSecretBoard, - 'date'=>TimeUtil::DatetimeNow(), + 'date'=>TimeUtil::now(), 'general_no'=>$me['no'], 'author'=>$me['name'], 'author_icon'=>$icon, diff --git a/hwe/j_board_comment_add.php b/hwe/j_board_comment_add.php index 9841e819..fbb36eb0 100644 --- a/hwe/j_board_comment_add.php +++ b/hwe/j_board_comment_add.php @@ -68,7 +68,7 @@ else if ($isSecretBoard && $permission < 2) { $db->insert('comment', [ 'nation_no'=>$me['nation'], 'is_secret'=>$isSecretBoard, - 'date'=>TimeUtil::DatetimeNow(), + 'date'=>TimeUtil::now(), 'document_no'=>$articleNo, 'general_no'=>$me['no'], 'author'=>$me['name'], diff --git a/hwe/j_diplomacy_send_letter.php b/hwe/j_diplomacy_send_letter.php index 38eec6c8..7bf4ec32 100644 --- a/hwe/j_diplomacy_send_letter.php +++ b/hwe/j_diplomacy_send_letter.php @@ -140,7 +140,7 @@ $db->insert('ng_diplomacy', [ 'state'=>'proposed', 'text_brief'=>$textBrief, 'text_detail'=>$textDetail, - 'date'=>TimeUtil::DatetimeNow(), + 'date'=>TimeUtil::now(), 'src_signer'=>$me['no'], 'dest_signer'=>null, 'aux'=>Json::encode([ diff --git a/hwe/j_image_upload.php b/hwe/j_image_upload.php index 9eca08bf..7c2e1c3d 100644 --- a/hwe/j_image_upload.php +++ b/hwe/j_image_upload.php @@ -97,7 +97,7 @@ if(!file_exists($dest)){ $storedStatus = $imgStor->$newPicName??[]; $imgKey = "$serverID:$userID"; if(!key_exists($imgKey, $storedStatus)){ - $storedStatus[$imgKey] = TimeUtil::DatetimeNow(); + $storedStatus[$imgKey] = TimeUtil::now(); } $imgStor->$newPicName = $storedStatus; diff --git a/hwe/j_install.php b/hwe/j_install.php index 08e5901b..5b647767 100644 --- a/hwe/j_install.php +++ b/hwe/j_install.php @@ -175,5 +175,5 @@ Json::die(ResetHelper::buildScenario( $show_img_level, $tournament_trig, $join_mode, - TimeUtil::DatetimeNow() + TimeUtil::now() )); \ No newline at end of file diff --git a/hwe/sammo/ActionItem/che_의술_태평청령.php b/hwe/sammo/ActionItem/che_의술_태평청령.php index 6f14bcda..536b1ca9 100644 --- a/hwe/sammo/ActionItem/che_의술_태평청령.php +++ b/hwe/sammo/ActionItem/che_의술_태평청령.php @@ -5,6 +5,9 @@ use \sammo\General; use \sammo\GeneralTrigger; use \sammo\GeneralTriggerCaller; use \sammo\BaseWarUnitTrigger; +use \sammo\WarUnitTriggerCaller; +use sammo\WarUnitTrigger\che_전투치료발동; +use sammo\WarUnitTrigger\che_전투치료시도; class che_의술_태평청령 extends \sammo\BaseItem{ diff --git a/hwe/sammo/ActionSpecialWar/che_돌격.php b/hwe/sammo/ActionSpecialWar/che_돌격.php index 1c74fe7f..103ce05d 100644 --- a/hwe/sammo/ActionSpecialWar/che_돌격.php +++ b/hwe/sammo/ActionSpecialWar/che_돌격.php @@ -5,6 +5,7 @@ use \sammo\General; use \sammo\SpecialityConst; use \sammo\WarUnit; use \sammo\BaseWarUnitTrigger; +use \sammo\WarUnitTriggerCaller; class che_돌격 implements iAction{ use \sammo\DefaultAction; diff --git a/hwe/scenario/scenario_900.json b/hwe/scenario/scenario_900.json index a24fb0de..8745bd1d 100644 --- a/hwe/scenario/scenario_900.json +++ b/hwe/scenario/scenario_900.json @@ -19,14 +19,14 @@ "agri":"70%", "comm":"70%", "secu":"70%", - "rate":80 + "trust":80 }], ["ChangeCity", "occupied", { "pop":"70%", "agri":"70%", "comm":"70%", "secu":"70%", - "rate":80, + "trust":80, "def":"70%", "wall":"70%" }] diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql index 3a157023..0fd91ccb 100644 --- a/hwe/sql/schema.sql +++ b/hwe/sql/schema.sql @@ -483,7 +483,7 @@ create table tournament ( name char(64) default '', w varchar(20) default 'None', b varchar(20) default 'None', - h varchar(20)) default 'None', + h varchar(20) default 'None', ldr int(3) default 0, pwr int(3) default 0, itl int(3) default 0,