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

v0.8 업데이트 #116

Closed
Hide_D wants to merge 209 commits from custom_map into devel
pull from: custom_map
merge into: :devel
Conversation 0 Commits 209 Files Changed 742
+2 -4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bed4b87a54 - Show all commits
hwe/func_npc.php
+2 -4
View File
@@ -994,9 +994,7 @@ function NPCStaffWork($general, $nation, $dipState){
foreach ($npcCivilGeneralsID as $id){
$avgNpcCivilRes += $nationGenerals[$id][$resName];
}
if($npcCivilGeneralsID){
$avgNpcCivilRes /= max(1, count($npcCivilGeneralsID));
}
$avgNpcCivilRes /= max(1, count($npcCivilGeneralsID));
@@ -1063,7 +1061,7 @@ function NPCStaffWork($general, $nation, $dipState){
if($compNpcWar && $compNpcWar[$resName] < 21000){
$amount = min(100, intdiv(($nation[$resName]-($resName=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 5000)*10 + 10);
$commandList[EncodeCommand($resType, $compNpcWar['no'], $amount, 23)] = 2;
$commandList[EncodeCommand($resType, $compNpcWar['no'], $amount, 23)] = 3;
}
if($compNpcCivil && $compNpcCivil[$resName] < $minRes){
$amount = intdiv($minRes+99, 100);