Merge fix

This commit is contained in:
KimLS
2017-04-15 12:18:50 -07:00
15 changed files with 286 additions and 191 deletions
+7 -1
View File
@@ -4293,8 +4293,14 @@ bool Merc::CheckConfidence() {
CurrentCon = this->GetLevelCon(mob->GetLevel());
switch(CurrentCon) {
case CON_GREEN: {
case CON_GRAY: {
ConRating = 0;
break;
}
case CON_GREEN: {
ConRating = 0.1;
break;
}