mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-16 12:07:48 +00:00
025018014d
While helping RaveRadbury debug some issues with enabling Halloween species early via the brute force method of enabling them in the config rather than the gentleman's solution of testmerging a PR that changes the Halloween date, we discovered something dreadful.
Cloth golems cannot be enabled! Infact, any species with a space in the ID cannot be enabled.
It uses the splitter despite VALUE_MODE_FLAG being set. So a key entry like ROUNDSTART_RACES cloth golem would get parsed as cloth = golem, then entered into the config as cloth = TRUE
NEW AND IMPROVED PART HERE
I've re-written how keyed_list config entries are parsed, splitting it into a number of procs to do some discrete block of logic.
Based on feedback from MSO, he expected that VALUE_MODE_FLAG keyed_list entries could have elements overridden. However, this functionality was not present in the code.
I have implemented it. We now support 3 methods of setting VALUE_MODE_FLAGS.
Implicitly enable the config entry: CONFIG_ENTRY config_key_goes_here
Explicitly enable the config entry: CONFIG_ENTRY config_key_goes_here 1
Explicitly disable the config entry: CONFIG_ENTRY config_key_goes_here 0
There have been functionality changes too. Previously, everything before the first splitter was the key and everything after was the value. However, in ambiguous config entries (Such as ROUNDSTART_RACES cloth golem 0) it would be unclear if the intent was (cloth, golem 0) or (cloth golem, 0) or indeed if the intent was (cloth golem 0, 1).
As a result, there is now the following paradigm in place: Everything after the LAST splitter is the value, everything before is the key and a log_config warning is now given explaining the problem and showing how it was resolved.
[2021-10-27 19:48:12.840] WARNING: Multiple splitter characters (" ") found. Using "cloth golem" as config key and "1" as config value.
This warning will trigger if multiple splitters are present for any keyed_list config entry, and will trigger on implicit VALUE_MODE_FLAGS entries that have splitters. The example above is it triggering on ROUNDSTART_RACES cloth golem - It has detected that there is potential ambiguity between (cloth, golem) or (cloth golem, 1), has picked a sensible option for the data type and has warned about it.
The intent is that no config entry should be ambiguous. It should be clear what is key and what is value when dealing with keyed_list config entries.
There's probably more work to do on other config entries to bring them up to this standard, but this is the thing I'm hitting in this PR.
Similarly, I have improved the validation aspect of keyed_list config entries with additional logging in general.
[2021-10-27 19:47:53.135] ERROR: Invalid KEY_MODE_TYPE typepath. Is not a valid typepath: /mob/living/carbon/monkey
I have added a unit test to make sure species IDs do not contain splitters from the two keyed_list subtypes relating to species.
I have added sanity checking to the race config subtypes since we have a big dick global list of all races sorted by ID, so a race not existing will fail validation and output a meaningful config log entry.
I have removed /datum/config_entry/keyed_list/probability from the code as it is unused with the removal of all game modes except Dynamic.
The config change necessitated the renaming of all golem species IDs. Doing so and renaming the clothgolem.ts file to match has fixed the broken cloth golem page too.
302 lines
11 KiB
Plaintext
302 lines
11 KiB
Plaintext
/*ALL DNA, SPECIES, AND GENETICS-RELATED DEFINES GO HERE*/
|
|
|
|
#define CHECK_DNA_AND_SPECIES(C) if(!(C.dna?.species)) return
|
|
|
|
//Defines copying names of mutations in all cases, make sure to change this if you change mutation's type
|
|
#define ACIDFLESH /datum/mutation/human/acidflesh
|
|
#define ANTENNA /datum/mutation/human/antenna
|
|
#define ANTIGLOWY /datum/mutation/human/glow/anti
|
|
#define AUTONOMY /datum/mutation/human/self_amputation
|
|
#define BADBLINK /datum/mutation/human/badblink
|
|
#define BADSIGHT /datum/mutation/human/nearsight
|
|
#define BIOTECHCOMPAT /datum/mutation/human/biotechcompat
|
|
#define BLINDMUT /datum/mutation/human/blind
|
|
#define CHAMELEON /datum/mutation/human/chameleon
|
|
#define CHAV /datum/mutation/human/chav
|
|
#define CLOWNMUT /datum/mutation/human/clumsy
|
|
#define COUGH /datum/mutation/human/cough
|
|
#define CRYOKINESIS /datum/mutation/human/cryokinesis
|
|
#define DEAFMUT /datum/mutation/human/deaf
|
|
#define DWARFISM /datum/mutation/human/dwarfism
|
|
#define ELVIS /datum/mutation/human/elvis
|
|
#define EPILEPSY /datum/mutation/human/epilepsy
|
|
#define EXTRASTUN /datum/mutation/human/extrastun
|
|
#define FIREBREATH /datum/mutation/human/firebreath
|
|
#define FIRESWEAT /datum/mutation/human/fire
|
|
#define GELADIKINESIS /datum/mutation/human/geladikinesis
|
|
#define GIGANTISM /datum/mutation/human/gigantism
|
|
#define GLOWY /datum/mutation/human/glow
|
|
#define HARS /datum/mutation/human/headless
|
|
#define HULK /datum/mutation/human/hulk
|
|
#define INSULATED /datum/mutation/human/insulated
|
|
#define LASEREYES /datum/mutation/human/laser_eyes
|
|
#define MARTYRDOM /datum/mutation/human/martyrdom
|
|
#define MEDIEVAL /datum/mutation/human/medieval
|
|
#define MINDREAD /datum/mutation/human/mindreader
|
|
#define MUTATE /datum/mutation/human/bad_dna
|
|
#define MUT_MUTE /datum/mutation/human/mute
|
|
#define NERVOUS /datum/mutation/human/nervousness
|
|
#define OLFACTION /datum/mutation/human/olfaction
|
|
#define PARANOIA /datum/mutation/human/paranoia
|
|
#define PIGLATIN /datum/mutation/human/piglatin
|
|
#define RACEMUT /datum/mutation/human/race
|
|
#define RADIOACTIVE /datum/mutation/human/radioactive
|
|
#define SHOCKTOUCH /datum/mutation/human/shock
|
|
#define SPACEMUT /datum/mutation/human/space_adaptation
|
|
#define SPASTIC /datum/mutation/human/spastic
|
|
#define SPIDER_WEB /datum/mutation/human/webbing
|
|
#define STIMMED /datum/mutation/human/stimmed
|
|
#define STONER /datum/mutation/human/stoner
|
|
#define STRONG /datum/mutation/human/strong
|
|
#define SWEDISH /datum/mutation/human/swedish
|
|
#define TELEPATHY /datum/mutation/human/telepathy
|
|
#define THERMAL /datum/mutation/human/thermal
|
|
#define TK /datum/mutation/human/telekinesis
|
|
#define TONGUESPIKE /datum/mutation/human/tonguespike
|
|
#define TONGUESPIKECHEM /datum/mutation/human/tongue_spike/chem
|
|
#define TOURETTES /datum/mutation/human/tourettes
|
|
#define UNINTELLIGIBLE /datum/mutation/human/unintelligible
|
|
#define VOID /datum/mutation/human/void
|
|
#define WACKY /datum/mutation/human/wacky
|
|
#define XRAY /datum/mutation/human/xray
|
|
|
|
#define BURDENED /datum/mutation/human/burdened
|
|
#define HONORBOUND /datum/mutation/human/honorbound
|
|
|
|
#define UE_CHANGED "ue changed"
|
|
#define UI_CHANGED "ui changed"
|
|
#define UF_CHANGED "uf changed"
|
|
|
|
#define CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY 204
|
|
|
|
// String identifiers for associative list lookup
|
|
|
|
//Types of usual mutations
|
|
#define POSITIVE 1
|
|
#define NEGATIVE 2
|
|
#define MINOR_NEGATIVE 4
|
|
|
|
|
|
//Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you dont want people to fuck with like wizard mutate
|
|
#define MUT_NORMAL 1
|
|
#define MUT_EXTRA 2
|
|
#define MUT_OTHER 3
|
|
|
|
//DNA - Because fuck you and your magic numbers being all over the codebase.
|
|
#define DNA_BLOCK_SIZE 3
|
|
|
|
#define DNA_EYE_COLOR_BLOCK 4
|
|
#define DNA_FACIAL_HAIR_COLOR_BLOCK 2
|
|
#define DNA_FACIAL_HAIRSTYLE_BLOCK 6
|
|
#define DNA_GENDER_BLOCK 5
|
|
#define DNA_HAIR_COLOR_BLOCK 1
|
|
#define DNA_HAIRSTYLE_BLOCK 7
|
|
#define DNA_SKIN_TONE_BLOCK 3
|
|
#define DNA_UNI_IDENTITY_BLOCKS 7
|
|
|
|
#define DNA_FEATURE_BLOCKS 15
|
|
#define DNA_MUTANT_COLOR_BLOCK 1
|
|
#define DNA_ETHEREAL_COLOR_BLOCK 2
|
|
#define DNA_LIZARD_MARKINGS_BLOCK 3
|
|
#define DNA_LIZARD_TAIL_BLOCK 4
|
|
#define DNA_SNOUT_BLOCK 5
|
|
#define DNA_HORNS_BLOCK 6
|
|
#define DNA_FRILLS_BLOCK 7
|
|
#define DNA_SPINES_BLOCK 8
|
|
#define DNA_HUMAN_TAIL_BLOCK 9
|
|
#define DNA_EARS_BLOCK 10
|
|
#define DNA_MOTH_WINGS_BLOCK 11
|
|
#define DNA_MOTH_ANTENNAE_BLOCK 12
|
|
#define DNA_MOTH_MARKINGS_BLOCK 13
|
|
#define DNA_MUSHROOM_CAPS_BLOCK 14
|
|
#define DNA_MONKEY_TAIL_BLOCK 15
|
|
|
|
#define DNA_SEQUENCE_LENGTH 4
|
|
#define DNA_MUTATION_BLOCKS 8
|
|
#define DNA_UNIQUE_ENZYMES_LEN 32
|
|
|
|
//species traits for mutantraces
|
|
#define MUTCOLORS 1
|
|
#define HAIR 2
|
|
#define FACEHAIR 3
|
|
#define EYECOLOR 4
|
|
#define LIPS 5
|
|
#define NOBLOOD 6
|
|
#define NOTRANSSTING 7
|
|
#define NOZOMBIE 8
|
|
/// Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
|
|
#define DIGITIGRADE 9
|
|
#define NO_UNDERWEAR 10
|
|
#define NOSTOMACH 11
|
|
#define NO_DNA_COPY 12
|
|
#define DRINKSBLOOD 13
|
|
/// Use this if you want to change the race's color without the player being able to pick their own color. AKA special color shifting
|
|
#define DYNCOLORS 14
|
|
#define AGENDER 15
|
|
/// Do not draw eyes or eyeless overlay
|
|
#define NOEYESPRITES 16
|
|
/// Used for determining which wounds are applicable to this species.
|
|
/// if we have flesh (can suffer slash/piercing/burn wounds, requires they don't have NOBLOOD)
|
|
#define HAS_FLESH 17
|
|
/// if we have bones (can suffer bone wounds)
|
|
#define HAS_BONE 18
|
|
///If we have a limb-specific overlay sprite
|
|
#define HAS_MARKINGS 19
|
|
/// Do not draw blood overlay
|
|
#define NOBLOODOVERLAY 20
|
|
///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png
|
|
#define NOAUGMENTS 21
|
|
|
|
//organ slots
|
|
#define ORGAN_SLOT_ADAMANTINE_RESONATOR "adamantine_resonator"
|
|
#define ORGAN_SLOT_APPENDIX "appendix"
|
|
#define ORGAN_SLOT_BRAIN "brain"
|
|
#define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop"
|
|
#define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
|
|
#define ORGAN_SLOT_BREATHING_TUBE "breathing_tube"
|
|
#define ORGAN_SLOT_EARS "ears"
|
|
#define ORGAN_SLOT_EYES "eye_sight"
|
|
#define ORGAN_SLOT_HEART "heart"
|
|
#define ORGAN_SLOT_HEART_AID "heartdrive"
|
|
#define ORGAN_SLOT_HUD "eye_hud"
|
|
#define ORGAN_SLOT_LIVER "liver"
|
|
#define ORGAN_SLOT_LUNGS "lungs"
|
|
#define ORGAN_SLOT_PARASITE_EGG "parasite_egg"
|
|
#define ORGAN_SLOT_REGENERATIVE_CORE "hivecore"
|
|
#define ORGAN_SLOT_RIGHT_ARM_AUG "r_arm_device"
|
|
#define ORGAN_SLOT_LEFT_ARM_AUG "l_arm_device" //This one ignores alphabetical order cause the arms should be together
|
|
#define ORGAN_SLOT_STOMACH "stomach"
|
|
#define ORGAN_SLOT_STOMACH_AID "stomach_aid"
|
|
#define ORGAN_SLOT_TAIL "tail"
|
|
#define ORGAN_SLOT_THRUSTERS "thrusters"
|
|
#define ORGAN_SLOT_TONGUE "tongue"
|
|
#define ORGAN_SLOT_VOICE "vocal_cords"
|
|
#define ORGAN_SLOT_ZOMBIE "zombie_infection"
|
|
|
|
/// Organ slot external
|
|
#define ORGAN_SLOT_EXTERNAL_TAIL "tail"
|
|
#define ORGAN_SLOT_EXTERNAL_SPINES "spines"
|
|
#define ORGAN_SLOT_EXTERNAL_SNOUT "snout"
|
|
#define ORGAN_SLOT_EXTERNAL_FRILLS "frills"
|
|
#define ORGAN_SLOT_EXTERNAL_HORNS "horns"
|
|
#define ORGAN_SLOT_EXTERNAL_WINGS "wings"
|
|
#define ORGAN_SLOT_EXTERNAL_ANTENNAE "antennae"
|
|
#define ORGAN_SLOT_EXTERNAL_BODYMARKINGS "bodymarkings"
|
|
|
|
/// Xenomorph organ slots
|
|
#define ORGAN_SLOT_XENO_ACIDGLAND "acid_gland"
|
|
#define ORGAN_SLOT_XENO_EGGSAC "eggsac"
|
|
#define ORGAN_SLOT_XENO_HIVENODE "hive_node"
|
|
#define ORGAN_SLOT_XENO_NEUROTOXINGLAND "neurotoxin_gland"
|
|
#define ORGAN_SLOT_XENO_PLASMAVESSEL "plasma_vessel"
|
|
#define ORGAN_SLOT_XENO_RESINSPINNER "resin_spinner"
|
|
|
|
//organ defines
|
|
#define STANDARD_ORGAN_THRESHOLD 100
|
|
#define STANDARD_ORGAN_HEALING 50 / 100000
|
|
/// designed to fail organs when left to decay for ~15 minutes
|
|
#define STANDARD_ORGAN_DECAY 111 / 100000
|
|
|
|
//used for the can_chromosome var on mutations
|
|
#define CHROMOSOME_NEVER 0
|
|
#define CHROMOSOME_NONE 1
|
|
#define CHROMOSOME_USED 2
|
|
|
|
//used for mob's genetic gender (mainly just for pronouns, members of sexed species with plural gender refer to their body_type for the actual sprites, which is not genetic)
|
|
#define G_MALE 1
|
|
#define G_FEMALE 2
|
|
#define G_PLURAL 3
|
|
|
|
///Organ slot processing order for life proc
|
|
GLOBAL_LIST_INIT(organ_process_order, list(
|
|
ORGAN_SLOT_BRAIN,
|
|
ORGAN_SLOT_APPENDIX,
|
|
ORGAN_SLOT_RIGHT_ARM_AUG,
|
|
ORGAN_SLOT_LEFT_ARM_AUG,
|
|
ORGAN_SLOT_STOMACH,
|
|
ORGAN_SLOT_STOMACH_AID,
|
|
ORGAN_SLOT_BREATHING_TUBE,
|
|
ORGAN_SLOT_EARS,
|
|
ORGAN_SLOT_EYES,
|
|
ORGAN_SLOT_LUNGS,
|
|
ORGAN_SLOT_HEART,
|
|
ORGAN_SLOT_ZOMBIE,
|
|
ORGAN_SLOT_THRUSTERS,
|
|
ORGAN_SLOT_HUD,
|
|
ORGAN_SLOT_LIVER,
|
|
ORGAN_SLOT_TONGUE,
|
|
ORGAN_SLOT_VOICE,
|
|
ORGAN_SLOT_ADAMANTINE_RESONATOR,
|
|
ORGAN_SLOT_HEART_AID,
|
|
ORGAN_SLOT_BRAIN_ANTIDROP,
|
|
ORGAN_SLOT_BRAIN_ANTISTUN,
|
|
ORGAN_SLOT_TAIL,
|
|
ORGAN_SLOT_PARASITE_EGG,
|
|
ORGAN_SLOT_REGENERATIVE_CORE,
|
|
ORGAN_SLOT_XENO_PLASMAVESSEL,
|
|
ORGAN_SLOT_XENO_HIVENODE,
|
|
ORGAN_SLOT_XENO_RESINSPINNER,
|
|
ORGAN_SLOT_XENO_ACIDGLAND,
|
|
ORGAN_SLOT_XENO_NEUROTOXINGLAND,
|
|
ORGAN_SLOT_XENO_EGGSAC,))
|
|
|
|
//Defines for Species IDs
|
|
#define SPECIES_HUMAN "human"
|
|
#define SPECIES_FELINE "felinid"
|
|
#define SPECIES_MOTH "moth"
|
|
#define SPECIES_ETHEREAL "ethereal"
|
|
#define SPECIES_PLASMAMAN "plasmaman"
|
|
#define SPECIES_FLY "fly"
|
|
#define SPECIES_MONKEY "monkey"
|
|
#define SPECIES_JELLYPERSON "jelly"
|
|
#define SPECIES_SLIMEPERSON "slime"
|
|
#define SPECIES_LUMINESCENT "lum"
|
|
#define SPECIES_STARGAZER "stargazer"
|
|
#define SPECIES_LIZARD "lizard"
|
|
#define SPECIES_LIZARD_ASH "ashlizard"
|
|
#define SPECIES_LIZARD_SILVER "silverlizard"
|
|
#define SPECIES_DULLAHAN "dullahan"
|
|
#define SPECIES_SKELETON "skeleton"
|
|
#define SPECIES_VAMPIRE "vampire"
|
|
#define SPECIES_ZOMBIE "memezombies"
|
|
#define SPECIES_ZOMBIE_HALLOWEEN "zombie"
|
|
#define SPECIES_ADDICT "goofzombies"
|
|
|
|
#define SPECIES_ABDUCTOR "abductor"
|
|
#define SPECIES_ANDROID "android"
|
|
#define SPECIES_MUSHROOM "mush"
|
|
#define SPECIES_PODPERSON "pod"
|
|
#define SPECIES_SHADOW "shadow"
|
|
#define SPECIES_NIGHTMARE "nightmare"
|
|
#define SPECIES_SNAIL "snail"
|
|
#define SPECIES_SYNTH "synth"
|
|
#define SPECIES_SYNTH_MILITARY "military_synth"
|
|
|
|
//Defines for Golem Species IDs
|
|
#define SPECIES_GOLEM "iron_golem"
|
|
#define SPECIES_GOLEM_ADAMANTINE "adamantine_golem"
|
|
#define SPECIES_GOLEM_PLASMA "plasma_golem"
|
|
#define SPECIES_GOLEM_DIAMOND "diamond_golem"
|
|
#define SPECIES_GOLEM_GOLD "gold_golem"
|
|
#define SPECIES_GOLEM_SILVER "silver_golem"
|
|
#define SPECIES_GOLEM_PLASTEEL "plasteel_golem"
|
|
#define SPECIES_GOLEM_TITANIUM "titanium_golem"
|
|
#define SPECIES_GOLEM_PLASTITANIUM "plastitanium_golem"
|
|
#define SPECIES_GOLEM_ALIEN "alloy_golem"
|
|
#define SPECIES_GOLEM_WOOD "wood_golem"
|
|
#define SPECIES_GOLEM_URANIUM "uranium_golem"
|
|
#define SPECIES_GOLEM_SAND "sand_golem"
|
|
#define SPECIES_GOLEM_GLASS "glass_golem"
|
|
#define SPECIES_GOLEM_BLUESPACE "bluespace_golem"
|
|
#define SPECIES_GOLEM_BANANIUM "bananium_golem"
|
|
#define SPECIES_GOLEM_CULT "runic_golem"
|
|
#define SPECIES_GOLEM_CLOTH "cloth_golem"
|
|
#define SPECIES_GOLEM_PLASTIC "plastic_golem"
|
|
#define SPECIES_GOLEM_BRONZE "bronze_golem"
|
|
#define SPECIES_GOLEM_CARDBOARD "cardboard_golem"
|
|
#define SPECIES_GOLEM_LEATHER "leather_golem"
|
|
#define SPECIES_GOLEM_DURATHREAD "durathread_golem"
|
|
#define SPECIES_GOLEM_BONE "bone_golem"
|
|
#define SPECIES_GOLEM_SNOW "snow_golem"
|
|
#define SPECIES_GOLEM_HYDROGEN "metallic_hydrogen_golem"
|