Remove checkbox options

Author: dashodanger

modules/debugger.lua

@@ -60,19 +60,19 @@ function DEBUG_CONTROL.setup(self)
 end
 
 function DEBUG_CONTROL.get_levels()
-  if PARAM.custom_error_texture and PARAM.bool_custom_error_texture == 1 then
+  if PARAM.custom_error_texture and PARAM.custom_error_texture == "yes" then
     GAME.MATERIALS._ERROR.t = "ZZWOLF7"
   end
 end
 
 function DEBUG_CONTROL.all_done()
-  --[[if PARAM.attach_debug_info and PARAM.bool_attach_debug_info == 1 then
+  --[[if PARAM.attach_debug_info and PARAM.attach_debug_info == "yes" then
     local log_text = {}
 
     gui.wad_add_text_lump("OBLOGS", log_text)
   end]]
 
-  if PARAM.custom_error_texture and PARAM.bool_custom_error_texture == 1 then
+  if PARAM.custom_error_texture and PARAM.custom_error_texture == "yes" then
     gui.wad_merge_sections("games/doom/data/error_wall.wad")
   end
 end
@@ -111,39 +111,39 @@ OB_MODULES["debugger"] =
     },
 
     {
-      name = "bool_sub_titles",
+      name = "sub_titles",
       label=_("Disable Sub-Titles"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Disable sub-titles on the Title Screen."),
       priority=106,
     },
 
     {
-      name = "bool_whole_names_only",
+      name = "whole_names_only",
       label=_("Whole Name Gen Names Only"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Use only complete names from the Name Generator"),
       longtip = _("Uses name generator names that are already complete phrases/sentences \ninstead of trying to procedurally generate them."),
       priority=101,
     },
 
     {
-      name = "bool_shape_rule_stats",
+      name = "shape_rule_stats",
       label = _("Shape Rule Stats"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Displays usage statistics for shape grammar rules."),
       priority=95,
     },
 
 
     {
-      name = "bool_save_svg",
+      name = "save_svg",
       label = _("Save Map Previews"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Saves SVG format images of generated map thumbnails."),
       priority=94,
       gap = 1,
@@ -182,10 +182,10 @@ OB_MODULES["material_debugger"] =
   options =
   {
     {
-      name = "bool_print_fab_materials",
+      name = "print_fab_materials",
       label=_("Print Fab Materials"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Print list of textures/flats present in each fab"),
       longtip = _("Print the names of all textures/flats preset in a prefab WAD. This will also list values like _FLOOR, _WALL, etc, prior to their conversion."),
       priority=104,
@@ -202,20 +202,20 @@ OB_MODULES["material_debugger"] =
     },
 
     {
-      name = "bool_non_vanilla_as_missing",
+      name = "non_vanilla_as_missing",
       label=_("Check For Non-Vanilla Materials"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Choose what to do when encountering a non-vanilla material"),
       longtip = _("If checked, will compare all flats/textures used against a list of vanilla materials for that IWAD, and treat non-vanilla materials as missing for the purposes of logging and throwing errors."),
       priority=102,
     },
 
     {
-      name = "bool_custom_error_texture",
+      name = "custom_error_texture",
       label = _("Custom Error Texture"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Replaces Obsidian's default texture with a high visibility version for easier detection of broken level geometry or missing textures."),
       priority = 101,
     },
@@ -242,10 +242,10 @@ OB_MODULES["pickup_params"] =
   options =
   {
     {
-      name = "bool_scale_items_with_map_size",
+      name = "scale_items_with_map_size",
       label=_("Alternate Item Quantities"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Scales item distribution with map size"),
       priority=105,
     },

modules/gzdoom_fauna.lua

@@ -338,11 +338,11 @@ function FAUNA_MODULE.end_level(self, LEVEL)
 
   if LEVEL.prebuilt then return end
 
-  if PARAM.bool_flies == 1 then
+  if PARAM.flies == "yes" then
     FAUNA_MODULE.add_flies(LEVEL)
   end
 
-  if PARAM.bool_rats == 1 then
+  if PARAM.rats == "yes" then
     FAUNA_MODULE.add_rats(LEVEL)
   end
 
@@ -465,11 +465,11 @@ end
 
 
 function FAUNA_MODULE.all_done()
-  if PARAM.bool_flies == 1 or PARAM.bool_rats == 1 then
+  if PARAM.flies == "yes" or PARAM.rats == "yes" then
     SCRIPTS.fauna_SNDINFO = FAUNA_MODULE.SNDINFO
   end
 
-  if PARAM.bool_flies == 1 then
+  if PARAM.flies == "yes" then
     SCRIPTS.zscript = ScriptMan_combine_script(SCRIPTS.zscript, FAUNA_MODULE.ZSC)
     SCRIPTS.doomednums = ScriptMan_combine_script(SCRIPTS.doomednums, FAUNA_MODULE.DOOMEDNUMS)
 
@@ -478,7 +478,7 @@ function FAUNA_MODULE.all_done()
     gui.wad_insert_file(dir .. "sounds/FLYBUZZ.ogg", "FLYBUZZ")
   end
 
-  if PARAM.bool_rats == 1 then
+  if PARAM.rats == "yes" then
     SCRIPTS.decorate = ScriptMan_combine_script(SCRIPTS.decorate, FAUNA_MODULE.DEC)
 
     local dir = "games/doom/data/"
@@ -514,18 +514,18 @@ OB_MODULES["fauna_module"] =
   {
 
     {
-      name = "bool_flies",
+      name = "flies",
       label=_("Flies"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Adds flies to maps. \n"),
     },
 
     {
-      name = "bool_rats",
+      name = "rats",
       label=_("Rats"),
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Adds scurrying rats to maps. \n"),
     },
   },

modules/gzdoom_marine_closet.lua

@@ -1349,7 +1349,7 @@ end
 function MARINE_CLOSET_TUNE.calc_closets(self, LEVEL)
   if rand.odds(PARAM.float_m_c_chance)
   and not LEVEL.prebuilt
-  and not (PARAM.bool_m_c_boss == 0 and LEVEL.is_procedural_gotcha) then
+  and not (PARAM.m_c_boss == "no" and LEVEL.is_procedural_gotcha) then
     local rngmin
     local rngmax
 
@@ -1419,7 +1419,7 @@ function MARINE_CLOSET_TUNE.calc_closets(self, LEVEL)
     level_prob = 100,
   }
 
-  if PARAM.bool_m_c_in_secret then
+  if PARAM.m_c_in_secret and PARAM.m_c_in_secret == "yes" then
     info.not_secret = true
   end
 
@@ -1443,7 +1443,7 @@ function MARINE_CLOSET_TUNE.all_done()
 
   local scripty = MARINE_CLOSET_TUNE.TEMPLATES.ZSC
 
-  if PARAM.bool_m_c_power == 1 then
+  if PARAM.m_c_power == "yes" then
     if PARAM.m_c_sprites == "no" then
       scripty = scripty .. MARINE_CLOSET_TUNE.TEMPLATES.MSTRN
     else
@@ -1459,7 +1459,7 @@ function MARINE_CLOSET_TUNE.all_done()
 
   scripty = string.gsub(scripty, "MHEALTH", tostring(PARAM.float_m_c_health))
 
-  if PARAM.bool_m_c_follow == 1 then
+  if PARAM.m_c_follow == "yes" then
     scripty = string.gsub(scripty, "MFOLLOW", "true")
   else
     scripty = string.gsub(scripty, "MFOLLOW", "false")
@@ -1506,13 +1506,13 @@ function MARINE_CLOSET_TUNE.all_done()
     scripty = string.gsub(scripty, "MTRANSDEF", "\"" .. PARAM.m_c_color .. "\"")
   end
 
-  if PARAM.bool_m_c_pdamage == 1 then
+  if PARAM.m_c_pdamage == "yes" then
     scripty = string.gsub(scripty, "MPLAYERDAMAGEX", MARINE_CLOSET_TUNE.TEMPLATES.PLDMG)
   else
     scripty = string.gsub(scripty, "MPLAYERDAMAGEX", "")
   end
 
-  if PARAM.bool_m_c_rip == 1 then
+  if PARAM.m_c_rip == "yes" then
     scripty = string.gsub(scripty, "MDEATHMESSAGEX", MARINE_CLOSET_TUNE.TEMPLATES.DTHMSG)
   else
     scripty = string.gsub(scripty, "MDEATHMESSAGEX", "")
@@ -1739,11 +1739,11 @@ OB_MODULES["gzdoom_marine_closets"] =
 
 
     {
-      name = "bool_m_c_pdamage",
+      name = "m_c_pdamage",
       label = _("Player Damage Immunity"),
       priority = 85,
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("If enabled, marines will never take damage from player owned sources."),
     },
 
@@ -1783,22 +1783,22 @@ OB_MODULES["gzdoom_marine_closets"] =
 
 
     {
-      name = "bool_m_c_power",
+      name = "m_c_power",
       label = _("Strong Marines"),
       priority = 81,
-      valuator = "button",
-      default = 1,
+      choices = YES_NO_CHOICES,
+      default = "yes",
       tooltip = _("Influences whether marines are as accurate and rapid firing as player, or are weaker."),
       randomize_group = "monsters"
     },
 
 
     {
-      name = "bool_m_c_follow",
+      name = "m_c_follow",
       label = _("Followers"),
       priority = 80,
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("By default marines try to follow the player if they have nothing else to do but would otherwise prioritize chasing enemies, and are also unable to follow player through rough terrain.\nIf this is enabled marines will much harder prioritize following player and will teleport if they are too far away."),
     },
 
@@ -1817,31 +1817,31 @@ OB_MODULES["gzdoom_marine_closets"] =
 
 
     {
-      name = "bool_m_c_boss",
+      name = "m_c_boss",
       label = _("Allow in Gotchas"),
       priority = 78,
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("Allows or disallows marine closets to spawn on gotchas and boss generator levels."),
     },
 
 
     {
-      name = "bool_m_c_rip",
+      name = "m_c_rip",
       label = _("Death Messages"),
       priority = 77,
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("If enabled, will print a message in message log whenever a marine dies."),
     },
 
 
     {
-      name = "bool_m_c_in_secret",
+      name = "m_c_in_secret",
       label = _("In Secret Rooms"),
       priority = 76,
-      valuator = "button",
-      default = 0,
+      choices = YES_NO_CHOICES,
+      default = "no",
       tooltip = _("If enabled, allowed marine closets to be built in secret rooms.")
     }
   },