diff --git a/code/modules/buildmode/submodes/boom.dm b/code/modules/buildmode/submodes/boom.dm index 7ce33b1adf8..229114d024a 100644 --- a/code/modules/buildmode/submodes/boom.dm +++ b/code/modules/buildmode/submodes/boom.dm @@ -1,11 +1,19 @@ +#define BOOM_DEVASTATION "devastation" +#define BOOM_HEAVY "heavy" +#define BOOM_LIGHT "light" +#define BOOM_FLASH "flash" +#define BOOM_FLAMES "flames" + /datum/buildmode_mode/boom key = "boom" - var/devastation = -1 - var/heavy = -1 - var/light = -1 - var/flash = -1 - var/flames = -1 + var/list/explosions = list( + BOOM_DEVASTATION = 0, + BOOM_HEAVY = 0, + BOOM_LIGHT = 0, + BOOM_FLASH = 0, + BOOM_FLAMES = 0 + ) /datum/buildmode_mode/boom/show_help(client/c) to_chat(c, span_notice("***********************************************************")) @@ -14,25 +22,28 @@ to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/boom/change_settings(client/c) - devastation = input(c, "Range of total devastation. -1 to none", text("Input")) as num|null - if(devastation == null) - devastation = -1 - heavy = input(c, "Range of heavy impact. -1 to none", text("Input")) as num|null - if(heavy == null) - heavy = -1 - light = input(c, "Range of light impact. -1 to none", text("Input")) as num|null - if(light == null) - light = -1 - flash = input(c, "Range of flash. -1 to none", text("Input")) as num|null - if(flash == null) - flash = -1 - flames = input(c, "Range of flames. -1 to none", text("Input")) as num|null - if(flames == null) - flames = -1 + for (var/explosion_level in explosions) + explosions[explosion_level] = input(c, "Range of total [explosion_level]. 0 to none", text("Input")) as num|null + if(explosions[explosion_level] == null || explosions[explosion_level] < 0) + explosions[explosion_level] = 0 /datum/buildmode_mode/boom/handle_click(client/c, params, obj/object) var/list/modifiers = params2list(params) + var/value_valid = FALSE + for (var/explosion_type in explosions) + if (explosions[explosion_type] > 0) + value_valid = TRUE + break + if (!value_valid) + return + if(LAZYACCESS(modifiers, LEFT_CLICK)) - explosion(object, devastation, heavy, light, flames, flash, adminlog = FALSE, ignorecap = TRUE) - log_admin("Build Mode: [key_name(c)] caused an explosion(dev=[devastation], hvy=[heavy], lgt=[light], flash=[flash], flames=[flames]) at [AREACOORD(object)]") + log_admin("Build Mode: [key_name(c)] caused an explosion(dev=[explosions[BOOM_DEVASTATION]], hvy=[explosions[BOOM_HEAVY]], lgt=[explosions[BOOM_LIGHT]], flash=[explosions[BOOM_FLASH]], flames=[explosions[BOOM_FLAMES]]) at [AREACOORD(object)]") + explosion(object, explosions[BOOM_DEVASTATION], explosions[BOOM_HEAVY], explosions[BOOM_LIGHT], explosions[BOOM_FLASH], explosions[BOOM_FLAMES], adminlog = FALSE, ignorecap = TRUE) + +#undef BOOM_DEVASTATION +#undef BOOM_HEAVY +#undef BOOM_LIGHT +#undef BOOM_FLASH +#undef BOOM_FLAMES