From c1751d3d318d7ab898bb5c9d5992f2b56039e8c7 Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 3 May 2019 21:47:49 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8F=84=EC=8B=9C=20=EB=82=B4=EC=A0=95?= =?UTF-8?q?=EC=9D=B4=20=EA=B3=A0=EC=A0=95=EC=B9=98=EB=A1=9C=20=EC=83=81?= =?UTF-8?q?=EC=8A=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_gamerule.php | 28 ++++++++++++++-------------- hwe/sammo/CityConstBase.php | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 722cc7ac..14423eb4 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -384,43 +384,43 @@ function preUpdateMonthly() { //농지, 상업 if(in_array($nationType, [2, 12])){ - $agriOffset = 0.011; + $agriOffset = 1.1; } else if(in_array($nationType, [8, 11])){ - $agriOffset = 0.009; + $agriOffset = 0.9; } else{ - $agriOffset = 0.01; + $agriOffset = 1; } - $setValues['agri'] = $db->sqleval('if(agri > agri2, GREATEST(agri2, agri*0.99), LEAST(agri2, agri + agri2*%d))', $agriOffset); - $setValues['comm'] = $db->sqleval('if(comm > comm2, GREATEST(comm2, comm*0.99), LEAST(comm2, comm + comm2*%d))', $agriOffset); + $setValues['agri'] = $db->sqleval('if(agri > agri2, GREATEST(agri2, agri*0.99), LEAST(agri2, agri + 80*%d))', $agriOffset); + $setValues['comm'] = $db->sqleval('if(comm > comm2, GREATEST(comm2, comm*0.99), LEAST(comm2, comm + 80*%d))', $agriOffset); //치안 if(in_array($nationType, [1, 4])){ - $secuOffset = 0.011; + $secuOffset = 1.1; } else if(in_array($nationType, [6, 9])){ - $secuOffset = 0.009; + $secuOffset = 0.9; } else{ - $secuOffset = 0.01; + $secuOffset = 1; } - $setValues['secu'] = $db->sqleval('if(secu > secu2, GREATEST(secu2, secu*0.99), LEAST(secu2, secu + secu2*%d))', $secuOffset); + $setValues['secu'] = $db->sqleval('if(secu > secu2, GREATEST(secu2, secu*0.99), LEAST(secu2, secu + 60*%d))', $secuOffset); //수비, 성벽 if(in_array($nationType, [3, 5, 10, 11])){ - $defOffset = 0.011; + $defOffset = 1.1; } else if(in_array($nationType, [4, 7, 8, 13])){ - $defOffset = 0.009; + $defOffset = 0.9; } else{ - $defOffset = 0.01; + $defOffset = 1; } - $setValues['def'] = $db->sqleval('if(def > def2, GREATEST(def2, def*0.99), LEAST(def2, def + def2*%d))', $defOffset); - $setValues['wall'] = $db->sqleval('if(wall > wall2, GREATEST(wall2, wall*0.99), LEAST(wall2, wall + wall2*%d))', $defOffset); + $setValues['def'] = $db->sqleval('if(def > def2, GREATEST(def2, def*0.99), LEAST(def2, def + 80*%d))', $defOffset); + $setValues['wall'] = $db->sqleval('if(wall > wall2, GREATEST(wall2, wall*0.99), LEAST(wall2, wall + 80*%d))', $defOffset); $db->update('city', $setValues, 'nation = %i AND supply = 1', $nationID); } diff --git a/hwe/sammo/CityConstBase.php b/hwe/sammo/CityConstBase.php index b4cb49ce..d86d1bdb 100644 --- a/hwe/sammo/CityConstBase.php +++ b/hwe/sammo/CityConstBase.php @@ -70,7 +70,7 @@ class CityConstBase{ [11, '수춘', '대', 5143, 99, 96, 80, 99, 95, '중원', 395, 270, ['서주', '여남', '초', '합비']], [12, '서주', '대', 4853,101, 98, 80,102, 97, '중원', 440, 250, ['수춘', '하비', '초', '패']], [13, '강릉', '대', 4850,105, 96, 80, 95, 96, '초', 245, 335, ['장사', '무릉', '이릉', '장판']], - [14, '장사', '대', 4710, 97, 99, 80,100,105, '초', 255, 375, ['강릉', '시상', '계양', '무릉']], + [14, '장사', '대', 4710, 97, 99, 80,100,105, '초', 255, 375, ['강릉', '시상', '계양', '무릉', '영릉']], [15, '시상', '대', 5252, 98,100,100, 99, 96, '오월', 360, 360, ['장사', '여강', '고창', '적벽', '파양']], [16, '위례', '대', 4926,100, 93, 80, 98,103, '동이', 620, 145, ['평양', '사비', '계림', '안평', '동황']], [17, '계', '중', 3885, 75, 80, 60, 78, 81, '하북', 365, 35, ['진양', '역경']], @@ -110,7 +110,7 @@ class CityConstBase{ [51, '신야', '소', 2786, 60, 62, 40, 58, 55, '초', 250, 260, ['양양', '완', '상용']], [52, '강하', '소', 3074, 55, 56, 40, 57, 60, '초', 315, 295, ['장판', '적벽']], [53, '무릉', '소', 3196, 58, 63, 40, 63, 58, '초', 195, 355, ['강릉', '장사', '영릉']], - [54, '영릉', '소', 2849, 62, 58, 40, 62, 62, '초', 190, 395, ['계양', '남영', '무릉']], + [54, '영릉', '소', 2849, 62, 58, 40, 62, 62, '초', 190, 395, ['계양', '남영', '무릉', '장사']], [55, '상동', '소', 2767, 58, 59, 40, 62, 58, '초', 210, 435, ['남해', '계양', '고창']], [56, '여강', '소', 2905, 56, 58, 40, 60, 55, '오월', 380, 315, ['시상', '합비', '적벽', '파양']], [57, '회계', '소', 3005, 64, 59, 40, 62, 64, '오월', 480, 395, ['오', '산월']],