destroy luminance of 0

Co-Authored-By: Anton Simakov <[email protected]>
CleverRaven · Apr 13, 2024 · 45cbecf · 45cbecf
1 parent 36578d7
commit 45cbecf
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 45 deletions.
diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json
@@ -63,7 +63,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 1,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
@@ -94,7 +93,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 2,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
@@ -126,7 +124,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 2,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
@@ -158,7 +155,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ],
@@ -190,7 +186,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
@@ -222,7 +217,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 1,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "luminance": 0,
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
     "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s is smashed to non-recognizable pieces." },
     "flags": [ "SEES", "SMELLS", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE" ]
@@ -959,7 +953,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "shellfish",
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
     "dissect": "dissect_crustacean_single",
@@ -999,7 +992,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
     "harvest": "fish_small",
     "families": [ "prof_intro_biology", "prof_physiology" ],
@@ -1160,7 +1152,6 @@
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "dodge": 5,
-    "luminance": 0,
     "harvest": "mutant_fish",
     "families": [ "prof_intro_biology", "prof_physiology" ],
     "dissect": "dissect_fish_sample_small",

diff --git a/data/json/monsters/mollusk.json b/data/json/monsters/mollusk.json
@@ -20,7 +20,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
     "harvest": "mollusk",
     "dissect": "dissect_gastropod_sample_single",
@@ -49,7 +48,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
     "harvest": "mutant_mollusk",
     "dissect": "dissect_gastropod_sample_single",
@@ -148,7 +146,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_bug" ],
     "stomach_size": 100,
     "special_attacks": [ [ "BROWSE", 130 ], [ "EAT_CROP", 130 ] ],

diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json
@@ -1916,7 +1916,6 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
     "dodge": 5,
     "armor": { "bash": 0, "cut": 2, "bullet": 0 },
-    "luminance": 0,
     "families": [ "prof_wp_netherium_abomination" ],
     "weakpoint_sets": [ "wps_netherium_abomination" ],
     "harvest": "fish_small",

diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json
@@ -23,7 +23,6 @@
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 8 } ],
     "dodge": 5,
-    "luminance": 0,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
     "harvest": "zombie_leather",
     "flags": [
@@ -65,7 +64,6 @@
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 12 } ],
     "dodge": 3,
-    "luminance": 0,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
     "harvest": "zombie_leather",
     "flags": [

diff --git a/data/mods/Aftershock/mobs/aliens.json b/data/mods/Aftershock/mobs/aliens.json
@@ -257,7 +257,6 @@
     "melee_dice_sides": 8,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "dodge": 2,
-    "luminance": 0,
     "hp": 60,
     "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, { "type": "bite", "cooldown": 10 } ],
     "description": "A tall bird with two long, muscular legs, a long neck, and a long sharp beak.",

diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json
@@ -650,7 +650,6 @@
     "melee_dice_sides": 1,
     "melee_damage": [ { "damage_type": "cut", "amount": 15 } ],
     "dodge": 8,
-    "luminance": 0,
     "vision_day": 14,
     "vision_night": 14,
     "special_attacks": [ { "type": "leap", "cooldown": 3, "max_range": 2, "allow_no_target": true }, { "id": "cut_throat" } ],
@@ -680,7 +679,6 @@
     "melee_dice_sides": 0,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
     "dodge": 0,
-    "luminance": 0,
     "vision_day": 45,
     "vision_night": 6,
     "special_attacks": [ { "type": "spell", "spell_data": { "id": "shambling_aoe", "min_level": 0 }, "cooldown": 1 } ],

diff --git a/data/mods/Megafauna/monsters/mf_predators.json b/data/mods/Megafauna/monsters/mf_predators.json
@@ -332,7 +332,6 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 6.0 } ],
     "grab_strength": 5,
     "dodge": 3,
-    "luminance": 0,
     "hp": 150,
     "special_attacks": [
       { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true },

diff --git a/data/mods/TropiCataclysm/monsters/tropical_fish.json b/data/mods/TropiCataclysm/monsters/tropical_fish.json
@@ -20,7 +20,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "shellfish",
     "dissect": "dissect_gastropod_sample_single",
     "reproduction": { "baby_monster": "mon_crab_manca", "baby_count": 1, "baby_timer": 21 },
@@ -81,7 +80,6 @@
     "melee_dice_sides": 5,
     "melee_damage": [ { "damage_type": "cut", "amount": 7 } ],
     "dodge": 4,
-    "luminance": 0,
     "harvest": "fish_large",
     "zombify_into": "mon_zhark",
     "reproduction": { "baby_monster": "mon_shark_pup", "baby_count": 8, "baby_timer": 364 },
@@ -286,7 +284,6 @@
     "anger_triggers": [ "HURT", "PLAYER_CLOSE" ],
     "fear_triggers": [ "PLAYER_CLOSE" ],
     "placate_triggers": [ "PLAYER_WEAK" ],
-    "luminance": 0,
     "reproduction": { "baby_monster": "mon_fry_stingray", "baby_count": 8, "baby_timer": 364 },
     "harvest": "fish_small",
     "dissect": "dissect_fish_sample_single",

diff --git a/data/mods/TropiCataclysm/monsters/tropical_nether.json b/data/mods/TropiCataclysm/monsters/tropical_nether.json
@@ -20,7 +20,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "shellfish",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -48,7 +47,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "shellfish",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -76,7 +74,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "shellfish",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -103,7 +100,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "echinoderm",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -130,7 +126,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "echinoderm",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -157,7 +152,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "echinoderm",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -184,7 +178,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "cnidarian",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -211,7 +204,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "cnidarian",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -238,7 +230,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "cnidarian",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
     "baby_flags": [ "AUTUMN" ],
@@ -266,7 +257,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "mollusk",
     "dissect": "dissect_gastropod_sample_single",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
@@ -295,7 +285,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "mollusk",
     "dissect": "dissect_gastropod_sample_single",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
@@ -323,7 +312,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "mollusk",
     "dissect": "dissect_gastropod_sample_single",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
@@ -351,7 +339,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "mollusk",
     "dissect": "dissect_gastropod_sample_single",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
@@ -379,7 +366,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "harvest": "mollusk",
     "dissect": "dissect_gastropod_sample_single",
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 21 },
@@ -410,7 +396,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 1,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
@@ -440,7 +425,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 2,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
@@ -471,7 +455,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 2,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
@@ -502,7 +485,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ],
@@ -533,7 +515,6 @@
     "melee_dice": 1,
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
-    "luminance": 0,
     "reproduction": { "baby_egg": "egg_fish_alien", "baby_count": 2, "baby_timer": 17 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],

diff --git a/data/mods/Xedra_Evolved/monsters/changeling.json b/data/mods/Xedra_Evolved/monsters/changeling.json
@@ -571,7 +571,6 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "grab_strength": 100,
     "dodge": 5,
-    "luminance": 0,
     "harvest": "fae_changeling",
     "weakpoint_sets": [ "wps_humanoid_body" ],
     "families": [ "prof_wp_demihuman" ],

diff --git a/data/mods/Xedra_Evolved/monsters/elementals.json b/data/mods/Xedra_Evolved/monsters/elementals.json
@@ -852,7 +852,6 @@
     "melee_dice_sides": 1,
     "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
     "dodge": 4,
-    "luminance": 0,
     "vision_day": 14,
     "vision_night": 14,
     "special_attacks": [ { "type": "leap", "cooldown": 3, "max_range": 2, "allow_no_target": true }, { "id": "cut_throat" } ],

diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp
@@ -985,7 +985,7 @@ void mtype::load( const JsonObject &jo, const std::string &src )
     }
 
     optional( jo, was_loaded, "starting_ammo", starting_ammo );
-    optional( jo, was_loaded, "luminance", luminance, 0 );
+    assign( jo, "luminance", luminance, true );
     optional( jo, was_loaded, "revert_to_itype", revert_to_itype, itype_id() );
     optional( jo, was_loaded, "mech_weapon", mech_weapon, itype_id() );
     optional( jo, was_loaded, "mech_str_bonus", mech_str_bonus, 0 );

diff --git a/src/mtype.h b/src/mtype.h
@@ -452,7 +452,7 @@ struct mtype {
         // Maximum move cost for this monster to absorb an item (default -1, -1 for no limit)
         int absorb_move_cost_max = -1;
 
-        float luminance;           // 0 is default, >0 gives luminance to lightmap
+        float luminance = 0;       // 0 is default, >0 gives luminance to lightmap
         // Vision range is linearly scaled depending on lighting conditions
         int vision_day = 40;    /** vision range in bright light */
         int vision_night = 1;   /** vision range in total darkness */