| … | |
… | |
| 1081 | if (tmp->stats.exp && tmp->type != SKILL) |
1081 | if (tmp->stats.exp && tmp->type != SKILL) |
| 1082 | { |
1082 | { |
| 1083 | if (tmp->stats.exp > 0) |
1083 | if (tmp->stats.exp > 0) |
| 1084 | { |
1084 | { |
| 1085 | added_speed += tmp->stats.exp / 3.f; |
1085 | added_speed += tmp->stats.exp / 3.f; |
| 1086 | bonus_speed += 1.f + tmp->stats.exp / 3.f; |
1086 | bonus_speed += tmp->stats.exp / 3.f + 1.f; |
| 1087 | } |
1087 | } |
| 1088 | else |
1088 | else |
| 1089 | added_speed += tmp->stats.exp; |
1089 | added_speed += tmp->stats.exp; |
| 1090 | } |
1090 | } |
| 1091 | |
1091 | |
| … | |
… | |
| 1121 | } |
1121 | } |
| 1122 | |
1122 | |
| 1123 | if (tmp->stats.wc) |
1123 | if (tmp->stats.wc) |
| 1124 | wc -= (tmp->stats.wc + tmp->magic); |
1124 | wc -= (tmp->stats.wc + tmp->magic); |
| 1125 | |
1125 | |
| 1126 | if (tmp->slaying != NULL) |
1126 | if (tmp->slaying) |
| 1127 | slaying = tmp->slaying; |
1127 | slaying = tmp->slaying; |
| 1128 | |
1128 | |
| 1129 | if (tmp->stats.ac) |
1129 | if (tmp->stats.ac) |
| 1130 | ac -= (tmp->stats.ac + tmp->magic); |
1130 | ac -= (tmp->stats.ac + tmp->magic); |
| 1131 | |
1131 | |
| … | |
… | |
| 1166 | if (tmp->stats.ac) |
1166 | if (tmp->stats.ac) |
| 1167 | ac -= tmp->stats.ac + tmp->magic; |
1167 | ac -= tmp->stats.ac + tmp->magic; |
| 1168 | |
1168 | |
| 1169 | break; |
1169 | break; |
| 1170 | |
1170 | |
| 1171 | case BOW: |
|
|
| 1172 | case WEAPON: |
1171 | case WEAPON: |
| 1173 | wc -= tmp->stats.wc + tmp->magic; |
1172 | wc -= tmp->stats.wc + tmp->magic; |
| 1174 | |
1173 | |
| 1175 | if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) |
1174 | if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) |
| 1176 | ac -= tmp->stats.ac + tmp->magic; |
1175 | ac -= tmp->stats.ac + tmp->magic; |
| 1177 | |
1176 | |
| 1178 | stats.dam += tmp->stats.dam + tmp->magic; |
1177 | stats.dam += tmp->stats.dam + tmp->magic; |
| 1179 | weapon_weight = tmp->weight; |
1178 | weapon_weight = tmp->weight; |
| 1180 | weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; |
1179 | weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; |
| 1181 | |
1180 | |
| 1182 | if (weapon_speed < 0) |
1181 | if (weapon_speed < 0) |
| 1183 | weapon_speed = 0; |
1182 | weapon_speed = 0; |
| 1184 | |
1183 | |
| 1185 | slaying = tmp->slaying; |
1184 | slaying = tmp->slaying; |
