devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

season merge

Browse Source
This commit is contained in:
Hide_D
2019-10-04 11:44:03 +09:00
parent 107f28ca93 b180fa901d
commit 42eb107ecb
24 changed files with 85 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/ActionItem/che_사기_두강주.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_사기_의적주 extends \sammo\BaseItem{
protected static $id = 15;
protected static $name = '두강주(사기)';
protected static $info = '[전투] 사기 보정 +5';
protected static $info = '[전투] 사기 보정 +10';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusAtmos'){
return $value + 5;
return $value + 10;
}
return $value;
}
hwe/sammo/ActionItem/che_사기_보령압주.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_사기_보령압주 extends \sammo\BaseItem{
protected static $id = 16;
protected static $name = '보령압주(사기)';
protected static $info = '[전투] 사기 보정 +5';
protected static $info = '[전투] 사기 보정 +10';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusAtmos'){
return $value + 5;
return $value + 10;
}
return $value;
}
hwe/sammo/ActionItem/che_사기_의적주.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_사기_의적주 extends \sammo\BaseItem{
protected static $id = 14;
protected static $name = '의적주(사기)';
protected static $info = '[전투] 사기 보정 +5';
protected static $info = '[전투] 사기 보정 +10';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusAtmos'){
return $value + 5;
return $value + 10;
}
return $value;
}
hwe/sammo/ActionItem/che_사기_초선화.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_사기_초선화 extends \sammo\BaseItem{
protected static $id = 20;
protected static $name = '초선화(사기)';
protected static $info = '[전투] 사기 보정 +7';
protected static $info = '[전투] 사기 보정 +14';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusAtmos'){
return $value + 7;
return $value + 14;
}
return $value;
}
hwe/sammo/ActionItem/che_사기_춘화첩.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_사기_춘화첩 extends \sammo\BaseItem{
protected static $id = 19;
protected static $name = '춘화첩(사기)';
protected static $info = '[전투] 사기 보정 +7';
protected static $info = '[전투] 사기 보정 +14';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusAtmos'){
return $value + 7;
return $value + 14;
}
return $value;
}
hwe/sammo/ActionItem/che_사기_탁주.php
+2 -2
View File
@@ -8,7 +8,7 @@ class che_사기_탁주 extends \sammo\BaseItem{
protected static $id = 3;
protected static $name = '탁주(사기)';
protected static $info = '[전투] 사기 +3. 1회용';
protected static $info = '[전투] 사기 +6. 1회용';
protected static $cost = 1000;
protected static $consumable = true;
protected static $buyable = true;
@@ -16,7 +16,7 @@ class che_사기_탁주 extends \sammo\BaseItem{
public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
return new WarUnitTriggerCaller(
new 능력치변경($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 'atmos', '+', 3)
new 능력치변경($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 'atmos', '+', 6)
);
}
}
hwe/sammo/ActionItem/che_훈련_과실주.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_훈련_과실주 extends \sammo\BaseItem{
protected static $id = 12;
protected static $name = '과실주(훈련)';
protected static $info = '[전투] 훈련 보정 +5';
protected static $info = '[전투] 훈련 보정 +10';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusTrain'){
return $value + 5;
return $value + 10;
}
return $value;
}
hwe/sammo/ActionItem/che_훈련_단결도.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_훈련_단결도 extends \sammo\BaseItem{
protected static $id = 18;
protected static $name = '단결도(훈련)';
protected static $info = '[전투] 훈련 보정 +7';
protected static $info = '[전투] 훈련 보정 +14';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusTrain'){
return $value + 7;
return $value + 14;
}
return $value;
}
hwe/sammo/ActionItem/che_훈련_이강주.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_훈련_이강주 extends \sammo\BaseItem{
protected static $id = 13;
protected static $name = '이강주(훈련)';
protected static $info = '[전투] 훈련 보정 +5';
protected static $info = '[전투] 훈련 보정 +10';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusTrain'){
return $value + 5;
return $value + 10;
}
return $value;
}
hwe/sammo/ActionItem/che_훈련_철벽서.php
+2 -2
View File
@@ -7,13 +7,13 @@ class che_훈련_철벽서 extends \sammo\BaseItem{
protected static $id = 17;
protected static $name = '철벽서(훈련)';
protected static $info = '[전투] 훈련 보정 +7';
protected static $info = '[전투] 훈련 보정 +14';
protected static $cost = 200;
protected static $consumable = false;
public function onCalcStat(General $general, string $statName, $value, $aux=null){
if($statName === 'bonusTrain'){
return $value + 7;
return $value + 14;
}
return $value;
}
hwe/sammo/ActionItem/che_훈련_청주.php
+2 -2
View File
@@ -8,7 +8,7 @@ class che_훈련_청주 extends \sammo\BaseItem{
protected static $id = 4;
protected static $name = '청주(훈련)';
protected static $info = '[전투] 훈련 +3. 1회용';
protected static $info = '[전투] 훈련 +6. 1회용';
protected static $cost = 1000;
protected static $consumable = true;
protected static $buyable = true;
@@ -16,7 +16,7 @@ class che_훈련_청주 extends \sammo\BaseItem{
public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
return new WarUnitTriggerCaller(
new 능력치변경($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 'train', '+', 3)
new 능력치변경($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 'train', '+', 6)
);
}
}
hwe/sammo/General.php
+2 -2
View File
@@ -277,7 +277,7 @@ class General implements iAction{
$db->delete('troop', 'troop_leader=%i', $troopLeaderID);
}
$dyingMessage = new TextDecoration\DyingMessage($this->getName(), $this->getVar('npc'));
$dyingMessage = new TextDecoration\DyingMessage($this);
$logger->pushGlobalActionLog($dyingMessage->getText());
$db->delete('general', 'no=%i', $generalID);
@@ -563,7 +563,7 @@ class General implements iAction{
'no', 'name', 'name2', 'picture', 'imgsvr', 'nation', 'nations', 'city', 'troop', 'injury', 'affinity',
'leader', 'leader2', 'power', 'power2', 'intel', 'intel2', 'weap', 'book', 'horse', 'item',
'experience', 'dedication', 'level', 'gold', 'rice', 'crew', 'crewtype', 'train', 'atmos', 'turntime',
'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'belong',
'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'startage', 'belong',
'personal', 'special', 'special2', 'mode', 'npc', 'npc_org', 'deadyear', 'npcmsg',
'dex0', 'dex10', 'dex20', 'dex30', 'dex40',
'warnum', 'killnum', 'deathnum', 'killcrew', 'deathcrew', 'recwar', 'last_turn', 'myset'
hwe/sammo/ResetHelper.php
+3 -1
View File
@@ -96,7 +96,7 @@ class ResetHelper{
$servRoot.'/d_setting/UniqueConst.php',[
'serverID'=>$serverID,
'serverName'=>AppConf::getList()[$prefix]->getKorName(),
'seasonIdx'=>$seasonIdx
'seasonIdx'=>$seasonIdx,
], true
);
@@ -235,6 +235,7 @@ class ResetHelper{
'init_year'=> $year,
'init_month'=>$month,
'map_theme' => $scenarioObj->getMapTheme(),
'season'=>$seasonIdx,
'msg'=>'공지사항',//TODO:공지사항
'maxgeneral'=>GameConst::$defaultMaxGeneral,
'maxnation'=>GameConst::$defaultMaxNation,
@@ -256,6 +257,7 @@ class ResetHelper{
'tnmt_trig'=>$tournament_trig,
'prev_winner'=>$prevWinner,
'tournament'=>0,
'server_cnt'=>$db->queryFirstField('SELECT count(*) FROM ng_games')
];
foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
hwe/sammo/TextDecoration/DyingMessage.php
+14 -18
View File
@@ -7,6 +7,7 @@ use \sammo\JosaUtil;
class DyingMessage{
private $name;
private $realName;
private $npc;
static protected $defaultMessage = '<Y>:name:</>:이: <R>사망</>했습니다.';
@@ -88,31 +89,21 @@ class DyingMessage{
static::$utilNPCMessages = static::getUtilNPCMessageList();
}
protected function _constructWithObj(General $general){
$this->name = $general->getName();
$this->npc = $general->getVar('npc');
}
protected function _constructWithRawValue(string $name, int $npc){
$this->name = $name;
$this->npc = $npc;
}
function __construct($name, ?int $npc = null)
function __construct(General $general)
{
if(static::$messages === null){
static::initMessageList();
}
if($name instanceof General){
$this->_constructWithObj($name);
}
else{
$this->_constructWithRawValue($name, $npc);
$this->general = $general;
$this->name = $general->getName();
$this->npc = $general->getVar('npc');
if($general['owner'] > 0 && $general->getVar('startage') - $general->getVar('age') > 1){
$this->realName = $general->getVar('name2');
}
}
public function getText():string{
$name = $this->name ;
$name = $this->name;
$npc = $this->npc;
if($npc == 0){
@@ -128,7 +119,12 @@ class DyingMessage{
$text = static::$defaultMessage;
}
$text = str_replace(':name:', $name, $text);
if($this->realName){
$text = str_replace(':name:', $name."({$this->realName})", $text);
}
else{
$text = str_replace(':name:', $name, $text);
}
JosaUtil::batch($text, $name);
return $text;