Delete E146

This was an unused and by default disabled element that did nothing even when enabled. 146 used to be the element ID allocated to some legacy GOL variant that I cannot be bothered to look into, and the element itself existed in this vegetative state for years to ensure some sort of compatibility that I found no trace of or reason for.

Also make the element list friendlier, both for humans and for git. The list held consecutive integers starting from 0, so it was ripe for factoring. Element ID's are skipped if the name that they would normally belong to is not a string but rather a disabler(), the closest thing to a null/nil/none value in meson.
This commit is contained in:
Tamás Bálint Misius 2023-08-31 14:58:36 +02:00
parent 2539c3eff5
commit c188837fec
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
2 changed files with 201 additions and 238 deletions

View File

@ -1,43 +0,0 @@
#include "simulation/ElementCommon.h"
void Element::Element_E146()
{
Identifier = "DEFAULT_PT_146";
Name = "BRAN";
Colour = 0xCCCC00_rgb;
MenuVisible = 0;
MenuSection = SC_LIFE;
Enabled = 0;
Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
Loss = 0.00f;
Collision = 0.0f;
Gravity = 0.0f;
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;
Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 0;
Weight = 100;
DefaultProperties.temp = 9000.0f;
HeatConduct = 40;
Description = "Brian 6 S6/B246/3";
Properties = TYPE_SOLID|PROP_LIFE;
LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
HighPressureTransition = NT;
LowTemperature = ITL;
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;
}

View File

@ -1,200 +1,206 @@
simulation_elem_ids = [
[ 'NONE', 0 ],
[ 'DUST', 1 ],
[ 'WATR', 2 ],
[ 'OIL', 3 ],
[ 'FIRE', 4 ],
[ 'STNE', 5 ],
[ 'LAVA', 6 ],
[ 'GUNP', 7 ],
[ 'NITR', 8 ],
[ 'CLNE', 9 ],
[ 'GAS', 10 ],
[ 'PLEX', 11 ],
[ 'GOO', 12 ],
[ 'ICEI', 13 ],
[ 'METL', 14 ],
[ 'SPRK', 15 ],
[ 'SNOW', 16 ],
[ 'WOOD', 17 ],
[ 'NEUT', 18 ],
[ 'PLUT', 19 ],
[ 'PLNT', 20 ],
[ 'ACID', 21 ],
[ 'VOID', 22 ],
[ 'WTRV', 23 ],
[ 'CNCT', 24 ],
[ 'DSTW', 25 ],
[ 'SALT', 26 ],
[ 'SLTW', 27 ],
[ 'DMND', 28 ],
[ 'BMTL', 29 ],
[ 'BRMT', 30 ],
[ 'PHOT', 31 ],
[ 'URAN', 32 ],
[ 'WAX', 33 ],
[ 'MWAX', 34 ],
[ 'PSCN', 35 ],
[ 'NSCN', 36 ],
[ 'LNTG', 37 ],
[ 'INSL', 38 ],
[ 'BHOL', 39 ],
[ 'WHOL', 40 ],
[ 'RBDM', 41 ],
[ 'LRBD', 42 ],
[ 'NTCT', 43 ],
[ 'SAND', 44 ],
[ 'GLAS', 45 ],
[ 'PTCT', 46 ],
[ 'BGLA', 47 ],
[ 'THDR', 48 ],
[ 'PLSM', 49 ],
[ 'ETRD', 50 ],
[ 'NICE', 51 ],
[ 'NBLE', 52 ],
[ 'BTRY', 53 ],
[ 'LCRY', 54 ],
[ 'STKM', 55 ],
[ 'SWCH', 56 ],
[ 'SMKE', 57 ],
[ 'DESL', 58 ],
[ 'COAL', 59 ],
[ 'LO2', 60 ],
[ 'O2', 61 ],
[ 'INWR', 62 ],
[ 'YEST', 63 ],
[ 'DYST', 64 ],
[ 'THRM', 65 ],
[ 'GLOW', 66 ],
[ 'BRCK', 67 ],
[ 'CFLM', 68 ],
[ 'FIRW', 69 ],
[ 'FUSE', 70 ],
[ 'FSEP', 71 ],
[ 'AMTR', 72 ],
[ 'BCOL', 73 ],
[ 'PCLN', 74 ],
[ 'HSWC', 75 ],
[ 'IRON', 76 ],
[ 'MORT', 77 ],
[ 'LIFE', 78 ],
[ 'DLAY', 79 ],
[ 'CO2', 80 ],
[ 'DRIC', 81 ],
[ 'CBNW', 82 ],
[ 'STOR', 83 ],
[ 'PVOD', 84 ],
[ 'CONV', 85 ],
[ 'CAUS', 86 ],
[ 'LIGH', 87 ],
[ 'TESC', 88 ],
[ 'DEST', 89 ],
[ 'SPNG', 90 ],
[ 'RIME', 91 ],
[ 'FOG', 92 ],
[ 'BCLN', 93 ],
[ 'LOVE', 94 ],
[ 'DEUT', 95 ],
[ 'WARP', 96 ],
[ 'PUMP', 97 ],
[ 'FWRK', 98 ],
[ 'PIPE', 99 ],
[ 'FRZZ', 100 ],
[ 'FRZW', 101 ],
[ 'GRAV', 102 ],
[ 'BIZR', 103 ],
[ 'BIZRG', 104 ],
[ 'BIZRS', 105 ],
[ 'INST', 106 ],
[ 'ISOZ', 107 ],
[ 'ISZS', 108 ],
[ 'PRTI', 109 ],
[ 'PRTO', 110 ],
[ 'PSTE', 111 ],
[ 'PSTS', 112 ],
[ 'ANAR', 113 ],
[ 'VINE', 114 ],
[ 'INVIS', 115 ],
[ 'E116', 116 ],
[ 'SPAWN2', 117 ],
[ 'SPAWN', 118 ],
[ 'SHLD1', 119 ],
[ 'SHLD2', 120 ],
[ 'SHLD3', 121 ],
[ 'SHLD4', 122 ],
[ 'LOLZ', 123 ],
[ 'WIFI', 124 ],
[ 'FILT', 125 ],
[ 'ARAY', 126 ],
[ 'BRAY', 127 ],
[ 'STKM2', 128 ],
[ 'BOMB', 129 ],
[ 'C5', 130 ],
[ 'SING', 131 ],
[ 'QRTZ', 132 ],
[ 'PQRT', 133 ],
[ 'EMP', 134 ],
[ 'BREC', 135 ],
[ 'ELEC', 136 ],
[ 'ACEL', 137 ],
[ 'DCEL', 138 ],
[ 'BANG', 139 ],
[ 'IGNT', 140 ],
[ 'BOYL', 141 ],
[ 'GEL', 142 ],
[ 'TRON', 143 ],
[ 'TTAN', 144 ],
[ 'EXOT', 145 ],
[ 'E146', 146 ],
[ 'EMBR', 147 ],
[ 'H2', 148 ],
[ 'SOAP', 149 ],
[ 'NBHL', 150 ],
[ 'NWHL', 151 ],
[ 'MERC', 152 ],
[ 'PBCN', 153 ],
[ 'GPMP', 154 ],
[ 'CLST', 155 ],
[ 'WIRE', 156 ],
[ 'GBMB', 157 ],
[ 'FIGH', 158 ],
[ 'FRAY', 159 ],
[ 'RPEL', 160 ],
[ 'PPIP', 161 ],
[ 'DTEC', 162 ],
[ 'DMG', 163 ],
[ 'TSNS', 164 ],
[ 'VIBR', 165 ],
[ 'BVBR', 166 ],
[ 'CRAY', 167 ],
[ 'PSTN', 168 ],
[ 'FRME', 169 ],
[ 'GOLD', 170 ],
[ 'TUNG', 171 ],
[ 'PSNS', 172 ],
[ 'PROT', 173 ],
[ 'VIRS', 174 ],
[ 'VRSS', 175 ],
[ 'VRSG', 176 ],
[ 'GRVT', 177 ],
[ 'DRAY', 178 ],
[ 'CRMC', 179 ],
[ 'HEAC', 180 ],
[ 'SAWD', 181 ],
[ 'POLO', 182 ],
[ 'RFRG', 183 ],
[ 'RFGL', 184 ],
[ 'LSNS', 185 ],
[ 'LDTC', 186 ],
[ 'SLCN', 187 ],
[ 'PTNM', 188 ],
[ 'VSNS', 189 ],
[ 'ROCK', 190 ],
[ 'LITH', 191 ],
simulation_elem_names = [
'NONE',
'DUST',
'WATR',
'OIL',
'FIRE',
'STNE',
'LAVA',
'GUNP',
'NITR',
'CLNE',
'GAS',
'PLEX',
'GOO',
'ICEI',
'METL',
'SPRK',
'SNOW',
'WOOD',
'NEUT',
'PLUT',
'PLNT',
'ACID',
'VOID',
'WTRV',
'CNCT',
'DSTW',
'SALT',
'SLTW',
'DMND',
'BMTL',
'BRMT',
'PHOT',
'URAN',
'WAX',
'MWAX',
'PSCN',
'NSCN',
'LNTG',
'INSL',
'BHOL',
'WHOL',
'RBDM',
'LRBD',
'NTCT',
'SAND',
'GLAS',
'PTCT',
'BGLA',
'THDR',
'PLSM',
'ETRD',
'NICE',
'NBLE',
'BTRY',
'LCRY',
'STKM',
'SWCH',
'SMKE',
'DESL',
'COAL',
'LO2',
'O2',
'INWR',
'YEST',
'DYST',
'THRM',
'GLOW',
'BRCK',
'CFLM',
'FIRW',
'FUSE',
'FSEP',
'AMTR',
'BCOL',
'PCLN',
'HSWC',
'IRON',
'MORT',
'LIFE',
'DLAY',
'CO2',
'DRIC',
'CBNW',
'STOR',
'PVOD',
'CONV',
'CAUS',
'LIGH',
'TESC',
'DEST',
'SPNG',
'RIME',
'FOG',
'BCLN',
'LOVE',
'DEUT',
'WARP',
'PUMP',
'FWRK',
'PIPE',
'FRZZ',
'FRZW',
'GRAV',
'BIZR',
'BIZRG',
'BIZRS',
'INST',
'ISOZ',
'ISZS',
'PRTI',
'PRTO',
'PSTE',
'PSTS',
'ANAR',
'VINE',
'INVIS',
'E116',
'SPAWN2',
'SPAWN',
'SHLD1',
'SHLD2',
'SHLD3',
'SHLD4',
'LOLZ',
'WIFI',
'FILT',
'ARAY',
'BRAY',
'STKM2',
'BOMB',
'C5',
'SING',
'QRTZ',
'PQRT',
'EMP',
'BREC',
'ELEC',
'ACEL',
'DCEL',
'BANG',
'IGNT',
'BOYL',
'GEL',
'TRON',
'TTAN',
'EXOT',
disabler(),
'EMBR',
'H2',
'SOAP',
'NBHL',
'NWHL',
'MERC',
'PBCN',
'GPMP',
'CLST',
'WIRE',
'GBMB',
'FIGH',
'FRAY',
'RPEL',
'PPIP',
'DTEC',
'DMG',
'TSNS',
'VIBR',
'BVBR',
'CRAY',
'PSTN',
'FRME',
'GOLD',
'TUNG',
'PSNS',
'PROT',
'VIRS',
'VRSS',
'VRSG',
'GRVT',
'DRAY',
'CRMC',
'HEAC',
'SAWD',
'POLO',
'RFRG',
'RFGL',
'LSNS',
'LDTC',
'SLCN',
'PTNM',
'VSNS',
'ROCK',
'LITH',
]
simulation_elem_src = []
foreach elem_name_id : simulation_elem_ids
simulation_elem_src += elem_name_id[0] + '.cpp'
simulation_elem_ids = []
elem_id = 0
foreach elem_name : simulation_elem_names
if not is_disabler(elem_name)
simulation_elem_src += elem_name + '.cpp'
simulation_elem_ids += [ [ elem_name, elem_id ] ]
endif
elem_id = elem_id + 1
endforeach
simulation_files += files(simulation_elem_src)