mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Format tables in Source/objdat.cpp

pull/5726/head
Gleb Mazovetskiy 3 years ago
parent
7f4d74e8f8
commit
2bc4aaebae
2 changed files with 122 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 220
      Source/objdat.cpp
  2. 18
      tools/cpp_format_struct_table.py

220
Source/objdat.cpp
Unescape View File

@ -161,116 +161,116 @@ const _object_id ObjTypeConv[] = {
/** Contains the data related to each object ID. */
const ObjectData AllObjects[109] = {
// clang-format off
// ofindex, ominlvl, omaxlvl, olvltype, otheme, oquest, oAnimFlag, oAnimDelay, oAnimLen, oAnimWidth, oSolidFlag, oMissFlag, oLightFlag, oBreak, oSelFlag, oTrapFlag
{ OFILE_L1BRAZ, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, true, 1, 26, 64, true, true, false, 0, 0, false },
{ OFILE_L1DOORS, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L1DOORS, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_SKULFIRE, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, true, 2, 11, 96, true, true, false, 0, 0, false },
{ OFILE_LEVER, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 1, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST1, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST2, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST3, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_PWATER, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 2, 0, 96, true, true, true, 0, 0, false },
{ OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 0, false },
{ OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 3, 0, 96, true, true, true, 0, 0, false },
{ OFILE_SKULPILE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 1, 96, true, true, true, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_CRUXSK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 15, 96, true, false, true, 1, 3, false },
{ OFILE_CRUXSK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 15, 96, true, false, true, 1, 3, false },
{ OFILE_CRUXSK3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 15, 96, true, false, true, 1, 3, false },
{ OFILE_ROCKSTAN, 5, 5, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 0, false },
{ OFILE_ANGEL, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 0, false },
{ OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 0, 10, 160, true, false, false, 0, 0, false },
{ OFILE_NUDE2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 3, 6, 128, true, false, true, 0, 0, false },
{ OFILE_SWITCH4, 16, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 1, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 2, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 3, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 4, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEW, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 1, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEW, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 2, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEW, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 3, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 1, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 2, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 3, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 4, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 5, 0, 128, false, true, true, 0, 0, false },
{ OFILE_BOOK2, 6, 6, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_L2DOORS, 0, 0, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L2DOORS, 0, 0, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_WTORCH4, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_WTORCH3, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_WTORCH1, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_WTORCH2, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_SARC, 1, 4, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 5, 128, true, true, true, 0, 3, true },
{ OFILE_FLAME1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 20, 96, false, true, true, 0, 0, false },
{ OFILE_LEVER, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 2, 96, true, true, true, 0, 1, true },
{ OFILE_MINIWATR, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 10, 64, true, false, true, 0, 0, false },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_TRAPHOLE, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, true, true, 0, 0, false },
{ OFILE_TRAPHOLE, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, true, true, 0, 0, false },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 0, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 0, false },
{ OFILE_BARREL, 1, 15, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 9, 96, true, true, true, 1, 3, false },
{ OFILE_BARRELEX, 1, 15, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 10, 96, true, true, true, 1, 3, false },
{ OFILE_LSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, false, 1, 11, 128, false, false, true, 0, 3, false },
{ OFILE_RSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, false, 1, 11, 128, false, false, true, 0, 3, false },
{ OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, false, 3, 0, 96, false, false, true, 0, 3, false },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, false, 4, 0, 96, false, false, true, 0, 3, false },
{ OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_BLOODFNT, 0, 0, DTYPE_NONE, THEME_BLOODFOUNTAIN, Q_INVALID, true, 2, 10, 96, true, true, true, 0, 3, false },
{ OFILE_DECAP, 13, 15, DTYPE_NONE, THEME_DECAPITATED, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, false },
{ OFILE_CHEST1, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST2, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST3, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_BLIND, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_BLOOD, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_PEDISTL, 0, 0, DTYPE_NONE, THEME_NONE, Q_BLOOD, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_L3DOORS, 0, 0, DTYPE_CAVES, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L3DOORS, 0, 0, DTYPE_CAVES, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_PFOUNTN, 0, 0, DTYPE_NONE, THEME_PURIFYINGFOUNTAIN, Q_INVALID, true, 2, 10, 128, true, true, true, 0, 3, false },
{ OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, false, 2, 0, 96, true, false, true, 0, 0, false },
{ OFILE_GOATSHRN, 0, 0, DTYPE_NONE, THEME_GOATSHRINE, Q_INVALID, true, 2, 10, 96, true, true, true, 0, 3, false },
{ OFILE_CAULDREN, 13, 15, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_MFOUNTN, 0, 0, DTYPE_NONE, THEME_MURKYFOUNTAIN, Q_INVALID, true, 2, 10, 128, true, true, true, 0, 3, false },
{ OFILE_TFOUNTN, 0, 0, DTYPE_NONE, THEME_TEARFOUNTAIN, Q_INVALID, true, 2, 4, 128, true, true, true, 0, 3, false },
{ OFILE_ALTBOY, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 128, true, true, true, 0, 0, false },
{ OFILE_MCIRL, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 96, false, true, true, 0, 0, false },
{ OFILE_MCIRL, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 96, false, true, true, 0, 0, false },
{ OFILE_BKSLBRNT, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_WARLORD, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_NONE, Q_WARLORD, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_NONE, Q_WARLORD, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_BRNCROSS, Q_INVALID, true, 0, 10, 160, true, false, false, 0, 0, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, false, 2, 0, 96, true, false, true, 0, 0, false },
{ OFILE_MUSHPTCH, 0, 0, DTYPE_NONE, THEME_NONE, Q_MUSHROOM, false, 1, 0, 96, true, true, true, 0, 3, true },
{ OFILE_LZSTAND, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 128, true, false, true, 0, 3, false },
{ OFILE_DECAP, 9, 9, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 2, 0, 96, true, true, true, 0, 1, false },
{ OFILE_CHEST3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 2, 0, 96, true, false, true, 0, 0, false },
{ OFILE_POD, 17, 20, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 9, 96, true, true, true, 1, 3, false },
{ OFILE_PODEX, 17, 20, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 10, 96, true, true, true, 1, 3, false },
{ OFILE_URN, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 9, 96, true, true, true, 1, 3, false },
{ OFILE_URNEX, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 10, 96, true, true, true, 1, 3, false },
{ OFILE_L5BOOKS, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_L5CANDLE, 21, 23, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_L5DOORS, 0, 0, DTYPE_CRYPT, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L5DOORS, 0, 0, DTYPE_CRYPT, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L5LEVER, 24, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 1, 96, true, true, true, 0, 1, true },
{ OFILE_L5SARC, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 5, 128, true, true, true, 0, 3, true },
// ofindex, ominlvl, omaxlvl, olvltype, otheme, oquest, oAnimFlag, oAnimDelay, oAnimLen, oAnimWidth, oSolidFlag, oMissFlag, oLightFlag, oBreak, oSelFlag, oTrapFlag
{ OFILE_L1BRAZ, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, true, 1, 26, 64, true, true, false, 0, 0, false },
{ OFILE_L1DOORS, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L1DOORS, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_SKULFIRE, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, true, 2, 11, 96, true, true, false, 0, 0, false },
{ OFILE_LEVER, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 1, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST1, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST2, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST3, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_PWATER, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 2, 0, 96, true, true, true, 0, 0, false },
{ OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 0, false },
{ OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 3, 0, 96, true, true, true, 0, 0, false },
{ OFILE_SKULPILE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 1, 96, true, true, true, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 0, 0, 0, false, false, false, 0, 0, false },
{ OFILE_CRUXSK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 15, 96, true, false, true, 1, 3, false },
{ OFILE_CRUXSK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 15, 96, true, false, true, 1, 3, false },
{ OFILE_CRUXSK3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 15, 96, true, false, true, 1, 3, false },
{ OFILE_ROCKSTAN, 5, 5, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 0, false },
{ OFILE_ANGEL, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 0, false },
{ OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 0, 10, 160, true, false, false, 0, 0, false },
{ OFILE_NUDE2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 3, 6, 128, true, false, true, 0, 0, false },
{ OFILE_SWITCH4, 16, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 1, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 2, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 3, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEM, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 4, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEW, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 1, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEW, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 2, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TNUDEW, 13, 15, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, false, 3, 0, 128, true, false, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 1, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 2, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 3, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 4, 0, 128, false, true, true, 0, 0, false },
{ OFILE_TSOUL, 13, 15, DTYPE_NONE, THEME_NONE, Q_BUTCHER, false, 5, 0, 128, false, true, true, 0, 0, false },
{ OFILE_BOOK2, 6, 6, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_L2DOORS, 0, 0, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L2DOORS, 0, 0, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_WTORCH4, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_WTORCH3, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_WTORCH1, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_WTORCH2, 5, 8, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 9, 96, false, true, false, 0, 0, false },
{ OFILE_SARC, 1, 4, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 5, 128, true, true, true, 0, 3, true },
{ OFILE_FLAME1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 20, 96, false, true, true, 0, 0, false },
{ OFILE_LEVER, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 2, 96, true, true, true, 0, 1, true },
{ OFILE_MINIWATR, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 1, 10, 64, true, false, true, 0, 0, false },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_TRAPHOLE, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, true, true, 0, 0, false },
{ OFILE_TRAPHOLE, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, true, true, 0, 0, false },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 0, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 0, false },
{ OFILE_BARREL, 1, 15, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 9, 96, true, true, true, 1, 3, false },
{ OFILE_BARRELEX, 1, 15, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 10, 96, true, true, true, 1, 3, false },
{ OFILE_LSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, false, 1, 11, 128, false, false, true, 0, 3, false },
{ OFILE_RSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, false, 1, 11, 128, false, false, true, 0, 3, false },
{ OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, false, 3, 0, 96, false, false, true, 0, 3, false },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, false, 4, 0, 96, false, false, true, 0, 3, false },
{ OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_BLOODFNT, 0, 0, DTYPE_NONE, THEME_BLOODFOUNTAIN, Q_INVALID, true, 2, 10, 96, true, true, true, 0, 3, false },
{ OFILE_DECAP, 13, 15, DTYPE_NONE, THEME_DECAPITATED, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, false },
{ OFILE_CHEST1, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST2, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_CHEST3, 1, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_BLIND, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_BLOOD, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_PEDISTL, 0, 0, DTYPE_NONE, THEME_NONE, Q_BLOOD, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_L3DOORS, 0, 0, DTYPE_CAVES, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L3DOORS, 0, 0, DTYPE_CAVES, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_PFOUNTN, 0, 0, DTYPE_NONE, THEME_PURIFYINGFOUNTAIN, Q_INVALID, true, 2, 10, 128, true, true, true, 0, 3, false },
{ OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, false, 2, 0, 96, true, false, true, 0, 0, false },
{ OFILE_GOATSHRN, 0, 0, DTYPE_NONE, THEME_GOATSHRINE, Q_INVALID, true, 2, 10, 96, true, true, true, 0, 3, false },
{ OFILE_CAULDREN, 13, 15, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_MFOUNTN, 0, 0, DTYPE_NONE, THEME_MURKYFOUNTAIN, Q_INVALID, true, 2, 10, 128, true, true, true, 0, 3, false },
{ OFILE_TFOUNTN, 0, 0, DTYPE_NONE, THEME_TEARFOUNTAIN, Q_INVALID, true, 2, 4, 128, true, true, true, 0, 3, false },
{ OFILE_ALTBOY, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 128, true, true, true, 0, 0, false },
{ OFILE_MCIRL, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 96, false, true, true, 0, 0, false },
{ OFILE_MCIRL, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 96, false, true, true, 0, 0, false },
{ OFILE_BKSLBRNT, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_BOOK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_WARLORD, false, 4, 0, 96, true, true, true, 0, 3, false },
{ OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_NONE, Q_WARLORD, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_NONE, Q_WARLORD, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_BRNCROSS, Q_INVALID, true, 0, 10, 160, true, false, false, 0, 0, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, false, 1, 0, 96, true, false, true, 0, 3, false },
{ OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, false, 2, 0, 96, true, false, true, 0, 0, false },
{ OFILE_MUSHPTCH, 0, 0, DTYPE_NONE, THEME_NONE, Q_MUSHROOM, false, 1, 0, 96, true, true, true, 0, 3, true },
{ OFILE_LZSTAND, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, false, 1, 0, 128, true, false, true, 0, 3, false },
{ OFILE_DECAP, 9, 9, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 2, 0, 96, true, true, true, 0, 1, false },
{ OFILE_CHEST3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 1, true },
{ OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 2, 0, 96, true, false, true, 0, 0, false },
{ OFILE_POD, 17, 20, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 9, 96, true, true, true, 1, 3, false },
{ OFILE_PODEX, 17, 20, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 10, 96, true, true, true, 1, 3, false },
{ OFILE_URN, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 9, 96, true, true, true, 1, 3, false },
{ OFILE_URNEX, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 10, 96, true, true, true, 1, 3, false },
{ OFILE_L5BOOKS, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 0, 96, true, true, true, 0, 3, false },
{ OFILE_L5CANDLE, 21, 23, DTYPE_NONE, THEME_NONE, Q_INVALID, true, 2, 4, 96, true, true, true, 0, 0, false },
{ OFILE_L5DOORS, 0, 0, DTYPE_CRYPT, THEME_NONE, Q_INVALID, false, 1, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L5DOORS, 0, 0, DTYPE_CRYPT, THEME_NONE, Q_INVALID, false, 2, 0, 64, false, false, true, 0, 3, true },
{ OFILE_L5LEVER, 24, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 1, 96, true, true, true, 0, 1, true },
{ OFILE_L5SARC, 21, 24, DTYPE_NONE, THEME_NONE, Q_INVALID, false, 1, 5, 128, true, true, true, 0, 3, true },
// clang-format on
};
/** Maps from object_graphic_id to object CEL name. */

18
tools/cpp_format_struct_table.py
Unescape View File

@ -17,6 +17,7 @@ def Main():
root.joinpath("Source/itemdat.cpp"),
root.joinpath("Source/misdat.cpp"),
root.joinpath("Source/monstdat.cpp"),
root.joinpath("Source/objdat.cpp"),
root.joinpath("Source/spelldat.cpp"),
],
)
@ -61,16 +62,18 @@ def Process(path: str):
prev_state = state
state = ProcessLine(input[i], state, columns_state)
if prev_state != state:
columns_state.has_header = False
for j in range(begin, i):
output_line = FormatLine(input[j], prev_state, columns_state)
output_lines.append(output_line)
columns_state = ColumnsState()
begin = i
columns_state.has_header = False
for j in range(begin, len(input)):
output_line = FormatLine(input[j], state, columns_state)
output_lines.append(output_line)
with open(path, "w", encoding="utf-8", newline='') as f:
with open(path, "w", encoding="utf-8", newline="") as f:
f.writelines(f"{line}\r\n" for line in output_lines)
@ -319,11 +322,14 @@ def FormatLine(line: str, line_state: LineState, state: ColumnsState) -> str:
return line
if row.header:
return "// " + " ".join(
FormatColumn(column.rstrip(), align, width)
for column, width, align in zip(
row.columns, [state.widths[0] - 1, *state.widths[1:]], state.aligns
)
return (
"// "
+ " ".join(
FormatColumn(column.rstrip(), align, width)
for column, width, align in zip(
row.columns, [state.widths[0] - 1, *state.widths[1:]], state.aligns
)
).rstrip()
)
result = []

Write Preview
Loading…
Cancel
Save