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

v0.7.3까지 반영 #114

Closed
Hide_D wants to merge 310 commits from devel into master
pull from: devel
merge into: :master
Conversation 0 Commits 310 Files Changed 764
+2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6031ec2578 - Show all commits
hwe/func_npc.php
+2 -2
View File
@@ -1031,8 +1031,8 @@ function NPCStaffWork($general, $nation, $dipState){
if((($isWarUser || $resName == 'gold') && $compUser[$resName] < 21000) || ($compUser[$resName] < 5000)){
if($work){
$amount = min(100, intdiv(($nation[$resName]-($resName=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 2000)*10 + 10);
$commandList[EncodeCommand($resType, $userGeneralsID[0], $amount, 23)] = 40; // 금,쌀 1000단위 포상
$amount = min(100, intdiv(($nation[$resName]-($resName=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 3000)*10 + 10);
$commandList[EncodeCommand($resType, $userGeneralsID[0], $amount, 23)] = 10; // 금,쌀 1000단위 포상
}
else{
$amount = min(100, intdiv(($nation[$resName]-($resName=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 5000)*10 + 10);