変愚蛮怒のメインリポジトリです
Revision | 8b9d9005188c5d45f73e578ab1dc6ffae4cfcb59 (tree) |
---|---|
Zeit | 2019-01-18 21:28:28 |
Autor | Deskull <deskull@user...> |
Commiter | Deskull |
[Refactor] #37353 staff_effect()整理。 / Refactor staff_effect().
@@ -213,26 +213,25 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo | ||
213 | 213 | |
214 | 214 | case SV_STAFF_PROBING: |
215 | 215 | { |
216 | - probing(); | |
217 | - ident = TRUE; | |
216 | + ident = probing(); | |
218 | 217 | break; |
219 | 218 | } |
220 | 219 | |
221 | 220 | case SV_STAFF_DISPEL_EVIL: |
222 | 221 | { |
223 | - if (dispel_evil(powerful ? 120 : 80)) ident = TRUE; | |
222 | + ident = dispel_evil(powerful ? 120 : 80); | |
224 | 223 | break; |
225 | 224 | } |
226 | 225 | |
227 | 226 | case SV_STAFF_POWER: |
228 | 227 | { |
229 | - if (dispel_monsters(powerful ? 225 : 150)) ident = TRUE; | |
228 | + ident = dispel_monsters(powerful ? 225 : 150) ; | |
230 | 229 | break; |
231 | 230 | } |
232 | 231 | |
233 | 232 | case SV_STAFF_HOLINESS: |
234 | 233 | { |
235 | - if (cleansing_nova(p_ptr, magic, powerful)) ident = TRUE; | |
234 | + ident = cleansing_nova(p_ptr, magic, powerful); | |
236 | 235 | break; |
237 | 236 | } |
238 | 237 |
@@ -254,17 +253,13 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo | ||
254 | 253 | |
255 | 254 | case SV_STAFF_DESTRUCTION: |
256 | 255 | { |
257 | - if (destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE)) | |
258 | - ident = TRUE; | |
259 | - | |
256 | + ident = destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE); | |
260 | 257 | break; |
261 | 258 | } |
262 | 259 | |
263 | 260 | case SV_STAFF_ANIMATE_DEAD: |
264 | 261 | { |
265 | - if (animate_dead(0, p_ptr->y, p_ptr->x)) | |
266 | - ident = TRUE; | |
267 | - | |
262 | + ident = animate_dead(0, p_ptr->y, p_ptr->x); | |
268 | 263 | break; |
269 | 264 | } |
270 | 265 |