From f2fc4df01751ff73b001ea557f8e57fc71c1593b Mon Sep 17 00:00:00 2001 From: Emily Venezia Date: Mon, 8 Apr 2024 03:35:04 -0400 Subject: [PATCH] fix(std_zh): 'TRIGFLAG_' constants were off-by-one at a certain point in the list --- resources/include/std_zh/std_constants.zh | 235 +++++++++++----------- 1 file changed, 118 insertions(+), 117 deletions(-) diff --git a/resources/include/std_zh/std_constants.zh b/resources/include/std_zh/std_constants.zh index ce5174ab98..168a757889 100644 --- a/resources/include/std_zh/std_constants.zh +++ b/resources/include/std_zh/std_constants.zh @@ -3496,126 +3496,127 @@ enum ItemButton enum ComboTrigFlag { - TRIGFLAG_SWORD, - TRIGFLAG_SWORDBEAM, - TRIGFLAG_BRANG, - TRIGFLAG_BOMB, - TRIGFLAG_SBOMB, - TRIGFLAG_LITBOMB, - TRIGFLAG_LITSBOMB, - TRIGFLAG_ARROW, - TRIGFLAG_FIRE, - TRIGFLAG_WHISTLE, - TRIGFLAG_BAIT, - TRIGFLAG_WAND, - TRIGFLAG_MAGIC, - TRIGFLAG_WIND, - TRIGFLAG_REFMAGIC, - TRIGFLAG_REFFIREBALL, - TRIGFLAG_REFROCK, - TRIGFLAG_HAMMER, - TRIGFLAG_RESET_ANIM, - TRIGFLAG_INVERT_PROXIMITY, - TRIGFLAG_BTN_TOP, - TRIGFLAG_BTN_BOTTOM, - TRIGFLAG_BTN_LEFT, - TRIGFLAG_BTN_RIGHT, - TRIGFLAG_INVERT_MIN_MAX, - TRIGFLAG_STEP, - TRIGFLAG_STEP_SENS, - TRIGFLAG_SHUTTER, - TRIGFLAG_CTYPE_EFFECTS, - TRIGFLAG_ONLY_GENTRIG, - TRIGFLAG_KILL_WEAPON, - TRIGFLAG_EW_FIREBALL, + TRIGFLAG_SWORD, //Weapons->Sword + TRIGFLAG_SWORDBEAM, //Weapons->Sword Beam + TRIGFLAG_BRANG, //Weapons->Boomerang + TRIGFLAG_BOMB, //Weapons->Bomb Boom + TRIGFLAG_SBOMB, //Weapons->Super Bomb Boom + TRIGFLAG_LITBOMB, //Weapons->Placed Bomb + TRIGFLAG_LITSBOMB, //Weapons->Placed Super Bomb + TRIGFLAG_ARROW, //Weapons->Arrow + TRIGFLAG_FIRE, //Weapons->Fire + TRIGFLAG_WHISTLE, //Weapons->Whistle + TRIGFLAG_BAIT, //Weapons->Bait + TRIGFLAG_WAND, //Weapons->Wand + TRIGFLAG_MAGIC, //Weapons->Magic + TRIGFLAG_WIND, //Weapons->Wind + TRIGFLAG_REFMAGIC, //Weapons->Refl. Magic + TRIGFLAG_REFFIREBALL, //Weapons->Refl. Fireball + TRIGFLAG_REFROCK, //Weapons->Refl. Rock + TRIGFLAG_HAMMER, //Weapons->Hammer + TRIGFLAG_RESET_ANIM, //Effects->Reset Anim + TRIGFLAG_INVERT_PROXIMITY, //Other->Invert Proximity Req. + TRIGFLAG_BTN_TOP, //Other->Btn: Top + TRIGFLAG_BTN_BOTTOM, //Other->Btn: Bottom + TRIGFLAG_BTN_LEFT, //Other->Btn: Left + TRIGFLAG_BTN_RIGHT, //Other->Btn: Right + TRIGFLAG_INVERT_MIN_MAX, //Weapons->Max Level Instead + TRIGFLAG_STEP, //Other->'Step->' + TRIGFLAG_STEP_SENS, //Other->'Step-> (Sensitive)' + TRIGFLAG_SHUTTER, //Other->'Shutter->' + TRIGFLAG_CTYPE_EFFECTS, //Effects->'->ComboType Effects' + TRIGFLAG_ONLY_GENTRIG, //Effects->'Only Gen Triggers' + TRIGFLAG_KILL_WEAPON, //Effects->'Kill Triggering Weapon' + TRIGFLAG_EW_FIREBALL, //EWeapons->Fireball //32 - TRIGFLAG_HOOKSHOT, - TRIGFLAG_SPARKLE, - TRIGFLAG_BYRNA, - TRIGFLAG_REFBEAM, - TRIGFLAG_STOMP, - TRIGFLAG_SCRIPT1, - TRIGFLAG_SCRIPT2, - TRIGFLAG_SCRIPT3, - TRIGFLAG_SCRIPT4, - TRIGFLAG_SCRIPT5, - TRIGFLAG_SCRIPT6, - TRIGFLAG_SCRIPT7, - TRIGFLAG_SCRIPT8, - TRIGFLAG_SCRIPT9, - TRIGFLAG_SCRIPT10, - TRIGFLAG_AUTO, - TRIGFLAG_TRIG_SECRETS, - TRIGFLAG_INVERT_ITEMREQ, - TRIGFLAG_CONSUME_ITEMREQ, - TRIGFLAG_COUNTER_GE, - TRIGFLAG_COUNTER_LT, - TRIGFLAG_COUNTER_EAT, - TRIGFLAG_COUNTER_NOT_ONLY_TRIG_EAT, - TRIGFLAG_LIGHTON, - TRIGFLAG_LIGHTOFF, - TRIGFLAG_PUSH, - TRIGFLAG_LENS_ON, - TRIGFLAG_LENS_OFF, - TRIGFLAG_EW_ARROW, - TRIGFLAG_EW_BRANG, - TRIGFLAG_EW_SWORD, - TRIGFLAG_EW_ROCK, + TRIGFLAG_HOOKSHOT, //Weapons->Hookshot + TRIGFLAG_SPARKLE, //Weapons->Sparkle + TRIGFLAG_BYRNA, //Weapons->Byrna + TRIGFLAG_REFBEAM, //Weapons->Refl. Beam + TRIGFLAG_STOMP, //Weapons->Stomp + TRIGFLAG_SCRIPT1, //Weapons->Custom Weapon 1 + TRIGFLAG_SCRIPT2, //Weapons->Custom Weapon 2 + TRIGFLAG_SCRIPT3, //Weapons->Custom Weapon 3 + TRIGFLAG_SCRIPT4, //Weapons->Custom Weapon 4 + TRIGFLAG_SCRIPT5, //Weapons->Custom Weapon 5 + TRIGFLAG_SCRIPT6, //Weapons->Custom Weapon 6 + TRIGFLAG_SCRIPT7, //Weapons->Custom Weapon 7 + TRIGFLAG_SCRIPT8, //Weapons->Custom Weapon 8 + TRIGFLAG_SCRIPT9, //Weapons->Custom Weapon 9 + TRIGFLAG_SCRIPT10, //Weapons->Custom Weapon 10 + TRIGFLAG_AUTO, //Other->Always Triggered + TRIGFLAG_TRIG_SECRETS, //Effects->Triggers Secrets + TRIGFLAG_INVERT_ITEMREQ, //States/Spawning->Invert Item Req + TRIGFLAG_CONSUME_ITEMREQ, //States/Spawning->Consume Item Req + TRIGFLAG_COUNTER_GE, //Counters->'Require >=' + TRIGFLAG_COUNTER_LT, //Counters->'Require <' + TRIGFLAG_COUNTER_EAT, //Counters->Consume Amount + TRIGFLAG_COUNTER_NOT_ONLY_TRIG_EAT, //Counters->Consume w/o trig + TRIGFLAG_LIGHTON, //Other->'Light On->' + TRIGFLAG_LIGHTOFF, //Other->'Light Off->' + TRIGFLAG_PUSH, //Other->'Push->' + TRIGFLAG_LENS_ON, //Other->'Lens On->' + TRIGFLAG_LENS_OFF, //Other->'Lens Off->' + TRIGFLAG_EW_ARROW, //EWeapons->Arrow + TRIGFLAG_EW_BRANG, //EWeapons->Boomerang + TRIGFLAG_EW_SWORD, //EWeapons->Sword + TRIGFLAG_EW_ROCK, //EWeapons->Rock //64 - TRIGFLAG_EW_SCRIPT1, - TRIGFLAG_EW_SCRIPT2, - TRIGFLAG_EW_SCRIPT3, - TRIGFLAG_EW_SCRIPT4, - TRIGFLAG_EW_SCRIPT5, - TRIGFLAG_EW_SCRIPT6, - TRIGFLAG_EW_SCRIPT7, - TRIGFLAG_EW_SCRIPT8, - TRIGFLAG_EW_SCRIPT9, - TRIGFLAG_EW_SCRIPT10, - TRIGFLAG_EW_MAGIC, - TRIGFLAG_EW_BBLAST, - TRIGFLAG_EW_SBBLAST, - TRIGFLAG_EW_LITBOMB, - TRIGFLAG_EW_LITSBOMB, - TRIGFLAG_EW_FIRETRAIL, - TRIGFLAG_EW_FLAME, - TRIGFLAG_EW_WIND, - TRIGFLAG_EW_FLAME2, - TRIGFLAG_EXST_ITEM, - TRIGFLAG_EXST_ENEMY, - TRIGFLAG_AUTOGRAB_ITEM, - TRIGFLAG_KILL_ENEMIES, - TRIGFLAG_SECRETSTR, - TRIGFLAG_THROWN, - TRIGFLAG_QUAKESTUN, - TRIGFLAG_SQUAKESTUN, - TRIGFLAG_ANYFIRE, - TRIGFLAG_STRONGFIRE, - TRIGFLAG_MAGICFIRE, - TRIGFLAG_DIVINEFIRE, + TRIGFLAG_EW_SCRIPT1, //EWeapons->Custom Weapon 1 + TRIGFLAG_EW_SCRIPT2, //EWeapons->Custom Weapon 2 + TRIGFLAG_EW_SCRIPT3, //EWeapons->Custom Weapon 3 + TRIGFLAG_EW_SCRIPT4, //EWeapons->Custom Weapon 4 + TRIGFLAG_EW_SCRIPT5, //EWeapons->Custom Weapon 5 + TRIGFLAG_EW_SCRIPT6, //EWeapons->Custom Weapon 6 + TRIGFLAG_EW_SCRIPT7, //EWeapons->Custom Weapon 7 + TRIGFLAG_EW_SCRIPT8, //EWeapons->Custom Weapon 8 + TRIGFLAG_EW_SCRIPT9, //EWeapons->Custom Weapon 9 + TRIGFLAG_EW_SCRIPT10, //EWeapons->Custom Weapon 10 + TRIGFLAG_EW_MAGIC, //EWeapons->Magic + TRIGFLAG_EW_BBLAST, //EWeapons->Bomb Blast + TRIGFLAG_EW_SBBLAST, //EWeapons->SBomb Blast + TRIGFLAG_EW_LITBOMB, //EWeapons->Lit Bomb + TRIGFLAG_EW_LITSBOMB, //EWeapons->Lit SBomb + TRIGFLAG_EW_FIRETRAIL, //EWeapons->Fire Trail + TRIGFLAG_EW_FLAME, //EWeapons->Flame + TRIGFLAG_EW_WIND, //EWeapons->Wind + TRIGFLAG_EW_FLAME2, //EWeapons->Flame 2 + TRIGFLAG_SPECIAL_ITEM, //States/Spawning->Spawns Special Item + TRIGFLAG_EXST_ITEM, //States/Spawning->Trigger ExState after item pickup + TRIGFLAG_EXST_ENEMY, //States/Spawning->Trigger ExState after enemy kill + TRIGFLAG_AUTOGRAB_ITEM, //States/Spawning->Spawned Item auto-collects + TRIGFLAG_KILL_ENEMIES, //Other->'Enemies->' + TRIGFLAG_SECRETSTR, //Other->'Secrets->' + TRIGFLAG_THROWN, //Weapons->Thrown + TRIGFLAG_QUAKESTUN, //Weapons->Quake Hammer + TRIGFLAG_SQUAKESTUN, //Weapons->S. Quake Hammer + TRIGFLAG_ANYFIRE, //Weapons->Any Fire + TRIGFLAG_STRONGFIRE, //Weapons->Strong Fire + TRIGFLAG_MAGICFIRE, //Weapons->Magic Fire + TRIGFLAG_DIVINEFIRE, //Weapons->Divine Fire //96 - TRIGFLAG_TRIGLEVELSTATE, - TRIGFLAG_LEVELSTATE, - TRIGFLAG_TRIGGLOBALSTATE, - TRIGFLAG_GLOBALSTATE, - TRIGFLAG_DO_KILL_ENEMIES, - TRIGFLAG_DO_CLEAR_ENEMIES, - TRIGFLAG_DO_CLEAR_LWEAPONS, - TRIGFLAG_DO_CLEAR_EWEAPONS, - TRIGFLAG_IGNITE_WEAPONS_ANY, - TRIGFLAG_IGNITE_WEAPONS_STRONG, - TRIGFLAG_IGNITE_WEAPONS_MAGIC, - TRIGFLAG_IGNITE_WEAPONS_DIVINE, - TRIGFLAG_SEPARATE_WEAPON_TRIGGERS, - TRIGFLAG_TGROUP_CONTRIB, - TRIGFLAG_TGROUP_LESS, - TRIGFLAG_TGROUP_GREATER, - TRIGFLAG_TRIG_PUSHED, - TRIGFLAG_TRIG_DIVE, - TRIGFLAG_TRIG_DIVE_SENS, - TRIGFLAG_REFARROW, - TRIGFLAG_REFFIRE, - TRIGFLAG_REFFIRE2, + TRIGFLAG_TRIGLEVELSTATE, //States/Spawning->'LevelState->' + TRIGFLAG_LEVELSTATE, //States/Spawning->'->LevelState' + TRIGFLAG_TRIGGLOBALSTATE, //States/Spawning->'GlobalState->' + TRIGFLAG_GLOBALSTATE, //States/Spawning->'->GlobalState' + TRIGFLAG_DO_KILL_ENEMIES, //Effects->Kill Enemies + TRIGFLAG_DO_CLEAR_ENEMIES, //Effects->Clear Enemies + TRIGFLAG_DO_CLEAR_LWEAPONS, //Effects->Clear LWeapons + TRIGFLAG_DO_CLEAR_EWEAPONS, //Effects->Clear EWeapons + TRIGFLAG_IGNITE_WEAPONS_ANY, //Effects->Ignite Weapon (Any) + TRIGFLAG_IGNITE_WEAPONS_STRONG, //Effects->Ignite Weapon (Strong) + TRIGFLAG_IGNITE_WEAPONS_MAGIC, //Effects->Ignite Weapon (Magic) + TRIGFLAG_IGNITE_WEAPONS_DIVINE, //Effects->Ignite Weapon (Divine) + TRIGFLAG_SEPARATE_WEAPON_TRIGGERS, //Effects->Weapon Separate Triggers + TRIGFLAG_TGROUP_CONTRIB, //States/Spawning->Contributes To TrigGroup + TRIGFLAG_TGROUP_LESS, //States/Spawning->'TrigGroup Less->' + TRIGFLAG_TGROUP_GREATER, //States/Spawning->'TrigGroup Greater->' + TRIGFLAG_TRIG_PUSHED, //Other->'Pushed->' + TRIGFLAG_TRIG_DIVE, //Other->'Dive->' + TRIGFLAG_TRIG_DIVE_SENS, //Other->'Dive-> (Sensitive)' + TRIGFLAG_REFARROW, //Weapons->Refl. Arrow + TRIGFLAG_REFFIRE, //Weapons->Refl. Fire + TRIGFLAG_REFFIRE2, //Weapons->Refl. Fire 2 TRIGFLAG_MAX_IN_USE, TRIGFLAG_MAX = 32*6