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

상성 가상인 경우 상성이 리셋되지 않는 버그 해결

Browse Source
This commit is contained in:
Hide_D
2018-04-28 01:08:54 +09:00
parent c86ac7d20f
commit 161836a233
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Scenario/NPC.php
+6 -1
View File
@@ -70,6 +70,11 @@ class NPC{
$nationID = 0; $nationID = 0;
}; };
$affinity = $this->affinity;
if(Util::array_get($env['fiction'],false) || $affinity === 0){
$affinity = mt_rand(1, 150);
}
$year = $env['year']; $year = $env['year'];
$month = $env['month']; $month = $env['month'];
$age = $year - $this->birth; $age = $year - $this->birth;
@@ -137,7 +142,7 @@ class NPC{
'npcid'=>$npcID, 'npcid'=>$npcID,
'npc'=>2, 'npc'=>2,
'npc_org'=>2, 'npc_org'=>2,
'affinity'=>$this->affinity, 'affinity'=>$affinity,
'name'=>$name, 'name'=>$name,
'picture'=>$picture, 'picture'=>$picture,
'nation'=>$nationID, 'nation'=>$nationID,
hwe/scenario/scenario_30.json
+1 -1
View File
@@ -124,7 +124,7 @@
[54, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, "패권", null], [54, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, "패권", null],
[67, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, "할거", null], [67, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, "할거", null],
[69, "김광현", -1, 0, null, 84, 90, 86, 0, 160, 300, "정복", null, "제가 현진이형보단 낫죠"], [69, "김광현", -1, 0, null, 84, 90, 86, 0, 160, 300, "정복", null, "제가 현진이형보단 낫죠"],
[0, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, "정복", null], [150, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, "정복", null],
[94, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, "의협", null], [94, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, "의협", null],
[101, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, "대의", null], [101, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, "대의", null],
[73, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, "출세", null], [73, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, "출세", null],