Merge branch 'devel' into sars

This commit is contained in:
2018-03-14 10:39:54 -07:00
16 changed files with 272 additions and 122 deletions
+12 -6
View File
@@ -301,11 +301,11 @@ function processWar($connect, $general, $city) {
}
}
} elseif($general[crewtype] == 40) { // 정란
$cityCrew = $cityCrew * 1.5;
$cityCrew = $cityCrew * 1.8;
} elseif($general[crewtype] == 41) { // 충차
$cityCrew = $cityCrew * 2.0;
$cityCrew = $cityCrew * 2.4;
} elseif($general[crewtype] == 42) { // 벽력거
$cityCrew = $cityCrew * 1.5;
$cityCrew = $cityCrew * 1.8;
}
//군주 공격 보정 10%
if($general[level] == 12) {
@@ -345,13 +345,14 @@ function processWar($connect, $general, $city) {
//회피
$ratio = rand() % 100; // 0 ~ 99
$ratio2 = getRate($game, $general[crewtype], "avd"); //회피율
$ratio2 = round($ratio2 * $general['train'] / 100); //훈련 반영
//특기보정 : 궁병
if($general[special2] == 51) { $ratio2 += 20; }
//도구 보정 : 둔갑천서, 태평요술
if($general[item] == 26 || $general[item] == 25) { $ratio2 += 20; }
if($ratio < $ratio2 && $avoid == 1) {
$batlog[count($batlog)] = "<C>●</><C>회피</>했다!</>";
$myCrew /= 10; // 10%만 소모
$myCrew /= 5; // 20%만 소모
$avoid = 0;
}
@@ -1124,6 +1125,7 @@ function processWar($connect, $general, $city) {
//회피
$ratio = rand() % 100; // 0 ~ 99
$ratio2 = getRate($game, $general[crewtype], "avd"); //회피율
$ratio2 = round($ratio2 * $general['train'] / 100); //훈련 반영
//특기보정 : 돌격, 궁병
if($oppose[special2] == 60) { $ratio2 -= 100; }
if($general[special2] == 51) { $ratio2 += 20; }
@@ -1139,13 +1141,14 @@ function processWar($connect, $general, $city) {
} else {
$batlog[count($batlog)] = "<C>●</><C>회피</>했다!</>";
$oppbatlog[count($oppbatlog)] = "<C>●</>상대가 <R>회피</>했다!</>";
$myCrew /= 10; // 10%만 소모
$myCrew /= 5; // 20%만 소모
$myAvoid = 0;
}
}
//회피
$ratio = rand() % 100; // 0 ~ 99
$ratio2 = getRate($game, $oppose[crewtype], "avd"); //회피율
$ratio2 = round($ratio2 * $oppose['train'] / 100); //훈련 반영
// 특기보정 : 돌격, 궁병
if($general[special2] == 60) { $ratio2 -= 100; }
if($oppose[special2] == 51) { $ratio2 += 20; }
@@ -1167,7 +1170,7 @@ function processWar($connect, $general, $city) {
} else {
$oppbatlog[count($oppbatlog)] = "<C>●</><C>회피</>했다!</>";
$batlog[count($batlog)] = "<C>●</>상대가 <R>회피</>했다!</>";
$opCrew /= 10; // 10%만 소모
$opCrew /= 5; // 20%만 소모
$opAvoid = 0;
}
}
@@ -1497,6 +1500,9 @@ function CriticalRatio3($general) {
if ($crewtype >= 3) {
$ratio /= 2;
}
else{
$ratio *= 0.7;
}
$ratio = round($ratio);
$ratio += 5;