From a1414a4776e7abd7174275eb9ef387ff366d5c8e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 18 May 2021 12:11:54 +1000 Subject: [PATCH] Attempt to decompile func0f02ce8c --- src/files/setup/setupame.c | 28 +-- src/files/setup/setupark.c | 16 +- src/files/setup/setupazt.c | 12 +- src/files/setup/setupcave.c | 20 +- src/files/setup/setupdam.c | 14 +- src/files/setup/setupdepo.c | 2 +- src/files/setup/setupdish.c | 48 ++--- src/files/setup/setupear.c | 26 +-- src/files/setup/setupeld.c | 100 +++++----- src/files/setup/setupimp.c | 32 +-- src/files/setup/setuplee.c | 12 +- src/files/setup/setuplip.c | 14 +- src/files/setup/setuplue.c | 6 +- src/files/setup/setuppam.c | 8 +- src/files/setup/setuppete.c | 8 +- src/files/setup/setuprit.c | 14 +- src/files/setup/setupsev.c | 24 +-- src/files/setup/setupsho.c | 12 +- src/files/setup/setuptra.c | 4 +- src/files/setup/setupwax.c | 24 +-- src/game/chr/chr.c | 8 +- src/game/chr/chraction.c | 4 +- src/game/data/data_020df0.c | 308 ++++++++++++++--------------- src/game/game_02cde0.c | 176 ++++++++++++++--- src/game/mplayer/mplayer.c | 6 +- src/game/radar.c | 2 +- src/game/sight.c | 2 +- src/game/splat.c | 2 +- src/include/constants.h | 19 +- src/include/game/game_02cde0.h | 8 +- src/include/game/game_0b28d0.h | 2 +- src/include/game/mplayer/mplayer.h | 2 +- src/include/types.h | 19 +- 33 files changed, 556 insertions(+), 426 deletions(-) diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c index 6300dcb7c..8334cf40e 100644 --- a/src/files/setup/setupame.c +++ b/src/files/setup/setupame.c @@ -478,37 +478,37 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x0015, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x16, 0x0210, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_SHOCK_GUARD, -1, -1, 500, 100, CHRFLAG0_00002000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0016, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x17, 0x01c6, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 2000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x17, 0x01c6, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 2000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0017, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x18, 0x01c7, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x35, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x18, 0x01c7, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x35, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0018, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x19, 0x01c8, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x36, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x19, 0x01c8, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x36, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0019, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x1a, 0x01c9, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x1a, 0x01c9, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x001a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x1b, 0x01ca, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0C, 0x37, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1b, 0x01ca, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0C, 0x37, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x001b, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x1c, 0x01cb, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0C, 0x38, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1c, 0x01cb, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0C, 0x38, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x001c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x1d, 0x01cc, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0C, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x1d, 0x01cc, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0C, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x001d, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x1e, 0x01ce, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x39, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1e, 0x01ce, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x39, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x001e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x1f, 0x01cf, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0E, 0x3a, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1f, 0x01cf, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0E, 0x3a, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x001f, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x20, 0x01d0, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0F, 0x3b, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x20, 0x01d0, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, -1, -1, 1000, 100, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0F, 0x3b, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0020, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000, 0x21, 0x01d1, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_FALCON_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0F, 0x3c, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x21, 0x01d1, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_FALCON_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0F, 0x3c, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRFALCON2SIL, 0x0021, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_INVINCIBLE | OBJFLAG_00400000, 0, 0, WEAPON_FALCON2_SILENCER) weapon(0x0100, MODEL_CHRFALCON2SIL, 0x0021, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_INVINCIBLE | OBJFLAG_00400000 | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_FALCON2_SILENCER) link_guns(-1, -2) tag(0x61, -3) tag(0x62, -3) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, CHR_CASS, 0x01c2, BODY_CASSANDRA, HEAD_CASSANDRA, AILIST_INIT_CASS, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, CHR_SECRETARY, 0x01c3, BODY_NEGOTIATOR, HEAD_SECRETARY, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ONLYONPA | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, CHR_PROGRAMMER, 0x007a, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_PROGRAMMER, -1, -1, 50, 100, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, CHR_CASS, 0x01c2, BODY_CASSANDRA, HEAD_CASSANDRA, AILIST_INIT_CASS, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, CHR_SECRETARY, 0x01c3, BODY_NEGOTIATOR, HEAD_SECRETARY, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ONLYONPA | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, CHR_PROGRAMMER, 0x007a, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_PROGRAMMER, -1, -1, 50, 100, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 0, 0, 0, 0) tag(0x1f, 1) hovercar(0x004c, MODEL_DD_HOVCOP, 0x0144, OBJFLAG_00000008 | OBJFLAG_20000000, 0, 0, 100, AILIST_INIT_HOVERCAR) tag(0x20, 1) diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c index 3698fca15..741973d60 100644 --- a/src/files/setup/setupark.c +++ b/src/files/setup/setupark.c @@ -395,19 +395,19 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x000d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(0, 0x0e, 0x01c1, BODY_DDSHOCK, HEAD_DDSHOCK, GAILIST_IDLE, -1, -1, 50, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x0f, 0x01c2, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_TECH1, -1, -1, 50, 9, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x10, 0x01c3, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_TECH2, -1, -1, 50, 9, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE, 0x11, 0x01c5, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x0f, 0x01c2, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_TECH1, -1, -1, 50, 9, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x10, 0x01c3, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_TECH2, -1, -1, 50, 9, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE, 0x11, 0x01c5, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0011, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE, 0x12, 0x01c6, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE, 0x12, 0x01c6, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0012, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE, 0x13, 0x01c7, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE, 0x13, 0x01c7, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0013, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE, 0x14, 0x01c8, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE, 0x14, 0x01c8, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0014, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE, 0x15, 0x01cc, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE, 0x15, 0x01cc, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_TOP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0015, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x1c, 0x01c9, BODY_CASSANDRA, HEAD_CASSANDRA, AILIST_CASS, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x1c, 0x01c9, BODY_CASSANDRA, HEAD_CASSANDRA, AILIST_CASS, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x1d, 0x0206, BODY_MRBLONDE, HEAD_MRBLONDE, GAILIST_INVINCIBLE_AND_IDLE, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x1e, 0x0204, BODY_DDSHOCK, HEAD_DARLING, GAILIST_INVINCIBLE_AND_IDLE, -1, -1, 1000, 100, 0, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x1f, 0x0207, BODY_FEM_GUARD, HEAD_RANDOM, GAILIST_INVINCIBLE_AND_IDLE, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c index 0efee95e4..bb14ac15b 100644 --- a/src/files/setup/setupazt.c +++ b/src/files/setup/setupazt.c @@ -103,11 +103,11 @@ u32 props[] = { tag(0x09, 1) hoverbike(0x0100, MODEL_HOVBIKE, 0x0000, OBJFLAG_00000001 | OBJFLAG_00000100 | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_01000000 | OBJFLAG_04000000, OBJFLAG2_00000100 | OBJFLAG2_00000200 | OBJFLAG2_00004000 | OBJFLAG2_00100000 | OBJFLAG2_00200000, OBJFLAG3_PUSHABLE | OBJFLAG3_GRABBABLE | OBJFLAG3_GEOTYPE3, 1000) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x00, 0x0106, BODY_THEKING, HEAD_ELVIS, AILIST_INIT_ELVIS, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x00, 0x0106, BODY_THEKING, HEAD_ELVIS, AILIST_INIT_ELVIS, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAIANPISTOL, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_PHOENIX) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x38, 0x011f, BODY_THEKING, HEAD_ELVIS, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x38, 0x011f, BODY_THEKING, HEAD_ELVIS, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAIANPISTOL, 0x0038, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_PHOENIX) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x06, 0x0110, BODY_PRESIDENT, HEAD_PRESIDENT, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x06, 0x0110, BODY_PRESIDENT, HEAD_PRESIDENT, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x02, 0x010e, BODY_TRENT, HEAD_TRENT, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_NONCOMBAT, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357TRENT, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357LX) chr(SPAWNFLAG_00000200, 0x09, 0x005a, BODY_STRIPES, HEAD_RANDOM, 0x0408, -1, -1, 100, 13, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) @@ -156,8 +156,8 @@ u32 props[] = { chr(0, 0x29, 0x01be, BODY_CHICROB, 0x00, AILIST_INIT_ROBOT, -1, -1, 1000, 50, CHRFLAG0_SQUADALERTANYDIST, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x01, 0x01b5, BODY_TRENT, HEAD_TRENT, AILIST_TRENT_WAITING, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357TRENT, 0x0001, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357LX) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00008000 | SPAWNFLAG_00010000, 0x05, 0x01b6, BODY_PRESIDENT, HEAD_PRESIDENT, AILIST_INIT_PRESIDENT, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00008000, 0x08, 0x0086, BODY_PRESIDENT_CLONE2, HEAD_PRESIDENT, 0x041a, -1, -1, 1000, 20, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_09, -1, 0, 2, 0, 20, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_RTRACKED | SPAWNFLAG_BLUESIGHT, 0x05, 0x01b6, BODY_PRESIDENT, HEAD_PRESIDENT, AILIST_INIT_PRESIDENT, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_RTRACKED, 0x08, 0x0086, BODY_PRESIDENT_CLONE2, HEAD_PRESIDENT, 0x041a, -1, -1, 1000, 20, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_09, -1, 0, 2, 0, 20, 0) chr(SPAWNFLAG_00000200, 0x2a, 0x0088, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_INIT_BLONDE, -1, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00000080 | CHRFLAG1_LONG_CAMSPY_OBSERVATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 2, 0, 20, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x002a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(SPAWNFLAG_00000200, 0x2b, 0x0087, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_INIT_BLONDE, -1, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00000080 | CHRFLAG1_LONG_CAMSPY_OBSERVATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 2, 0, 20, 0) @@ -187,7 +187,7 @@ u32 props[] = { chr(SPAWNFLAG_00000200, 0x37, 0x0012, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_STARTING_AREA_GUARD, -1, -1, 100, 13, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_10000000, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0037, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) chr(0, 0x03, 0x0121, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, 0x04, 0x012f, BODY_SKEDAR, 0x00, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x04, 0x012f, BODY_SKEDAR, 0x00, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) tag(0x00, 1) stdobject(0x0100, MODEL_A51_CRATE1, 0xffff, OBJFLAG_00000001 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_00001000 | OBJFLAG_INVINCIBLE, 0, 0, 1000) tag(0x01, 1) diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c index 49ad56a0f..3d88f9e09 100644 --- a/src/files/setup/setupcave.c +++ b/src/files/setup/setupcave.c @@ -135,7 +135,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRDRAGON, 0x0000, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800, 0x01, 0x00d0, BODY_ALASKAN_GUARD, HEAD_RANDOM, GAILIST_IDLE, 0x0135, -1, 20, 20, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 7, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0001, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_00010000, 0x38, 0x00d1, BODY_STEWARDESS_COAT, HEAD_ANKA, GAILIST_IDLE, -1, -1, 200, 10, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 2, 0, 7, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_BLUESIGHT, 0x38, 0x00d1, BODY_STEWARDESS_COAT, HEAD_ANKA, GAILIST_IDLE, -1, -1, 200, 10, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 2, 0, 7, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800, 0x02, 0x00d3, BODY_ALASKAN_GUARD, HEAD_RANDOM, AILIST_ALASKAN_MOUNTAINLIFT_GUARD, 0x0135, -1, 200, 20, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 2, 0, 7, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800, 0x03, 0x0012, BODY_ALASKAN_GUARD, HEAD_RANDOM, 0x041b, 0x0135, -1, 200, 15, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 2, 0, 5, 0) @@ -148,9 +148,9 @@ u32 props[] = { weapon(0x0100, MODEL_CHRDRAGON, 0x0007, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x06, 0x00e8, BODY_ALASKAN_GUARD, HEAD_RANDOM, AILIST_INIT_ALASKAN_GUARD, -1, -1, 200, 14, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0006, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x39, 0x00c9, BODY_SECRETARY, HEAD_SECRETARY, AILIST_INIT_SECRETARY, -1, -1, 200, 14, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x3c, 0x00c6, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_OFFICE1, -1, -1, 200, 8, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x24, 0, 0, 1, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x3d, 0x00c5, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_OFFICE2, -1, -1, 200, 8, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x25, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x39, 0x00c9, BODY_SECRETARY, HEAD_SECRETARY, AILIST_INIT_SECRETARY, -1, -1, 200, 14, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x3c, 0x00c6, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_OFFICE1, -1, -1, 200, 8, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x24, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x3d, 0x00c5, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_INIT_OFFICE2, -1, -1, 200, 8, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x25, 0, 0, 1, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x08, 0x00c3, BODY_ALASKAN_GUARD, HEAD_RANDOM, AILIST_INIT_ALASKAN_GUARD, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0008, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x09, 0x0031, BODY_ALASKAN_GUARD, HEAD_RANDOM, 0x041c, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) @@ -161,7 +161,7 @@ u32 props[] = { chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x0b, 0x005b, BODY_ALASKAN_GUARD, HEAD_RANDOM, 0x041e, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x000b, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200, 0x11, 0x0072, BODY_NSA_LACKEY, HEAD_RANDOM, AILIST_NSA, 0x0072, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00000001 | CHRFLAG1_00000080 | CHRFLAG1_00000800, TEAM_ENEMY, SQUADRON_05, -1, 0, 1, 0, 0, 0) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x0c, 0x00c2, BODY_ALASKAN_GUARD, HEAD_RANDOM, AILIST_ALASKAN_CONSOLE_GUARD, 0x0156, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 5, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x0c, 0x00c2, BODY_ALASKAN_GUARD, HEAD_RANDOM, AILIST_ALASKAN_CONSOLE_GUARD, 0x0156, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 5, 0, 0) chr(SPAWNFLAG_00000200, 0x12, 0x00c1, BODY_NSA_LACKEY, HEAD_RANDOM, AILIST_INIT_TAKEOVER_LACKEY, -1, -1, 200, 100, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00000800, TEAM_ENEMY, SQUADRON_06, -1, 0, 2, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0012, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) tag(0x30, 2) @@ -238,19 +238,19 @@ u32 props[] = { weapon(0x0100, MODEL_CHRAVENGER, 0x0034, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x35, 0x0133, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_WARNED | CHRFLAG1_00000800 | CHRFLAG1_CAN_LOOK_AROUND, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0035, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x36, 0x00db, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_WARNED | CHRFLAG1_00000800, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x36, 0x00db, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_WARNED | CHRFLAG1_00000800, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0036, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x37, 0x0134, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_WARNED | CHRFLAG1_00000800 | CHRFLAG1_CAN_LOOK_AROUND, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0037, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x44, 0x0132, BODY_CIAGUY, HEAD_RANDOM, 0x0419, 0x0132, -1, 1000, 6, CHRFLAG0_00000004 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x45, 0x00b1, BODY_STEWARDESS, HEAD_RANDOM, 0x0419, 0x00b1, -1, 1000, 9, CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x46, 0x00e6, BODY_STEWARD, HEAD_RANDOM, 0x0419, 0x00e6, -1, 1000, 10, CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 1, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x44, 0x0132, BODY_CIAGUY, HEAD_RANDOM, 0x0419, 0x0132, -1, 1000, 6, CHRFLAG0_00000004 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x45, 0x00b1, BODY_STEWARDESS, HEAD_RANDOM, 0x0419, 0x00b1, -1, 1000, 9, CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x46, 0x00e6, BODY_STEWARD, HEAD_RANDOM, 0x0419, 0x00e6, -1, 1000, 10, CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 1, 0, 0, 0) chr(0, 0x42, 0x0136, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_WARNED | CHRFLAG1_00000800, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0042, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(0, 0x43, 0x0137, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_WARNED | CHRFLAG1_00000800, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0043, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(0, 0x47, 0x0138, BODY_TRENT, HEAD_TRENT, GAILIST_IDLE, 0x0135, -1, 20, 20, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 3, 0, 0, 7, 0) - chr(SPAWNFLAG_00000001, 0x48, 0x0139, BODY_STEWARDESS_COAT, HEAD_ANKA, GAILIST_IDLE, 0x0135, -1, 20, 20, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 3, 0, 0, 7, 0) + chr(SPAWNFLAG_FORCESUNGLASSES, 0x48, 0x0139, BODY_STEWARDESS_COAT, HEAD_ANKA, GAILIST_IDLE, 0x0135, -1, 20, 20, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 3, 0, 0, 7, 0) chr(0, 0x49, 0x013a, BODY_NSA_LACKEY, HEAD_RANDOM, GAILIST_INVINCIBLE_AND_IDLE, 0x0135, -1, 20, 20, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 3, 0, 0, 7, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0049, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(0, 0x4a, 0x013b, BODY_NSA_LACKEY, HEAD_RANDOM, GAILIST_IDLE, 0x0135, -1, 20, 20, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 3, 0, 0, 7, 0) diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c index d5fd08dcf..fc739f825 100644 --- a/src/files/setup/setupdam.c +++ b/src/files/setup/setupdam.c @@ -136,7 +136,7 @@ u32 props[] = { fail_flags(STAGEFLAG_ELVIS_DEAD) endobjective - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x00, 0x0024, BODY_THEKING, HEAD_ELVIS_GOGS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x00, 0x0024, BODY_THEKING, HEAD_ELVIS_GOGS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAIANPISTOL, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_PHOENIX) chr(0, 0x02, 0x0027, BODY_PELAGIC_GUARD, HEAD_MOTO, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_FARSIGHT) @@ -282,9 +282,9 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x0045, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x46, 0x0166, BODY_PELAGIC_GUARD, HEAD_RANDOM, AILIST_GUARD_UNALERTED, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_04, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0046, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x3c, 0x015c, BODY_PILOTAF1, HEAD_RANDOM, AILIST_INIT_PILOT, -1, -1, 1000, 10, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, 0, TEAM_04, SQUADRON_02, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x3e, 0x015e, BODY_PILOTAF1, HEAD_RANDOM, AILIST_INIT_PILOT, -1, -1, 1000, 10, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, 0, TEAM_04, SQUADRON_02, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x3f, 0x015f, BODY_PILOTAF1, HEAD_RANDOM, AILIST_INIT_PILOT, -1, -1, 1000, 10, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, 0, TEAM_04, SQUADRON_02, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x3c, 0x015c, BODY_PILOTAF1, HEAD_RANDOM, AILIST_INIT_PILOT, -1, -1, 1000, 10, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, 0, TEAM_04, SQUADRON_02, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x3e, 0x015e, BODY_PILOTAF1, HEAD_RANDOM, AILIST_INIT_PILOT, -1, -1, 1000, 10, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, 0, TEAM_04, SQUADRON_02, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x3f, 0x015f, BODY_PILOTAF1, HEAD_RANDOM, AILIST_INIT_PILOT, -1, -1, 1000, 10, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, 0, TEAM_04, SQUADRON_02, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200, 0x41, 0x0161, BODY_PELAGIC_GUARD, HEAD_RANDOM, AILIST_GUARD_UNALERTED, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_04, SQUADRON_03, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0041, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x42, 0x0162, BODY_PELAGIC_GUARD, HEAD_RANDOM, AILIST_GUARD_UNALERTED, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_04, SQUADRON_04, -1, 0, 0, 0, 0, 0) @@ -311,9 +311,9 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x0055, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x56, 0x0014, BODY_PELAGIC_GUARD, HEAD_RANDOM, 0x0407, -1, -1, 100, 100, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_02000000, TEAM_04, SQUADRON_0A, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0056, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x4e, 0x0209, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH1, 0x00d8, -1, 1000, 100, CHRFLAG0_CANT_ALERT_GROUP | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x50, 0x0055, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH2, 0x0089, -1, 1000, 100, CHRFLAG0_CANT_ALERT_GROUP | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 1, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x4f, 0x0057, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH3, 0x008b, -1, 1000, 100, CHRFLAG0_CANT_ALERT_GROUP | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x4e, 0x0209, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH1, 0x00d8, -1, 1000, 100, CHRFLAG0_CANT_ALERT_GROUP | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x50, 0x0055, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH2, 0x0089, -1, 1000, 100, CHRFLAG0_CANT_ALERT_GROUP | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 1, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x4f, 0x0057, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH3, 0x008b, -1, 1000, 100, CHRFLAG0_CANT_ALERT_GROUP | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0F, -1, 0, 2, 0, 0, 0) door(0x0100, MODEL_PELAGICDOOR, 0x00f0, OBJFLAG_ILLUMINATED | OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, DOORFLAG_WINDOWED, DOORTYPE_SLIDING, 0x00000000, 0x00000384, 0x012c0320, 0x00000000, 0x00000300) door(0x0100, MODEL_PELAGICDOOR, 0x00f1, OBJFLAG_ILLUMINATED | OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, DOORFLAG_WINDOWED, DOORTYPE_SLIDING, 0x00000000, 0x00000384, 0x012c0320, 0x00000000, 0x00000300) door(0x0100, MODEL_PELAGICDOOR, 0x00f2, OBJFLAG_ILLUMINATED | OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, DOORFLAG_WINDOWED, DOORTYPE_SLIDING, 0x00000000, 0x00000384, 0x012c0320, 0x00000000, 0x00000300) diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c index 7309cb315..07ec0c082 100644 --- a/src/files/setup/setupdepo.c +++ b/src/files/setup/setupdepo.c @@ -167,7 +167,7 @@ u32 props[] = { rename_object(-1, WEAPON_KEYCARD45, L_DEPO_014, L_DEPO_015, L_DEPO_016, L_DEPO_017, L_DEPO_018) // "Obtain alpha key card." // Between cloak rooms - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00000800 | SPAWNFLAG_00004000, 0x02, 0x005f, BODY_G5_GUARD, HEAD_RANDOM, GAILIST_UNALERTED, 0x0080, -1, 2000, 100, CHRFLAG0_00000004 | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00008000 | CHRFLAG0_CAN_TRAP | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_NONCOMBAT, SQUADRON_04, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_00000800 | SPAWNFLAG_FIXEDHEIGHT, 0x02, 0x005f, BODY_G5_GUARD, HEAD_RANDOM, GAILIST_UNALERTED, 0x0080, -1, 2000, 100, CHRFLAG0_00000004 | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00008000 | CHRFLAG0_CAN_TRAP | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_NONCOMBAT, SQUADRON_04, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) // Second cloak room diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c index 6c92a3fce..effda3cb7 100644 --- a/src/files/setup/setupdish.c +++ b/src/files/setup/setupdish.c @@ -259,15 +259,15 @@ u32 props[] = { stdobject(0x0019, MODEL_TARGET, 0x00d6, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED, OBJFLAG2_00004000 | OBJFLAG2_INVISIBLE, 0, 1000) stdobject(0x0019, MODEL_TARGET, 0x00d6, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED, OBJFLAG2_00004000 | OBJFLAG2_INVISIBLE, 0, 1000) stdobject(0x0019, MODEL_TARGET, 0x00d6, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED, OBJFLAG2_00004000 | OBJFLAG2_INVISIBLE, 0, 1000) - chr(SPAWNFLAG_00002000, 0x00, PAD_CARRINGTON_OFFICE, BODY_CARRINGTON, HEAD_CARRINGTON, AILIST_INIT_CARRINGTON, -1, -1, 1000, 4, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_00002000, 0x01, 0x00f8, BODY_CIFEMTECH, HEAD_SECRETARY, 0x0420, -1, -1, 1000, 4, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_00002000, 0x02, 0x00fa, BODY_CILABTECH, HEAD_CHRIST, 0x0424, -1, -1, 1000, 4, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_00002000, 0x03, 0x00f7, BODY_CILABTECH, HEAD_MARK2, 0x0421, -1, -1, 1000, 6, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_00002000, 0x04, 0x00f9, BODY_CIFEMTECH, HEAD_SECRETARY, 0x0422, -1, -1, 1000, 6, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_00002000, 0x05, 0x00fb, BODY_CILABTECH, HEAD_BRIAN, 0x0423, -1, -1, 1000, 6, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_00002000 | SPAWNFLAG_00004000, 0x06, 0x00fd, BODY_CILABTECH, HEAD_RUSS, 0x0425, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x01, 0, 0, 2, 0, 0) - chr(SPAWNFLAG_00002000 | SPAWNFLAG_00004000, 0x07, 0x00fc, BODY_CILABTECH, HEAD_BEAU1, 0x0426, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x00, 0, 0, 2, 0, 0) - chr(SPAWNFLAG_00002000 | SPAWNFLAG_00004000, 0x08, 0x00fe, BODY_CIFEMTECH, HEAD_SECRETARY, 0x0427, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x02, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_NOBLOOD, 0x00, PAD_CARRINGTON_OFFICE, BODY_CARRINGTON, HEAD_CARRINGTON, AILIST_INIT_CARRINGTON, -1, -1, 1000, 4, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_NOBLOOD, 0x01, 0x00f8, BODY_CIFEMTECH, HEAD_SECRETARY, 0x0420, -1, -1, 1000, 4, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_NOBLOOD, 0x02, 0x00fa, BODY_CILABTECH, HEAD_CHRIST, 0x0424, -1, -1, 1000, 4, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_NOBLOOD, 0x03, 0x00f7, BODY_CILABTECH, HEAD_MARK2, 0x0421, -1, -1, 1000, 6, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_NOBLOOD, 0x04, 0x00f9, BODY_CIFEMTECH, HEAD_SECRETARY, 0x0422, -1, -1, 1000, 6, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_NOBLOOD, 0x05, 0x00fb, BODY_CILABTECH, HEAD_BRIAN, 0x0423, -1, -1, 1000, 6, 0, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_NOBLOOD | SPAWNFLAG_FIXEDHEIGHT, 0x06, 0x00fd, BODY_CILABTECH, HEAD_RUSS, 0x0425, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x01, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_NOBLOOD | SPAWNFLAG_FIXEDHEIGHT, 0x07, 0x00fc, BODY_CILABTECH, HEAD_BEAU1, 0x0426, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x00, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_NOBLOOD | SPAWNFLAG_FIXEDHEIGHT, 0x08, 0x00fe, BODY_CIFEMTECH, HEAD_SECRETARY, 0x0427, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0D, 0x02, 0, 0, 2, 0, 0) tag(0x1e, 8) tag(0x1f, 8) tag(0x20, 8) @@ -4428,7 +4428,7 @@ u8 func1028_holo4_main[] = { unset_stage_flag(STAGEFLAG_GENERAL_PURPOSE) hide_object(0x45) hide_chr(0x04) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0274, AILIST_HOLO4_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x08) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0274, AILIST_HOLO4_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x08) label(0x08) dprint 't','r','a','i','n','i','n','g',0, label(0x91) @@ -4520,7 +4520,7 @@ u8 func0403_holo4_guard1[] = { label(0x2f) set_self_chrflag(CHRCFLAG_00000040) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0277, AILIST_HOLO4_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x08) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0277, AILIST_HOLO4_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x08) label(0x08) remove_hudmsgs show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_108) // "Now try against a moving target..." @@ -4541,7 +4541,7 @@ u8 func0404_holo4_guard2[] = { label(0x2f) set_self_chrflag(CHRCFLAG_00000040) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x027a, AILIST_HOLO4_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x0a) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x027a, AILIST_HOLO4_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x0a) label(0x0a) remove_hudmsgs show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_109) // "And finally against a target that fights back." @@ -4669,7 +4669,7 @@ u8 func1029_holo5_main[] = { unset_stage_flag(STAGEFLAG_GENERAL_PURPOSE) hide_object(0x45) hide_chr(0x04) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0126, AILIST_HOLO5_INIT_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x06) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0126, AILIST_HOLO5_INIT_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x06) label(0x06) yield dprint 't','r','a','i','n','i','n','g',0, @@ -4798,7 +4798,7 @@ u8 func0407_holo5_guard1[] = { show_hudmsg(CHR_BOND, L_DISH_090) // "Guard has been successfully disarmed." beginloop(0x59) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0272, AILIST_HOLO5_INIT_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x2f) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0272, AILIST_HOLO5_INIT_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x2f) endloop(0x59) label(0x2f) @@ -4880,7 +4880,7 @@ u8 func0409_holo5_guard2[] = { set_self_chrflag(CHRCFLAG_00000040) beginloop(0x57) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0125, AILIST_HOLO5_INIT_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x06) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0125, AILIST_HOLO5_INIT_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x06) endloop(0x57) label(0x06) @@ -5028,19 +5028,19 @@ u8 func102e_holo6_main[] = { hide_chr(0x04) beginloop(0x57) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0127, AILIST_HOLO6_INIT_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x59) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0127, AILIST_HOLO6_INIT_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x59) endloop(0x57) beginloop(0x59) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0128, AILIST_HOLO6_INIT_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x5b) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0128, AILIST_HOLO6_INIT_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x5b) endloop(0x59) beginloop(0x5b) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0129, AILIST_HOLO6_INIT_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x5c) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0129, AILIST_HOLO6_INIT_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x5c) endloop(0x5b) beginloop(0x5c) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012a, AILIST_HOLO6_INIT_GUARD4, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x5d) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012a, AILIST_HOLO6_INIT_GUARD4, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x5d) endloop(0x5c) label(0x5d) @@ -5437,23 +5437,23 @@ u8 func1030_holo7_main[] = { hide_chr(0x04) beginloop(0x57) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012b, AILIST_HOLO7_INIT_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x59) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012b, AILIST_HOLO7_INIT_GUARD1, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x59) endloop(0x57) beginloop(0x59) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012c, AILIST_HOLO7_INIT_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x5b) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012c, AILIST_HOLO7_INIT_GUARD2, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x5b) endloop(0x59) beginloop(0x5b) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012d, AILIST_HOLO7_INIT_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x5c) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012d, AILIST_HOLO7_INIT_GUARD3, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x5c) endloop(0x5b) beginloop(0x5c) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012e, AILIST_HOLO7_INIT_GUARD4, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x5d) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012e, AILIST_HOLO7_INIT_GUARD4, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x5d) endloop(0x5c) beginloop(0x5d) - try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012f, AILIST_HOLO7_INIT_GUARD5, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_00002000, /*goto*/ 0x5e) + try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x012f, AILIST_HOLO7_INIT_GUARD5, SPAWNFLAG_00000010 | SPAWNFLAG_00000200 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x5e) endloop(0x5d) label(0x5e) diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c index cc4c9d4d9..f3a6a0b61 100644 --- a/src/files/setup/setupear.c +++ b/src/files/setup/setupear.c @@ -308,13 +308,13 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x0033, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x00, 0x001f, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_PATH00, -1, -1, 1000, 100, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x01, 0x0135, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0019, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, 0x3c, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x01, 0x0135, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0019, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, 0x3c, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0001, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x02, 0x0136, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x001a, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, 0x3d, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x02, 0x0136, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x001a, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, 0x3d, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x3c, 0x0134, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x3c, 0x0134, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x003c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x03, 0x0137, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 100, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, 0x3e, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x03, 0x0137, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 100, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, 0x3e, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0003, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x04, 0x0111, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 100, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0004, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) @@ -334,13 +334,13 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x000e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x0f, 0x0115, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0060, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000f, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x10, 0x0116, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0060, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x10, 0x0116, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0060, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0010, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x11, 0x0117, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0065, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x11, 0x0117, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0065, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0011, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x12, 0x0118, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0065, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0012, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x13, 0x0119, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0069, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x13, 0x0119, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0069, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0013, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x14, 0x011a, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0069, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_01000000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0014, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) @@ -362,7 +362,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRDRAGON, 0x001c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200, 0x1d, 0x0123, BODY_DD_SHOCK_INF, HEAD_DDSHOCK, AILIST_INIT_BASIC_GUARD, -1, -1, 200, 100, CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x001d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x1e, 0x0124, BODY_DD_SHOCK_INF, HEAD_DDSHOCK, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 20, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x1e, 0x0124, BODY_DD_SHOCK_INF, HEAD_DDSHOCK, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 20, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x001e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200, 0x1f, 0x0125, BODY_DD_SHOCK_INF, HEAD_DDSHOCK, AILIST_INIT_BASIC_GUARD, -1, -1, 200, 20, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x001f, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) @@ -379,7 +379,7 @@ u32 props[] = { chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x3b, 0x013b, BODY_DD_SHOCK_INF, HEAD_DDSHOCK, AILIST_K7_GUARD, -1, -1, 1, 20, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x003b, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_INVINCIBLE | OBJFLAG_00400000, 0, 0, WEAPON_K7AVENGER) tag(0x04, -1) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x38, 0x013c, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_K7_SCIENTIST, 0x0076, -1, 1, 20, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x38, 0x013c, BODY_DD_LABTECH, HEAD_RANDOM, AILIST_K7_SCIENTIST, 0x0076, -1, 1, 20, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200, 0x29, 0x0155, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0E, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0029, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x2a, 0x0156, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0060, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0E, -1, 0, 0, 0, 0, 0) @@ -392,11 +392,11 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x002d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x2e, 0x0152, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, 0x0060, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002e, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x35, 0x0138, BODY_DD_LABTECH, HEAD_JAMIE, AILIST_INIT_SCIENTIST, 0x0076, -1, 1000, 10, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x36, 0x0139, BODY_DD_LABTECH, HEAD_JON, AILIST_INIT_SCIENTIST, -1, -1, 1000, 10, CHRFLAG0_00004000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 1, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x37, 0x013a, BODY_DD_LABTECH, HEAD_DUNCAN2, AILIST_INIT_SCIENTIST, -1, -1, 1000, 10, 0, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x35, 0x0138, BODY_DD_LABTECH, HEAD_JAMIE, AILIST_INIT_SCIENTIST, 0x0076, -1, 1000, 10, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x36, 0x0139, BODY_DD_LABTECH, HEAD_JON, AILIST_INIT_SCIENTIST, -1, -1, 1000, 10, CHRFLAG0_00004000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 1, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x37, 0x013a, BODY_DD_LABTECH, HEAD_DUNCAN2, AILIST_INIT_SCIENTIST, -1, -1, 1000, 10, 0, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 2, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x3a, 0x0106, BODY_DDSHOCK, HEAD_DARLING, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x39, 0x010c, BODY_DRCAROLL, 0x00, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x39, 0x010c, BODY_DRCAROLL, 0x00, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) tag(0x0b, 1) singlemonitor(0x0100, MODEL_SINISTERPC, 0x0246, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_ILLUMINATED, OBJFLAG2_00000001, OBJFLAG3_00010000 | OBJFLAG3_00200000, 1000, 3) tag(0x0c, 1) diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c index 21ac15245..121dd7d58 100644 --- a/src/files/setup/setupeld.c +++ b/src/files/setup/setupeld.c @@ -137,15 +137,15 @@ u32 props[] = { endobjective // Note these snipers are replaced with new ones further below. - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x00, 0x0192, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x00, 0x0192, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x01, 0x0193, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x01, 0x0193, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0001, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x02, 0x0194, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x02, 0x0194, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x05, 0x0197, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x05, 0x0197, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0005, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x06, 0x0198, BODY_DDSNIPER, HEAD_RANDOM, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA, 0x06, 0x0198, BODY_DDSNIPER, HEAD_RANDOM, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0006, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) tag(0x8e, 2) @@ -154,91 +154,91 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x019a, OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_CMP150) link_guns(-1, -2) - chr(SPAWNFLAG_00000001, 0x04, 0x0196, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES, 0x04, 0x0196, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0004, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001, 0x07, 0x0199, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES, 0x07, 0x0199, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0007, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001, 0x03, 0x0195, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES, 0x03, 0x0195, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 40, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0003, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONPA, 0x00, 0x0192, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONPA, 0x00, 0x0192, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONPA, 0x01, 0x0193, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONPA, 0x01, 0x0193, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0001, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONPA, 0x02, 0x0194, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONPA, 0x02, 0x0194, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONPA, 0x05, 0x0197, BODY_DDSNIPER, HEAD_RANDOM, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONPA, 0x05, 0x0197, BODY_DDSNIPER, HEAD_RANDOM, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0005, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONPA, 0x06, 0x0198, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONPA, 0x06, 0x0198, BODY_DDSNIPER, HEAD_DDSNIPER, AILIST_INIT_SNIPER, -1, -1, 500, 80, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0006, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SNIPERRIFLE) tag(0x8e, 2) tag(0x8f, 2) weapon(0x0100, MODEL_CHRCMP150, 0x019a, OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_CMP150) weapon(0x0100, MODEL_CHRCMP150, 0x019a, OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_CMP150) link_guns(-1, -2) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, CHR_NEGOTIATOR, 0x022b, BODY_SECRETARY, HEAD_SECRETARY, GAILIST_IDLE, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_ALLY, SQUADRON_00, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00000001, 0x4e, 0x0229, BODY_DD_GUARD, HEAD_JON, GAILIST_IDLE, -1, -1, 500, 150, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, CHR_NEGOTIATOR, 0x022b, BODY_SECRETARY, HEAD_SECRETARY, GAILIST_IDLE, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_ALLY, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES, 0x4e, 0x0229, BODY_DD_GUARD, HEAD_JON, GAILIST_IDLE, -1, -1, 500, 150, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x004e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001, 0x4f, 0x022a, BODY_DD_GUARD, HEAD_BEAU1, GAILIST_IDLE, -1, -1, 500, 150, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES, 0x4f, 0x022a, BODY_DD_GUARD, HEAD_BEAU1, GAILIST_IDLE, -1, -1, 500, 150, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x004f, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x08, 0x00b4, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE | CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x08, 0x00b4, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE | CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0008, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x09, 0x022f, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x09, 0x022f, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0009, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x0a, 0x019b, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE | CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x0a, 0x019b, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE | CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x0b, 0x00b8, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x0b, 0x00b8, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000b, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x0c, 0x0231, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE | CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x0c, 0x0231, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE | CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x0d, 0x0232, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x0d, 0x0232, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00200000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_SNIPE, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x23, 0x01b1, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x23, 0x01b1, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0023, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x24, 0x01b2, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x24, 0x01b2, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0024, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x25, 0x01b3, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x25, 0x01b3, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0025, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x26, 0x01b4, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x26, 0x01b4, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_02, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0026, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x27, 0x01b5, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x27, 0x01b5, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0027, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x28, 0x01b6, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x28, 0x01b6, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0028, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x29, 0x01b7, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x29, 0x01b7, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0029, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x2a, 0x01b8, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x2a, 0x01b8, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_03, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x2b, 0x01b9, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_04, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x2b, 0x01b9, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_04, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002b, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x2c, 0x01ba, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_04, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x2c, 0x01ba, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_04, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x2d, 0x01bb, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_05, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x2d, 0x01bb, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_05, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x2e, 0x01bc, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_05, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x2e, 0x01bc, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_05, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA | SPAWNFLAG_00000200, 0x2f, 0x01bd, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA | SPAWNFLAG_00000200, 0x2f, 0x01bd, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002f, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA | SPAWNFLAG_00000200, 0x30, 0x01be, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ONLYONA | SPAWNFLAG_ONLYONSA | SPAWNFLAG_00000200, 0x30, 0x01be, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0030, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x31, 0x01bf, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x31, 0x01bf, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0031, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x32, 0x01c0, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x32, 0x01c0, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0032, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x33, 0x01c1, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x33, 0x01c1, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0033, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x34, 0x01c2, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x34, 0x01c2, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_BACKOFF | CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0034, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x35, 0x01c3, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_08, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x35, 0x01c3, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0035, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x36, 0x01c4, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_08, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x36, 0x01c4, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0036, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x3d, 0x01cb, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x003d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x37, 0x01c5, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_09, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x37, 0x01c5, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_09, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0037, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x38, 0x01c6, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_09, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x38, 0x01c6, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_09, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0038, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_00000200, 0x39, 0x01c7, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_09, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_00000200, 0x39, 0x01c7, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_RETREAT | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_00200000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_09, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0039, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x3a, 0x01c8, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE2_GUARD, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00002000 | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_0A, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x003a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) @@ -274,18 +274,18 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x004a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(0, 0x4b, 0x01d9, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_BASEMENT_GUARD, -1, -1, 500, 50, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_10000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_0F, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x004b, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x51, 0x00dc, BODY_CARRINGTON, HEAD_CARRINGTON, AILIST_CARRINGTON, -1, -1, 500, 50, 0, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000 | SPAWNFLAG_00008000, 0x52, 0x022c, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_HACKER, -1, -1, 500, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, 0x8d, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x51, 0x00dc, BODY_CARRINGTON, HEAD_CARRINGTON, AILIST_CARRINGTON, -1, -1, 500, 50, 0, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_RTRACKED, 0x52, 0x022c, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_HACKER, -1, -1, 500, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, 0x8d, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0052, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000 | SPAWNFLAG_00008000, 0x53, 0x022d, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_HACKER, -1, -1, 500, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_00, 0x8b, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_RTRACKED, 0x53, 0x022d, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_HACKER, -1, -1, 500, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_00, 0x8b, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0053, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_00004000 | SPAWNFLAG_00008000, 0x54, 0x022e, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_HACKER, -1, -1, 500, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, 0x8c, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_RTRACKED, 0x54, 0x022e, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_HACKER, -1, -1, 500, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000, 0, TEAM_20, SQUADRON_00, 0x8c, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0054, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x4c, 0x0096, BODY_DD_GUARD, HEAD_RANDOM, AILIST_PATH01, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_LOOK_AROUND, TEAM_20, SQUADRON_0C, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x004c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x4d, 0x0085, BODY_DD_GUARD, HEAD_RANDOM, AILIST_PATH02, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_0C, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x004d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x55, 0x0234, BODY_CISOLDIER, HEAD_RANDOM, AILIST_CISOLIDER, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR, 0, TEAM_NONCOMBAT, SQUADRON_0C, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x55, 0x0234, BODY_CISOLDIER, HEAD_RANDOM, AILIST_CISOLIDER, -1, -1, 500, 50, CHRFLAG0_CAN_FLANK | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR, 0, TEAM_NONCOMBAT, SQUADRON_0C, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSNIPERRIFLE, 0x0055, OBJFLAG_ASSIGNEDTOCHR, OBJFLAG2_EXCLUDE_A | OBJFLAG2_EXCLUDE_SA, 0, WEAPON_SNIPERRIFLE) tinted_glass(0x0100, MODEL_WINDOW, 0x0151, OBJFLAG_00000002 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000100 | OBJFLAG_00000200 | OBJFLAG_00000800 | OBJFLAG_INVINCIBLE | OBJFLAG_DEACTIVATED, OBJFLAG2_00004000 | OBJFLAG2_00100000 | OBJFLAG2_00200000, 0, 1000, 0x012c0258) tinted_glass(0x0100, MODEL_WINDOW, 0x0152, OBJFLAG_00000002 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000100 | OBJFLAG_00000200 | OBJFLAG_00000800 | OBJFLAG_INVINCIBLE | OBJFLAG_DEACTIVATED, OBJFLAG2_00004000 | OBJFLAG2_00100000 | OBJFLAG2_00200000, 0, 1000, 0x012c0258) diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c index 4da974e67..3cce5adb0 100644 --- a/src/files/setup/setupimp.c +++ b/src/files/setup/setupimp.c @@ -282,18 +282,18 @@ u32 props[] = { stdobject(0x0100, MODEL_DD_CHAIR, 0x0220, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, 0x0222, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED, OBJFLAG2_00004000, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_GOODPC, 0x0221, OBJFLAG_00000001 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_ILLUMINATED, 0, 0, 1000) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x02, 0x00fa, BODY_CILABTECH, HEAD_CHRIST, AILIST_INIT_HOSTAGE_FR1, 0x00b7, -1, 1000, 6, 0, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x02, 0x00fa, BODY_CILABTECH, HEAD_CHRIST, AILIST_INIT_HOSTAGE_FR1, 0x00b7, -1, 1000, 6, 0, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) weapon(0x0100, MODEL_CHRFALCON2, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_FALCON2) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x07, 0x0013, BODY_CILABTECH, HEAD_BEAU1, AILIST_INIT_HOSTAGE_FR2, 0x00b7, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_0D, 0x00, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x07, 0x0013, BODY_CILABTECH, HEAD_BEAU1, AILIST_INIT_HOSTAGE_FR2, 0x00b7, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_0D, 0x00, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRFALCON2, 0x0007, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_FALCON2) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x04, 0x0103, BODY_CIFEMTECH, HEAD_SECRETARY, AILIST_INIT_HOSTAGE_HOLO, -1, -1, 1000, 6, 0, CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x01, 0x010b, BODY_CIFEMTECH, HEAD_SECRETARY, AILIST_INIT_HOSTAGE_DEVICE_F, -1, -1, 1000, 6, 0, CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x06, 0x00fd, BODY_CILABTECH, HEAD_RUSS, AILIST_INIT_HOSTAGE_DEVICE_M, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_0D, 0x01, 0, 0, 2, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x03, 0x010c, BODY_CILABTECH, HEAD_MARK2, AILIST_INIT_HOSTAGE_INFO_M, -1, -1, 1000, 6, 0, CHRFLAG1_00000001 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x08, 0x00f7, BODY_CIFEMTECH, HEAD_SECRETARY, AILIST_INIT_HOSTAGE_INFO_F, -1, -1, 0, 0, 0, CHRFLAG1_00000001 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_0D, 0x02, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x04, 0x0103, BODY_CIFEMTECH, HEAD_SECRETARY, AILIST_INIT_HOSTAGE_HOLO, -1, -1, 1000, 6, 0, CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x01, 0x010b, BODY_CIFEMTECH, HEAD_SECRETARY, AILIST_INIT_HOSTAGE_DEVICE_F, -1, -1, 1000, 6, 0, CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x06, 0x00fd, BODY_CILABTECH, HEAD_RUSS, AILIST_INIT_HOSTAGE_DEVICE_M, -1, -1, 0, 0, CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_0D, 0x01, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x03, 0x010c, BODY_CILABTECH, HEAD_MARK2, AILIST_INIT_HOSTAGE_INFO_M, -1, -1, 1000, 6, 0, CHRFLAG1_00000001 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x08, 0x00f7, BODY_CIFEMTECH, HEAD_SECRETARY, AILIST_INIT_HOSTAGE_INFO_F, -1, -1, 0, 0, 0, CHRFLAG1_00000001 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_0D, 0x02, 0, 0, 2, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x05, 0x00fb, BODY_CILABTECH, HEAD_BRIAN, GAILIST_IDLE, 0x00fb, -1, 1000, 6, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_05, -1, 0, 2, 0, 0, 0) weapon(0x0100, MODEL_CHRFALCON2, 0x0005, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_FALCON2) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x00, 0x0142, BODY_CARREVENINGSUIT, HEAD_CARRINGTON, GAILIST_IDLE, 0x0142, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x00, 0x0142, BODY_CARREVENINGSUIT, HEAD_CARRINGTON, GAILIST_IDLE, 0x0142, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) chr(0, 0x0c, 0x0133, BODY_DDSHOCK, HEAD_RANDOM, AILIST_SPAWNER1, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x000c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(SPAWNFLAG_ONLYONPA, 0x0d, 0x0134, BODY_DDSHOCK, HEAD_RANDOM, AILIST_SPAWNER2, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) @@ -360,15 +360,15 @@ u32 props[] = { weapon(0x0100, MODEL_CHRMAULER, 0x002d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) chr(0, 0x30, 0x00ff, BODY_MRBLONDE, HEAD_MRBLONDE, GAILIST_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0030, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) - chr(SPAWNFLAG_00004000, 0x31, 0x0100, BODY_SKEDAR, HEAD_RANDOM, GAILIST_INVINCIBLE_AND_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x31, 0x0100, BODY_SKEDAR, HEAD_RANDOM, GAILIST_INVINCIBLE_AND_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0031, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) - chr(SPAWNFLAG_00004000, 0x32, 0x0101, BODY_SKEDAR, HEAD_RANDOM, GAILIST_INVINCIBLE_AND_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x32, 0x0101, BODY_SKEDAR, HEAD_RANDOM, GAILIST_INVINCIBLE_AND_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0032, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) - chr(SPAWNFLAG_00004000, 0x33, 0x0102, BODY_SKEDAR, HEAD_RANDOM, GAILIST_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x33, 0x0102, BODY_SKEDAR, HEAD_RANDOM, GAILIST_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00001000 | CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0033, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) - chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_00004000, 0x34, 0x003a, BODY_SKEDAR, HEAD_RANDOM, GAILIST_STOP_AND_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_FIXEDHEIGHT, 0x34, 0x003a, BODY_SKEDAR, HEAD_RANDOM, GAILIST_STOP_AND_IDLE, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0034, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) - chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_00010000, 0x38, 0x0051, BODY_CISOLDIER, HEAD_JONATHAN, AILIST_INIT_JONATHAN, 0x0051, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_BLUESIGHT, 0x38, 0x0051, BODY_CISOLDIER, HEAD_JONATHAN, AILIST_INIT_JONATHAN, 0x0051, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357, 0x0038, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357MAGNUM) tag(0x06, 1) autogun(0x00a6, MODEL_CI_ROOFGUN, 0x0235, OBJFLAG_00000004, OBJFLAG2_00000001 | OBJFLAG2_00002000, 0, 1000, 0x0075, 0x00005555, 0xffffaaab, 0x00000aaa, 0x00320000) @@ -1760,7 +1760,7 @@ u8 func041a_hostage_holo[] = { play_sound_from_entity(CHANNEL_7, CHR_SELF, 0x0bb8, 0x1770, 0x01) label(0x08) label(0x08) - try_spawn_chr_at_pad(BODY_CIFEMTECH, HEAD_SECRETARY, 0x0104, AILIST_INIT_HOLOCLONE1, SPAWNFLAG_00000010 | SPAWNFLAG_00002000, /*goto*/ 0x2e) + try_spawn_chr_at_pad(BODY_CIFEMTECH, HEAD_SECRETARY, 0x0104, AILIST_INIT_HOLOCLONE1, SPAWNFLAG_00000010 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x2e) label(0x2e) yield yield @@ -1772,7 +1772,7 @@ u8 func041a_hostage_holo[] = { yield yield yield - try_spawn_chr_at_pad(BODY_CIFEMTECH, HEAD_SECRETARY, 0x0105, AILIST_INIT_HOLOCLONE2, SPAWNFLAG_00000010 | SPAWNFLAG_00002000, /*goto*/ 0x2e) + try_spawn_chr_at_pad(BODY_CIFEMTECH, HEAD_SECRETARY, 0x0105, AILIST_INIT_HOLOCLONE2, SPAWNFLAG_00000010 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x2e) label(0x2e) yield yield @@ -1785,7 +1785,7 @@ u8 func041a_hostage_holo[] = { yield yield yield - try_spawn_chr_at_pad(BODY_CIFEMTECH, HEAD_SECRETARY, 0x0106, AILIST_INIT_HOLOCLONE3, SPAWNFLAG_00000010 | SPAWNFLAG_00002000, /*goto*/ 0x2e) + try_spawn_chr_at_pad(BODY_CIFEMTECH, HEAD_SECRETARY, 0x0106, AILIST_INIT_HOLOCLONE3, SPAWNFLAG_00000010 | SPAWNFLAG_NOBLOOD, /*goto*/ 0x2e) label(0x2e) set_ailist(CHR_TAKER_HOLO1, AILIST_TAKER_HOLO1) set_ailist(CHR_TAKER_HOLO2, AILIST_TAKER_HOLO2) diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c index 5c0a25780..9d1ce2b3e 100644 --- a/src/files/setup/setuplee.c +++ b/src/files/setup/setuplee.c @@ -177,12 +177,12 @@ u32 props[] = { weapon(0x0100, MODEL_CHRMAULER, 0x0009, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) chr(0, 0x0a, 0x010d, BODY_SKEDAR, HEAD_RANDOM, AILIST_HANGARSPAWNER, -1, -1, 1000, 200, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x000a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) - chr(SPAWNFLAG_00010000, 0x2e, 0x01d8, BODY_ELVIS1, HEAD_MAIAN_S, AILIST_INIT_HANGAR_MAIAN, 0x00b4, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x2e, 0x01d8, BODY_ELVIS1, HEAD_MAIAN_S, AILIST_INIT_HANGAR_MAIAN, 0x00b4, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAIANSMG, 0x002e, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CALLISTO) - chr(SPAWNFLAG_00010000, 0x2f, 0x01d9, BODY_ELVIS1, HEAD_MAIAN_S, AILIST_INIT_HANGAR_MAIAN, 0x00b4, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x2f, 0x01d9, BODY_ELVIS1, HEAD_MAIAN_S, AILIST_INIT_HANGAR_MAIAN, 0x00b4, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAIANSMG, 0x002f, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_CALLISTO) - chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_00010000, 0x30, 0x01f5, BODY_ELVIS1, HEAD_MAIAN_S, GAILIST_IDLE, 0x00b4, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x00, 0x00fe, BODY_ELVISWAISTCOAT, HEAD_ELVIS, AILIST_ELVIS_WAIT_FOR_HANGAR_ENTRY, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_80000000, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_BLUESIGHT, 0x30, 0x01f5, BODY_ELVIS1, HEAD_MAIAN_S, GAILIST_IDLE, 0x00b4, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x00, 0x00fe, BODY_ELVISWAISTCOAT, HEAD_ELVIS, AILIST_ELVIS_WAIT_FOR_HANGAR_ENTRY, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00004000 | CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_80000000, TEAM_NONCOMBAT, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAIANPISTOL, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_PHOENIX) weapon(0x0100, MODEL_CHRMAIANPISTOL, 0x0000, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_PHOENIX) link_guns(-1, -2) @@ -244,7 +244,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRMAULER, 0x0025, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) chr(SPAWNFLAG_00000200, 0x26, 0x0088, BODY_SKEDAR, HEAD_RANDOM, AILIST_INIT_BRIDGE1AND2, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_10000000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0026, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x2d, 0x00a4, BODY_SKEDAR, HEAD_RANDOM, AILIST_INIT_BRIDGE3, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_10000000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x2d, 0x00a4, BODY_SKEDAR, HEAD_RANDOM, AILIST_INIT_BRIDGE3, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_10000000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x002d, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_MAULER) weapon(0x0100, MODEL_CHRMAULER, 0x002d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) link_guns(-1, -2) @@ -255,7 +255,7 @@ u32 props[] = { chr(0, 0x32, 0x0096, BODY_SKEDAR, HEAD_RANDOM, 0x0415, -1, -1, 1000, 200, CHRFLAG0_00000004 | CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0032, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) chr(0, 0x33, 0x00db, BODY_CASSANDRA, HEAD_CASSANDRA, AILIST_INIT_CASS, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_10000000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, 0x34, 0x00e3, BODY_SKEDAR, 0x00, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_10000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00000080, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x34, 0x00e3, BODY_SKEDAR, 0x00, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_10000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00000080, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0034, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) chr(SPAWNFLAG_00000200, 0x27, 0x0002, BODY_SKEDAR, HEAD_RANDOM, AILIST_INIT_SKEDAR, -1, -1, 1000, 200, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0E, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRMAULER, 0x0027, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAULER) diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c index 3a784ab6c..a118e6a77 100644 --- a/src/files/setup/setuplip.c +++ b/src/files/setup/setuplip.c @@ -202,23 +202,23 @@ u32 props[] = { weapon(0x0100, MODEL_CHRDRAGON, 0x0010, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) chr(SPAWNFLAG_00000200, 0x11, 0x03ae, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_SUPERDRAGON_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0011, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) - chr(SPAWNFLAG_00010000, 0x3a, 0x03af, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH_RECORDS, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_05, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x3a, 0x03af, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH_RECORDS, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_05, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200, 0x27, 0x03bf, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_SUPERDRAGON_GUARD, -1, -1, 100, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_05, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0027, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) chr(SPAWNFLAG_00000200, 0x28, 0x03c0, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_SUPERDRAGON_GUARD, -1, -1, 100, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_05, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0028, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) chr(SPAWNFLAG_00000200, 0x12, 0x03b1, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_SUPERDRAGON_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0012, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) - chr(SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x3b, 0x03d8, BODY_LABTECH, HEAD_RANDOM, AILIST_LABTECH_LIGHTS, -1, -1, 1000, 6, CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_06, 0x3b, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x3b, 0x03d8, BODY_LABTECH, HEAD_RANDOM, AILIST_LABTECH_LIGHTS, -1, -1, 1000, 6, CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_06, 0x3b, 0, 0, 1, 0, 0) chr(SPAWNFLAG_00000200, 0x13, 0x03b2, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_SUPERDRAGON_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0013, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) - chr(SPAWNFLAG_00010000, 0x3c, 0x03c9, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH_DOORS, 0x03c8, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00010000, 0x42, 0x03b3, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH_DOORS, 0x03c9, -1, 1000, 100, CHRFLAG0_00000004 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x3c, 0x03c9, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH_DOORS, 0x03c8, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x42, 0x03b3, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH_DOORS, 0x03c9, -1, 1000, 100, CHRFLAG0_00000004 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200, 0x14, 0x00f7, BODY_AREA51GUARD, HEAD_RANDOM, 0x0409, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0014, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) chr(SPAWNFLAG_00000200, 0x15, 0x00f0, BODY_AREA51GUARD, HEAD_RANDOM, 0x040a, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0015, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) - chr(SPAWNFLAG_00010000, 0x3d, 0x03b4, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH, -1, -1, 1000, 100, 0, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x3d, 0x03b4, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH, -1, -1, 1000, 100, 0, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200, 0x18, 0x00c7, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_SUPERDRAGON_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0018, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) chr(SPAWNFLAG_00000200, 0x1e, 0x0130, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_SUPERDRAGON_GUARD, 0x0132, -1, 1000, 100, CHRFLAG0_00000004 | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00008000 | CHRFLAG0_CAN_TRAP | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 0, 0, 0) @@ -277,7 +277,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRSONICSCREWER, 0x0040, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_UNCOLLECTABLE, 0, 0, WEAPON_52) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x41, 0x03dc, BODY_BIOTECH, HEAD_BIOTECH, AILIST_INIT_BIOTECH2, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_NONCOMBAT, SQUADRON_0E, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSONICSCREWER, 0x0041, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_UNCOLLECTABLE, 0, 0, WEAPON_52) - chr(SPAWNFLAG_00010000, 0x43, 0x01de, BODY_OVERALL, HEAD_RANDOM, AILIST_INIT_MECHANIC, -1, -1, 1000, 5, CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x43, 0x01de, BODY_OVERALL, HEAD_RANDOM, AILIST_INIT_MECHANIC, -1, -1, 1000, 5, CHRFLAG0_00004000 | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 0, 0, 0) tag(0x2f, 1) hover_prop(0x0100, MODEL_HOVERBED, 0x03bd, OBJFLAG_00000001 | OBJFLAG_00000100 | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_01000000 | OBJFLAG_04000000, OBJFLAG2_00000100 | OBJFLAG2_00000200 | OBJFLAG2_00004000 | OBJFLAG2_00100000 | OBJFLAG2_00200000, OBJFLAG3_PUSHABLE | OBJFLAG3_GRABBABLE | OBJFLAG3_00100000, 1000, 0x00010000) chr(0, 0x44, 0x0196, BODY_A51AIRMAN, HEAD_RANDOM, AILIST_HIDDENGUY, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_00, -1, 0, 0, 0, 0, 0) @@ -287,7 +287,7 @@ u32 props[] = { chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x48, 0x020a, BODY_A51AIRMAN, HEAD_JONATHAN, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357, 0x0048, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357MAGNUM) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x49, 0x0197, BODY_A51AIRMAN, HEAD_RANDOM, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x38, 0x0134, BODY_ELVIS1, HEAD_ELVIS, AILIST_ALIEN, -1, -1, 2000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_NONCOMBAT, SQUADRON_09, 0x1a, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x38, 0x0134, BODY_ELVIS1, HEAD_ELVIS, AILIST_ALIEN, -1, -1, 2000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_NONCOMBAT, SQUADRON_09, 0x1a, 0, 0, 1, 0, 0) door_scale(0x00008000) tag(0x35, 1) lift(0x0100, MODEL_A51_LIFT_STORE, 0x0334, OBJFLAG_00000008 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_ILLUMINATED | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_00400000 | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_00000100 | OBJFLAG2_00000200 | OBJFLAG2_00004000 | OBJFLAG2_00100000 | OBJFLAG2_00200000, 0, 1000, 0x0334, 0x0335, -1, -1, 0x00000001, 0x00000002, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x20000000) diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c index 9f4fc27b4..e0e9720ce 100644 --- a/src/files/setup/setuplue.c +++ b/src/files/setup/setuplue.c @@ -167,7 +167,7 @@ u32 props[] = { door(0x0100, MODEL_A51_VERT_DOOR_ST, 0x0331, OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000e666, 0x0000e666, 0x00008e38, 0x00008e38, 0x00000444, 0, DOORTYPE_SLIDING, 0x00000000, 0x0000012c, 0x00000000, 0xffffffff, 0x00000000) lift_door(-2, -7, 1) lift_door(-2, -8, 1) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x00, 0x0354, BODY_A51TROOPER, HEAD_RANDOM, AILIST_TROOPER_UNALERTED, -1, -1, 10000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x00, 0x0354, BODY_A51TROOPER, HEAD_RANDOM, AILIST_TROOPER_UNALERTED, -1, -1, 10000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRLEEGUN1, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_MAGSEC4) weapon(0x0100, MODEL_CHRGRENADE, 0x0000, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_20000000, 0, 0, WEAPON_GRENADE) chr(SPAWNFLAG_00000200, 0x01, 0x0355, BODY_A51TROOPER, HEAD_RANDOM, AILIST_TROOPER_UNALERTED, -1, -1, 10000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) @@ -207,7 +207,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRDRAGON, 0x0012, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200, 0x13, 0x035b, BODY_A51AIRMAN, HEAD_RANDOM, AILIST_DRAGON_UNALERTED, -1, -1, 1000, 20, CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0013, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000800 | SPAWNFLAG_00010000, 0x30, 0x0358, BODY_OVERALL, HEAD_RANDOM, AILIST_MECHANIC, -1, -1, 1000, 5, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_DRAW_PISTOL, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_00000800 | SPAWNFLAG_BLUESIGHT, 0x30, 0x0358, BODY_OVERALL, HEAD_RANDOM, AILIST_MECHANIC, -1, -1, 1000, 5, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_CAN_DRAW_PISTOL, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) tag(0x0a, 1) key(0x0080, MODEL_KEYCARD, 0x0030, OBJFLAG_ASSIGNEDTOCHR, 0, 0, 0) rename_object(-1, WEAPON_KEYCARD4B, L_LUE_031, L_LUE_032, L_LUE_033, L_LUE_034, L_LUE_035) // "Obtain lift key card." @@ -245,7 +245,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRDRAGON, 0x0024, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_DRAGON) chr(0, 0x25, 0x01ce, BODY_A51AIRMAN, HEAD_RANDOM, 0x0419, 0x007d, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0025, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x31, 0x0196, BODY_A51AIRMAN, HEAD_JONATHAN, 0x0425, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x31, 0x0196, BODY_A51AIRMAN, HEAD_JONATHAN, 0x0425, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357, 0x0031, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357MAGNUM) chr(0, 0x32, 0x0197, BODY_A51TROOPER, HEAD_RANDOM, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0A, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0032, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_DRAGON) diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c index 0e63ab70a..44cb9b7ba 100644 --- a/src/files/setup/setuppam.c +++ b/src/files/setup/setuppam.c @@ -144,9 +144,9 @@ u32 props[] = { weapon(0x0100, MODEL_CHRSHOTGUN, 0x0040, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) #if VERSION >= VERSION_PAL_FINAL - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x00, 0x002e, BODY_THEKING, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x00, 0x002e, BODY_THEKING, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) #else - chr(SPAWNFLAG_00010000, 0x00, 0x002e, BODY_THEKING, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x00, 0x002e, BODY_THEKING, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000 | CHRFLAG1_40000000 | CHRFLAG1_80000000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) #endif weapon(0x0100, MODEL_CHRZ2020, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_FARSIGHT) @@ -224,7 +224,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x0020, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_IGNORECOLLISION, 0x22, 0x0192, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_BLONDE, -1, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ALLY, SQUADRON_0F, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0022, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) - chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x24, 0x0193, BODY_DRCAROLL, 0x00, GAILIST_IDLE, -1, -1, 100, 100, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ALLY, SQUADRON_05, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x24, 0x0193, BODY_DRCAROLL, 0x00, GAILIST_IDLE, -1, -1, 100, 100, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ALLY, SQUADRON_05, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0024, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(SPAWNFLAG_IGNORECOLLISION, 0x23, 0x0194, BODY_MRBLONDE, HEAD_MRBLONDE, AILIST_BLONDE, -1, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ALLY, SQUADRON_0F, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0023, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) @@ -249,7 +249,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x003e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(0, 0x3f, 0x0012, BODY_PELAGIC_GUARD, HEAD_RANDOM, GAILIST_IDLE, -1, -1, 100, 30, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x003f, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x21, 0x0117, BODY_SKEDAR, HEAD_RANDOM, AILIST_DEAD_SKEDAR, -1, -1, 100, 100, CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x21, 0x0117, BODY_SKEDAR, HEAD_RANDOM, AILIST_DEAD_SKEDAR, -1, -1, 100, 100, CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0, 0, 0, 0) tag(0x75, 1) door(0x0100, MODEL_CETANDOOR, 0x0157, OBJFLAG_DEACTIVATED, OBJFLAG2_LOCKEDBACK | OBJFLAG2_AICANNOTUSE, 0, 1000, 0x00007333, 0x00006666, 0x00035555, 0x00035555, 0x00000222, DOORFLAG_0004, DOORTYPE_VERTICAL, 0x00000002, 0x0000012c, 0x00000000, 0x00000000, 0x00001700) tag(0xae, 1) diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c index 4d7c8255e..c35076755 100644 --- a/src/files/setup/setuppete.c +++ b/src/files/setup/setuppete.c @@ -145,7 +145,7 @@ u32 props[] = { fail_flags(STAGEFLAG_ELEVATOR_SEALED) endobjective - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_00010000, 0x1a, 0x00a9, BODY_CIAGUY, HEAD_RANDOM, AILIST_INIT_CIA1, -1, -1, 1000, 6, CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_BLUESIGHT, 0x1a, 0x00a9, BODY_CIAGUY, HEAD_RANDOM, AILIST_INIT_CIA1, -1, -1, 1000, 6, CHRFLAG0_00004000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200, 0x00, 0x00aa, BODY_G5_GUARD, HEAD_RANDOM, 0x0414, -1, -1, 1000, 10, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0000, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_ONLYONSA | SPAWNFLAG_ONLYONPA, 0x17, 0x00ab, BODY_FBIGUY, HEAD_RANDOM, 0x0411, -1, -1, 800, 30, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_00, -1, 0, 0, 0, 0, 0) @@ -175,8 +175,8 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x0009, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200, 0x0c, 0x00b8, BODY_G5_GUARD, HEAD_RANDOM, 0x0418, -1, -1, 500, 10, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_05, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_00010000, 0x1c, 0x00b9, BODY_CIAGUY, HEAD_RANDOM, AILIST_CIA, -1, -1, 1000, 6, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_05, -1, 0, 1, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_00010000, 0x1d, 0x0042, BODY_CIAGUY, HEAD_RANDOM, AILIST_CIA, -1, -1, 1000, 6, CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_BLUESIGHT, 0x1c, 0x00b9, BODY_CIAGUY, HEAD_RANDOM, AILIST_CIA, -1, -1, 1000, 6, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_05, -1, 0, 1, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_BLUESIGHT, 0x1d, 0x0042, BODY_CIAGUY, HEAD_RANDOM, AILIST_CIA, -1, -1, 1000, 6, CHRFLAG0_00002000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_05, -1, 0, 2, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x0d, 0x00bf, BODY_G5_GUARD, HEAD_RANDOM, AILIST_SEALER1, -1, -1, 1000, 15, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00004000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x000d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x0e, 0x00bc, BODY_G5_GUARD, HEAD_RANDOM, 0x040e, 0x00c5, -1, 1000, 15, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) @@ -185,7 +185,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRCMP150, 0x000f, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x10, 0x00be, BODY_G5_GUARD, HEAD_RANDOM, 0x040e, 0x00c7, -1, 1000, 15, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0010, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_00010000, 0x1b, 0x00b2, BODY_CIAGUY, HEAD_RANDOM, AILIST_BUGSPOTTER, -1, -1, 1000, 6, CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00000800 | SPAWNFLAG_BLUESIGHT, 0x1b, 0x00b2, BODY_CIAGUY, HEAD_RANDOM, AILIST_BUGSPOTTER, -1, -1, 1000, 6, CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_01, -1, 0, 0, 0, 0, 0) chr(0, 0x11, 0x00c9, BODY_G5_GUARD, HEAD_RANDOM, GAILIST_IDLE, 0x00c9, -1, 1000, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_01000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0011, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(0, 0x12, 0x00ca, BODY_G5_GUARD, HEAD_RANDOM, GAILIST_IDLE, 0x00ca, -1, 1000, 30, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00002000 | CHRFLAG0_00004000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_01000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_20, SQUADRON_07, -1, 0, 0, 0, 0, 0) diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c index 37985a5d5..7330055ae 100644 --- a/src/files/setup/setuprit.c +++ b/src/files/setup/setuprit.c @@ -170,8 +170,8 @@ u32 props[] = { chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x34, 0x00bd, BODY_MRBLONDE, HEAD_MRBLONDE, GAILIST_IDLE, -1, -1, 200, 100, CHRFLAG0_CANT_ALERT_GROUP | CHRFLAG0_CAN_RETREAT | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_NOHEAR, CHRFLAG1_WARNED | CHRFLAG1_00000800 | CHRFLAG1_00001000 | CHRFLAG1_00100000, TEAM_NONCOMBAT, SQUADRON_0F, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x0034, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x01, 0x008b, BODY_OVERALL, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x008b, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ONLYONSA | SPAWNFLAG_ONLYONPA | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x1b, 0x008c, BODY_STEWARDESS, HEAD_RANDOM, AILIST_STEWARDESS, 0x00b2, -1, 2000, 5, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, CHRFLAG1_00000001 | CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 1, 0, 0) - chr(SPAWNFLAG_ONLYONSA | SPAWNFLAG_ONLYONPA | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x1c, 0x00c1, BODY_STEWARD, HEAD_RANDOM, AILIST_STEWARD, 0x001f, -1, 2000, 5, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, CHRFLAG1_00000001 | CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_ONLYONSA | SPAWNFLAG_ONLYONPA | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x1b, 0x008c, BODY_STEWARDESS, HEAD_RANDOM, AILIST_STEWARDESS, 0x00b2, -1, 2000, 5, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, CHRFLAG1_00000001 | CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_ONLYONSA | SPAWNFLAG_ONLYONPA | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x1c, 0x00c1, BODY_STEWARD, HEAD_RANDOM, AILIST_STEWARD, 0x001f, -1, 2000, 5, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, CHRFLAG1_00000001 | CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 1, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x04, 0x008e, BODY_OVERALL, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x008e, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00000001 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x05, 0x008f, BODY_OVERALL, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x008f, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00000001 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x06, 0x0090, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x0090, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) @@ -186,15 +186,15 @@ u32 props[] = { chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x0f, 0x0099, BODY_PRES_SECURITY, HEAD_RANDOM, 0x0427, 0x0002, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x10, 0x009a, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x009a, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x11, 0x009b, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x0004, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x18, 0x00a0, BODY_PRESIDENT, HEAD_PRESIDENT, GAILIST_IDLE, 0x00a0, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x18, 0x00a0, BODY_PRESIDENT, HEAD_PRESIDENT, GAILIST_IDLE, 0x00a0, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x12, 0x009c, BODY_PRES_SECURITY, HEAD_RANDOM, 0x0428, 0x0003, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x13, 0x009d, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x0002, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x14, 0x009e, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x0020, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_00000200 | SPAWNFLAG_ANTINONINTERACTABLE, 0x15, 0x009f, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_INIT_NEUTRAL, 0x00bb, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_00001000 | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x16, 0x00ca, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_TYPING_GUY, 0x00b2, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0A, 0x11, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000, 0x17, 0x00c9, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_SITTING_GUY, 0x001f, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0A, 0x10, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x19, 0x00c7, BODY_PILOTAF1, HEAD_ROSS, AILIST_TYPING_GUY, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0B, 0x12, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00000001 | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00004000 | SPAWNFLAG_00010000, 0x1a, 0x00c8, BODY_PILOTAF1, HEAD_WONG, AILIST_SITTING_GUY, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0B, 0x13, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x16, 0x00ca, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_TYPING_GUY, 0x00b2, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0A, 0x11, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT, 0x17, 0x00c9, BODY_PRES_SECURITY, HEAD_RANDOM, AILIST_SITTING_GUY, 0x001f, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0A, 0x10, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x19, 0x00c7, BODY_PILOTAF1, HEAD_ROSS, AILIST_TYPING_GUY, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0B, 0x12, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FORCESUNGLASSES | SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_FIXEDHEIGHT | SPAWNFLAG_BLUESIGHT, 0x1a, 0x00c8, BODY_PILOTAF1, HEAD_WONG, AILIST_SITTING_GUY, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_0B, 0x13, 0, 0, 0, 0, 0) chr(0, 0x1d, 0x00a5, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_WARNED | CHRFLAG1_00000800 | CHRFLAG1_00001000 | CHRFLAG1_00100000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRAVENGER, 0x001d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_K7AVENGER) chr(0, 0x1e, 0x00a6, BODY_STRIPES, HEAD_RANDOM, AILIST_INIT_STRIPES, -1, -1, 200, 100, CHRFLAG0_00002000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_WARNED | CHRFLAG1_00000800 | CHRFLAG1_00001000 | CHRFLAG1_00100000, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c index 5eacedb28..9d0df5427 100644 --- a/src/files/setup/setupsev.c +++ b/src/files/setup/setupsev.c @@ -76,9 +76,9 @@ u32 props[] = { fail_flags(STAGEFLAG_TRAPPED_AT_START) endobjective - chr(SPAWNFLAG_00004000, CHR_LABTECH1, 0x03dc, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 4, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, CHR_LABTECH1, 0x03dc, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 4, 0, 0) - chr(SPAWNFLAG_00004000, CHR_LABTECH2, 0x012d, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, CHR_LABTECH2, 0x012d, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_LABTECH, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRFALCON2, CHR_LABTECH2, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_FALCON2) chr(SPAWNFLAG_00000200, 0x00, 0x0128, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) @@ -87,10 +87,10 @@ u32 props[] = { chr(SPAWNFLAG_00000200, 0x01, 0x0126, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0001, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x02, 0x0399, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, 0x3f, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x02, 0x0399, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, 0x3f, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0002, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x03, 0x039a, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 2000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, 0x40, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x03, 0x039a, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 2000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_02, 0x40, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0003, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) chr(SPAWNFLAG_00000200, 0x04, 0x0393, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) @@ -131,30 +131,30 @@ u32 props[] = { chr(SPAWNFLAG_00000200, 0x14, 0x03b2, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0014, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00004000, 0x15, 0x03c9, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, 0x03c8, -1, 1000, 100, CHRFLAG0_00000004 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 4, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x15, 0x03c9, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, 0x03c8, -1, 1000, 100, CHRFLAG0_00000004 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 4, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0015, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00004000, 0x16, 0x03b3, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, 0x03c9, -1, 1000, 100, CHRFLAG0_00000004 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 4, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x16, 0x03b3, BODY_LABTECH, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, 0x03c9, -1, 1000, 100, CHRFLAG0_00000004 | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 4, 0, 0) weapon(0x0100, MODEL_CHRDRUGGUN, 0x0016, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_TRANQUILIZER) weapon(0x0100, MODEL_CHRDRUGGUN, 0x0016, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_20000000, 0, 0, WEAPON_PSYCHOSISGUN) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x17, 0x039e, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x41, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x17, 0x039e, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x41, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0017, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x18, 0x039b, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x42, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x18, 0x039b, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x42, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0018, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x19, 0x039d, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x43, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x19, 0x039d, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x43, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x0019, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x1a, 0x039c, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x44, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x1a, 0x039c, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_INIT_80HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0A, 0x44, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRDRAGON, 0x001a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DRAGON) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x46, 0x03c2, BODY_LABTECH, HEAD_RANDOM, GAILIST_UNALERTED, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x46, 0x03c2, BODY_LABTECH, HEAD_RANDOM, GAILIST_UNALERTED, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRDRUGGUN, 0x0046, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_TRANQUILIZER) weapon(0x0100, MODEL_CHRDRUGGUN, 0x0046, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_20000000, 0, 0, WEAPON_PSYCHOSISGUN) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x47, 0x011c, BODY_LABTECH, HEAD_RANDOM, GAILIST_UNALERTED, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 4, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x47, 0x011c, BODY_LABTECH, HEAD_RANDOM, GAILIST_UNALERTED, -1, -1, 1000, 100, CHRFLAG0_00008000 | CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_08000000 | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_CAN_DRAW_PISTOL, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 4, 0, 0) weapon(0x0100, MODEL_CHRDRUGGUN, 0x0047, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_TRANQUILIZER) weapon(0x0100, MODEL_CHRDRUGGUN, 0x0047, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_20000000, 0, 0, WEAPON_PSYCHOSISGUN) diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c index c8a26ba9f..38611a251 100644 --- a/src/files/setup/setupsho.c +++ b/src/files/setup/setupsho.c @@ -219,12 +219,12 @@ u32 props[] = { chr(0, 0x34, 0x00ce, BODY_SKEDAR, HEAD_RANDOM, AILIST_KING_SKEDAR_SPAWNER, -1, -1, 1000, 9, CHRFLAG0_00000004, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) ammocrate(0x0100, MODEL_CHRUZI, 0x0034, OBJFLAG_ASSIGNEDTOCHR, 0, 0, 1000, AMMOTYPE_FARSIGHT) chr(0, 0x35, 0x00cf, BODY_MINISKEDAR, HEAD_RANDOM, AILIST_KING_MINISKEDAR_SPAWNER, -1, -1, 1000, 9, CHRFLAG0_00000004, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00010000, 0x36, 0x00d9, BODY_ELVISWAISTCOAT, HEAD_ELVIS, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, 0x37, 0x000f, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, 0x38, 0x0010, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, 0x39, 0x0011, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, 0x3a, 0x0012, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, 0x3b, 0x0018, BODY_SKEDARKING, HEAD_RANDOM, GAILIST_IDLE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_BLUESIGHT, 0x36, 0x00d9, BODY_ELVISWAISTCOAT, HEAD_ELVIS, AILIST_HIDE, -1, -1, 1000, 200, CHRFLAG0_00002000, CHRFLAG1_00100000 | CHRFLAG1_00200000, TEAM_ALLY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x37, 0x000f, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x38, 0x0010, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x39, 0x0011, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x3a, 0x0012, BODY_SKEDAR, HEAD_RANDOM, AILIST_HIDE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x3b, 0x0018, BODY_SKEDARKING, HEAD_RANDOM, GAILIST_IDLE, 0x00d8, -1, 1000, 9, CHRFLAG0_00002000, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_KINGSCEPTRE, 0x003b, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_NONE) conditional_scenery(1, 0, 2) debris(0x0100, MODEL_SKCREV_UNEXP1, 0x00e5, OBJFLAG_00000008 | OBJFLAG_00000020 | OBJFLAG_00000040 | OBJFLAG_00000080 | OBJFLAG_00000100 | OBJFLAG_ILLUMINATED | OBJFLAG_UNCOLLECTABLE | OBJFLAG_00400000 | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_00000100 | OBJFLAG2_00000200 | OBJFLAG2_00004000 | OBJFLAG2_00100000 | OBJFLAG2_00200000, OBJFLAG3_40000000, 1000) diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c index 36ea97c3b..252b4be01 100644 --- a/src/files/setup/setuptra.c +++ b/src/files/setup/setuptra.c @@ -187,9 +187,9 @@ u32 props[] = { weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0015, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_SUPERDRAGON) chr(SPAWNFLAG_00000200, 0x16, 0x03f8, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_HIDDEN_GUARDTYPE1, -1, -1, 1000, 100, CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0C, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0016, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SUPERDRAGON) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x21, 0x03f9, BODY_A51AIRMAN, HEAD_JONATHAN, AILIST_INIT_JONATHAN, -1, -1, 1000, 100, CHRFLAG0_04000000 | CHRFLAG0_08000000, CHRFLAG1_00100000 | CHRFLAG1_80000000, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x21, 0x03f9, BODY_A51AIRMAN, HEAD_JONATHAN, AILIST_INIT_JONATHAN, -1, -1, 1000, 100, CHRFLAG0_04000000 | CHRFLAG0_08000000, CHRFLAG1_00100000 | CHRFLAG1_80000000, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357, 0x0021, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_DY357MAGNUM) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, 0x22, 0x010a, BODY_ELVIS1, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_04000000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ALLY, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x22, 0x010a, BODY_ELVIS1, HEAD_ELVIS, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_04000000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ALLY, SQUADRON_03, -1, 0, 0, 0, 0, 0) chr(0, 0x17, 0x0119, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_HIDDEN_GUARDTYPE2, -1, -1, 1000, 100, CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSUPERDRAGON, 0x0017, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_SUPERDRAGON) chr(0, 0x18, 0x0111, BODY_AREA51GUARD, HEAD_RANDOM, AILIST_HIDDEN_GUARDTYPE2, -1, -1, 1000, 100, CHRFLAG0_AIVSAI | CHRFLAG0_04000000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_0D, -1, 0, 0, 0, 0, 0) diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c index 696dab83d..05436d36b 100644 --- a/src/files/setup/setupwax.c +++ b/src/files/setup/setupwax.c @@ -367,13 +367,13 @@ u32 props[] = { chr(SPAWNFLAG_00000200, 0x09, 0x0081, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 100, 100, CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00100000 | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_08000000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_02000000, TEAM_ENEMY, SQUADRON_04, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0009, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00004000, 0x1e, 0x01ce, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00100000 | CHRFLAG0_08000000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x39, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1e, 0x01ce, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00100000 | CHRFLAG0_08000000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x39, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x001e, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00004000, 0x1f, 0x01cf, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_08000000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x3a, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1f, 0x01cf, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_08000000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x3a, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x001f, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00004000, 0x20, 0x01d0, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00100000 | CHRFLAG0_08000000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x3b, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x20, 0x01d0, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_00100000 | CHRFLAG0_08000000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_05, 0x3b, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0020, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) chr(SPAWNFLAG_00000200, 0x07, 0x0058, BODY_FEM_GUARD, HEAD_RANDOM, 0x0404, -1, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_02000000, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) @@ -385,22 +385,22 @@ u32 props[] = { chr(SPAWNFLAG_00000200, 0x0c, 0x0060, BODY_FEM_GUARD, HEAD_RANDOM, 0x0405, -1, -1, 100, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_02000000, TEAM_ENEMY, SQUADRON_06, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x000c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00004000, 0x18, 0x01c7, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_07, 0x35, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x18, 0x01c7, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_07, 0x35, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0018, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00004000, 0x19, 0x01c8, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_07, 0x36, 0, 0, 2, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x19, 0x01c8, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_07, 0x36, 0, 0, 2, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x0019, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x1a, 0x01c9, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_00100000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x1a, 0x01c9, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00002000 | CHRFLAG0_00100000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_07, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x001a, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00004000, 0x1b, 0x01ca, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_08, 0x37, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1b, 0x01ca, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_08, 0x37, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x001b, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00004000, 0x1c, 0x01cb, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_08, 0x38, 0, 0, 3, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, 0x1c, 0x01cb, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_08, 0x38, 0, 0, 3, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x001c, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x1d, 0x01cc, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00100000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x1d, 0x01cc, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_60HP_GUARD, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00100000 | CHRFLAG0_CAN_HEARSPAWN | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRSHOTGUN, 0x001d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_SHOTGUN) chr(SPAWNFLAG_00000200, 0x08, 0x0028, BODY_DDSHOCK, HEAD_DDSHOCK, 0x0408, -1, -1, 500, 100, CHRFLAG0_00000080 | CHRFLAG0_CAN_RETREAT | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, 0, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) @@ -409,7 +409,7 @@ u32 props[] = { chr(SPAWNFLAG_00000200, 0x0d, 0x006f, BODY_DDSHOCK, HEAD_DDSHOCK, 0x0409, -1, -1, 100, 100, CHRFLAG0_00000080 | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00002000, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357, 0x000d, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357MAGNUM) - chr(SPAWNFLAG_00000200 | SPAWNFLAG_00004000, 0x17, 0x01c6, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_40HP_GUARD, -1, -1, 2000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_00002000, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 1, 0, 0) + chr(SPAWNFLAG_00000200 | SPAWNFLAG_FIXEDHEIGHT, 0x17, 0x01c6, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_40HP_GUARD, -1, -1, 2000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, CHRFLAG1_DOINGIDLEANIMATION | CHRFLAG1_00002000, TEAM_ENEMY, SQUADRON_09, -1, 0, 0, 1, 0, 0) weapon(0x0100, MODEL_CHRDY357, 0x0017, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357MAGNUM) chr(SPAWNFLAG_00000200, 0x06, 0x0011, BODY_DDSHOCK, HEAD_DDSHOCK, 0x0407, 0x001d, -1, 1000, 9, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_NOHEAR, CHRFLAG1_00000080 | CHRFLAG1_00002000 | CHRFLAG1_LONG_CAMSPY_OBSERVATION, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) @@ -418,8 +418,8 @@ u32 props[] = { chr(SPAWNFLAG_00000200, 0x05, 0x01c0, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_40HP_GUARD, 0x001e, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_00000080 | CHRFLAG0_CAN_RETREAT | CHRFLAG0_UNSURPRISABLE | CHRFLAG0_CAN_THROW_GRENADES | CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_00200000 | CHRFLAG0_08000000 | CHRFLAG0_NOHEAR, CHRFLAG1_00002000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRDY357, 0x0005, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_DY357MAGNUM) - chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_00010000, CHR_CASS, 0x0133, BODY_CASSANDRA, HEAD_CASSANDRA, AILIST_INIT_CASS, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) - chr(SPAWNFLAG_00004000, CHR_CHIEF, 0x0223, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_CHIEF, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, CHR_CASS, 0x0133, BODY_CASSANDRA, HEAD_CASSANDRA, AILIST_INIT_CASS, -1, -1, 1000, 100, CHRFLAG0_UNSURPRISABLE | CHRFLAG0_00004000 | CHRFLAG0_00008000 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) + chr(SPAWNFLAG_FIXEDHEIGHT, CHR_CHIEF, 0x0223, BODY_FEM_GUARD, HEAD_RANDOM, AILIST_INIT_CHIEF, -1, -1, 1000, 100, CHRFLAG0_00002000 | CHRFLAG0_00008000 | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_NOHEAR | CHRFLAG0_CANLOSEGUN, CHRFLAG1_DOINGIDLEANIMATION, TEAM_ENEMY, SQUADRON_0B, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRFALCON2, CHR_CHIEF, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_FALCON2) weapon(0x0100, MODEL_CHRFALCON2, CHR_CHIEF, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_DEACTIVATED, 0, 0, WEAPON_FALCON2) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 458009bf5..90778926c 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -4491,8 +4491,8 @@ void chrInit(struct prop *prop, u8 *ailist) chr->poisonprop = NULL; chr->lastshooter = -1; chr->timeshooter = 0; - chr->unk32c_19 = 0; - chr->unk32c_20 = 0; + chr->noblood = false; + chr->rtracked = false; #if VERSION >= VERSION_NTSC_1_0 chr->goposhitcount = 0; @@ -12385,7 +12385,7 @@ void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 ibh, struct coord return; } - if (chr->unk32c_19) { + if (chr->noblood) { return; } @@ -15429,7 +15429,7 @@ void func0f028590(f32 arg0) } if (checksum != CHECKSUM_PLACEHOLDER) { - g_HeadsAndBodies[BODY_SKEDARKING].bodyfileid = 0; + g_HeadsAndBodies[BODY_SKEDARKING].filenum = 0; } } #endif diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 8c463aad0..0ba88f492 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -31011,8 +31011,8 @@ struct prop *chrSpawnAtCoord(s32 bodynum, s32 headnum, struct coord *pos, s16 *r chr->hidden2 |= CHRH2FLAG_0080; #endif - if (spawnflags & SPAWNFLAG_00002000) { - chr->unk32c_19 = true; + if (spawnflags & SPAWNFLAG_NOBLOOD) { + chr->noblood = true; } return prop; diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index e93434eb6..d6180704e 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -3465,160 +3465,160 @@ struct modeltype g_ModelTypeRobot = { // 22f24 struct headorbody g_HeadsAndBodies[] = { // ismale - // | height - // | | - { /*0x0000*/ 1, 0, 0, 167, FILE_CDJBOND, 1, 1.0446009635925, 0, FILE_GHAND_DDSECURITY }, - { /*0x0001*/ 1, 0, 0, 167, FILE_CCONNERY, 1, 1.0300469398499, 0, FILE_GHAND_MRBLONDE }, - { /*0x0002*/ 1, 0, 0, 165, FILE_CDALTON, 1, 1.0572769641876, 0, FILE_GHAND_DDSECURITY }, - { /*0x0003*/ 1, 0, 0, 167, FILE_CMOORE, 1, 1.0399061441422, 0, FILE_GHAND_DDSECURITY }, - { /*0x0004*/ 0, 1, 1, 13, FILE_CHEADDARK_COMBAT, 1, 1, 0, 0 }, - { /*0x0005*/ 1, 1, 3, 27, FILE_CHEADELVIS, 1, 1, 0, 0 }, - { /*0x0006*/ 1, 1, 0, 13, FILE_CHEADROSS, 1, 1, 0, 0 }, - { /*0x0007*/ 1, 1, 0, 13, FILE_CHEADCARRINGTON, 1, 1, 0, 0 }, - { /*0x0008*/ 1, 1, 5, 13, FILE_CHEADMRBLONDE, 1, 1, 0, 0 }, - { /*0x0009*/ 1, 1, 0, 13, FILE_CHEADTRENT, 1, 1, 0, 0 }, - { /*0x000a*/ 1, 1, 0, 13, FILE_CHEADDDSHOCK, 1, 1, 0, 0 }, - { /*0x000b*/ 1, 1, 0, 13, FILE_CHEADGRAHAM, 1, 1, 0, 0 }, - { /*0x000c*/ 0, 1, 1, 13, FILE_CHEADDARK_FROCK, 1, 1, 0, 0 }, - { /*0x000d*/ 0, 1, 1, 13, FILE_CHEADSECRETARY, 1, 1, 0, 0 }, - { /*0x000e*/ 0, 1, 4, 13, FILE_CHEADCASSANDRA, 1, 1, 0, 0 }, - { /*0x000f*/ 1, 1, 3, 27, FILE_CHEADTHEKING, 1, 1, 0, 0 }, - { /*0x0010*/ 0, 1, 0, 13, FILE_CHEADFEM_GUARD, 1, 1, 0, 0 }, - { /*0x0011*/ 1, 1, 0, 13, FILE_CHEADJON, 1, 1, 0, 0 }, - { /*0x0012*/ 1, 1, 0, 13, FILE_CHEADMARK2, 1, 1, 0, 0 }, - { /*0x0013*/ 1, 1, 0, 13, FILE_CHEADCHRIST, 1, 1, 0, 0 }, - { /*0x0014*/ 1, 1, 0, 13, FILE_CHEADRUSS, 1, 1, 0, 0 }, - { /*0x0015*/ 1, 1, 3, 13, FILE_CHEADGREY, 1, 1, 0, 0 }, - { /*0x0016*/ 1, 1, 0, 13, FILE_CHEADDARLING, 1, 1, 0, 0 }, - { /*0x0017*/ 1, 1, 0, 13, FILE_CHEADROBERT, 1, 1, 0, 0 }, - { /*0x0018*/ 1, 1, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, - { /*0x0019*/ 0, 1, 0, 13, FILE_CHEADFEM_GUARD2, 1, 1, 0, 0 }, - { /*0x001a*/ 1, 1, 0, 13, FILE_CHEADBRIAN, 1, 1, 0, 0 }, - { /*0x001b*/ 1, 1, 0, 13, FILE_CHEADJAMIE, 1, 1, 0, 0 }, - { /*0x001c*/ 1, 1, 0, 13, FILE_CHEADDUNCAN2, 1, 1, 0, 0 }, - { /*0x001d*/ 1, 1, 0, 13, FILE_CHEADBIOTECH, 1, 1, 0, 0 }, - { /*0x001e*/ 1, 1, 0, 13, FILE_CHEADNEIL2, 1, 1, 0, 0 }, - { /*0x001f*/ 1, 1, 0, 13, FILE_CHEADEDMCG, 1, 1, 0, 0 }, - { /*0x0020*/ 0, 1, 1, 13, FILE_CHEADANKA, 1, 1, 0, 0 }, - { /*0x0021*/ 0, 1, 1, 13, FILE_CHEADLESLIE_S, 1, 1, 0, 0 }, - { /*0x0022*/ 1, 1, 0, 13, FILE_CHEADMATT_C, 1, 1, 0, 0 }, - { /*0x0023*/ 1, 1, 0, 13, FILE_CHEADPEER_S, 1, 1, 0, 0 }, - { /*0x0024*/ 0, 1, 1, 13, FILE_CHEADEILEEN_T, 1, 1, 0, 0 }, - { /*0x0025*/ 1, 1, 0, 13, FILE_CHEADANDY_R, 1, 1, 0, 0 }, - { /*0x0026*/ 1, 1, 0, 13, FILE_CHEADBEN_R, 1, 1, 0, 0 }, - { /*0x0027*/ 1, 1, 0, 13, FILE_CHEADSTEVE_K, 1, 1, 0, 0 }, - { /*0x0028*/ 1, 1, 0, 13, FILE_CHEADJONATHAN, 1, 1, 0, 0 }, - { /*0x0029*/ 1, 1, 3, 27, FILE_CHEADMAIAN_S, 1, 1, 0, 0 }, - { /*0x002a*/ 1, 1, 0, 13, FILE_CHEADSHAUN, 1, 1, 0, 0 }, - { /*0x002b*/ 1, 1, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, - { /*0x002c*/ 0, 1, 1, 13, FILE_CHEADEILEEN_H, 1, 1, 0, 0 }, - { /*0x002d*/ 1, 1, 0, 13, FILE_CHEADSCOTT_H, 1, 1, 0, 0 }, - { /*0x002e*/ 1, 1, 0, 13, FILE_CHEADSANCHEZ, 1, 1, 0, 0 }, - { /*0x002f*/ 0, 1, 1, 13, FILE_CHEADDARKAQUA, 1, 1, 0, 0 }, - { /*0x0030*/ 1, 1, 0, 13, FILE_CHEADDDSNIPER, 1, 1, 0, 0 }, - { /*0x0031*/ 1, 1, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, - { /*0x0032*/ 1, 1, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, - { /*0x0033*/ 1, 1, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, - { /*0x0034*/ 1, 1, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, - { /*0x0035*/ 1, 1, 0, 13, FILE_CHEADGRIFFEY, 1, 1, 0, 0 }, - { /*0x0036*/ 1, 1, 0, 13, FILE_CHEADMOTO, 1, 1, 0, 0 }, - { /*0x0037*/ 1, 1, 0, 13, FILE_CHEADKEITH, 1, 1, 0, 0 }, - { /*0x0038*/ 0, 1, 1, 13, FILE_CHEADWINNER, 1, 1, 0, 0 }, - { /*0x0039*/ 1, 1, 0, 13, FILE_CA51FACEPLATE, 1, 1, 0, 0 }, - { /*0x003a*/ 1, 1, 3, 27, FILE_CHEADELVIS_GOGS, 1, 1, 0, 0 }, - { /*0x003b*/ 1, 1, 0, 13, FILE_CHEADSTEVEM, 1, 1, 0, 0 }, - { /*0x003c*/ 0, 1, 1, 13, FILE_CHEADDARK_SNOW, 1, 1, 0, 0 }, - { /*0x003d*/ 1, 1, 0, 13, FILE_CHEADPRESIDENT, 1, 1, 0, 0 }, - { /*0x003e*/ 0, 1, 1, 13, FILE_CHEAD_VD, 1, 1, 0, 0 }, - { /*0x003f*/ 1, 1, 0, 13, FILE_CHEADKEN, 1, 1, 0, 0 }, - { /*0x0040*/ 1, 1, 0, 13, FILE_CHEADJOEL, 1, 1, 0, 0 }, - { /*0x0041*/ 1, 1, 0, 13, FILE_CHEADTIM, 1, 1, 0, 0 }, - { /*0x0042*/ 1, 1, 0, 13, FILE_CHEADGRANT, 1, 1, 0, 0 }, - { /*0x0043*/ 1, 1, 0, 13, FILE_CHEADPENNY, 1, 1, 0, 0 }, - { /*0x0044*/ 1, 1, 0, 13, FILE_CHEADROBIN, 1, 1, 0, 0 }, - { /*0x0045*/ 0, 1, 2, 13, FILE_CHEADALEX, 1, 1, 0, 0 }, - { /*0x0046*/ 0, 1, 2, 13, FILE_CHEADJULIANNE, 1, 1, 0, 0 }, - { /*0x0047*/ 0, 1, 2, 13, FILE_CHEADLAURA, 1, 1, 0, 0 }, - { /*0x0048*/ 1, 1, 0, 13, FILE_CHEADDAVEC, 1, 1, 0, 0 }, - { /*0x0049*/ 1, 1, 0, 13, FILE_CHEADCOOK, 1, 1, 0, 0 }, - { /*0x004a*/ 1, 1, 0, 13, FILE_CHEADPRYCE, 1, 1, 0, 0 }, - { /*0x004b*/ 1, 1, 0, 13, FILE_CHEADSILKE, 1, 1, 0, 0 }, - { /*0x004c*/ 1, 1, 0, 13, FILE_CHEADSMITH, 1, 1, 0, 0 }, - { /*0x004d*/ 1, 1, 0, 13, FILE_CHEADGARETH, 1, 1, 0, 0 }, - { /*0x004e*/ 1, 1, 0, 13, FILE_CHEADMURCHIE, 1, 1, 0, 0 }, - { /*0x004f*/ 1, 1, 0, 13, FILE_CHEADWONG, 1, 1, 0, 0 }, - { /*0x0050*/ 1, 1, 0, 13, FILE_CHEADCARTER, 1, 1, 0, 0 }, - { /*0x0051*/ 1, 1, 0, 13, FILE_CHEADTINTIN, 1, 1, 0, 0 }, - { /*0x0052*/ 1, 1, 0, 13, FILE_CHEADMUNTON, 1, 1, 0, 0 }, - { /*0x0053*/ 1, 1, 0, 13, FILE_CHEADSTAMPER, 1, 1, 0, 0 }, - { /*0x0054*/ 1, 1, 0, 13, FILE_CHEADJONES, 1, 1, 0, 0 }, - { /*0x0055*/ 1, 1, 0, 13, FILE_CHEADPHELPS, 1, 1, 0, 0 }, - { /*0x0056*/ 0, 0, 1, 159, FILE_CDARK_COMBAT, 1, 0.95305162668228, 0, FILE_GCOMBATHANDSLOD }, - { /*0x0057*/ 1, 0, 3, 106, FILE_CELVIS1, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, - { /*0x0058*/ 1, 0, 8, 157, FILE_CAREA51GUARD, 1, 0.92769956588745, 0, FILE_GHAND_A51GUARD }, - { /*0x0059*/ 1, 0, 0, 159, FILE_COVERALL, 1, 0.92769956588745, 0, FILE_GHAND_A51GUARD }, - { /*0x005a*/ 1, 0, 0, 154, FILE_CCARRINGTON, 1, 0.85915493965149, 0, FILE_GHAND_CARRINGTON }, - { /*0x005b*/ 1, 0, 5, 169, FILE_CMRBLONDE, 1, 1.1032863855362, 0, FILE_GHAND_MRBLONDE }, - { /*0x005c*/ 1, 0, 8, 159, FILE_CSKEDAR, 1, 1, 0, 0 }, - { /*0x005d*/ 1, 0, 0, 161, FILE_CTRENT, 1, 0.93896716833115, 0, FILE_GHAND_TRENT }, - { /*0x005e*/ 1, 0, 8, 157, FILE_CDDSHOCK, 1, 0.93896716833115, 0, FILE_GHAND_DDFODDER }, - { /*0x005f*/ 1, 0, 8, 157, FILE_CLABTECH, 1, 0.93896716833115, 0, FILE_GHAND_MRBLONDE }, - { /*0x0060*/ 1, 0, 8, 158, FILE_CSTRIPES, 1, 0.92769956588745, 0, FILE_GHAND_BLACKGUARD }, - { /*0x0061*/ 0, 0, 1, 159, FILE_CDARK_FROCK, 1, 0.95305162668228, 0, FILE_GHAND_JOFROCK }, - { /*0x0062*/ 0, 0, 1, 159, FILE_CDARK_TRENCH, 1, 0.95305162668228, 0, FILE_GHAND_JOTRENCH }, - { /*0x0063*/ 1, 0, 0, 157, FILE_COFFICEWORKER, 1, 0.93896716833115, 0, FILE_GHAND_JOFROCK }, - { /*0x0064*/ 1, 0, 0, 157, FILE_COFFICEWORKER2, 1, 0.93896716833115, 0, FILE_GHAND_JOFROCK }, - { /*0x0065*/ 0, 0, 1, 140, FILE_CSECRETARY, 1, 0.87323945760727, 0, FILE_GHAND_JOFROCK }, - { /*0x0066*/ 0, 0, 4, 167, FILE_CCASSANDRA, 1, 0.98591554164886, 0, FILE_GHAND_VRIES }, - { /*0x0067*/ 1, 0, 3, 106, FILE_CTHEKING, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, - { /*0x0068*/ 0, 0, 10, 160, FILE_CFEM_GUARD, 1, 0.96713620424271, 0, FILE_GHAND_JOTRENCH }, - { /*0x0069*/ 1, 0, 8, 157, FILE_CDD_LABTECH, 1, 0.93896716833115, 0, FILE_GHAND_DDLABTECH }, - { /*0x006a*/ 1, 0, 8, 160, FILE_CDD_SECGUARD, 1, 0.93427228927612, 0, FILE_GHAND_DDSECURITY }, - { /*0x006b*/ 1, 1, 0, 159, FILE_CDRCARROLL, 1, 1, 0, 0 }, - { /*0x006c*/ 1, 0, 0, 159, FILE_CEYESPY, 1, 1, 0, 0 }, - { /*0x006d*/ 0, 0, 1, 159, FILE_CDARK_RIPPED, 1, 0.95305162668228, 0, FILE_GHAND_JOFROCK }, - { /*0x006e*/ 1, 0, 8, 160, FILE_CDD_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_DDSECURITY }, - { /*0x006f*/ 1, 0, 8, 157, FILE_CDD_SHOCK_INF, 1, 0.93896716833115, 0, FILE_GHAND_DDSHOCK }, - { /*0x0070*/ 1, 1, 0, 159, FILE_CTESTCHR, 1, 1, 0, 0 }, - { /*0x0071*/ 1, 0, 8, 155, FILE_CBIOTECH, 1, 0.93896716833115, 0, FILE_GHAND_DDBIO }, - { /*0x0072*/ 1, 0, 8, 159, FILE_CFBIGUY, 1, 0.93896716833115, 0, FILE_GHAND_FBIARM }, - { /*0x0073*/ 1, 0, 8, 159, FILE_CCIAGUY, 1, 0.93896716833115, 0, FILE_GHAND_CIA }, - { /*0x0074*/ 1, 0, 8, 159, FILE_CA51TROOPER, 1, 0.93896716833115, 0, FILE_GHAND_JOFROCK }, - { /*0x0075*/ 1, 0, 0, 157, FILE_CA51AIRMAN, 1, 0.93896716833115, 0, FILE_GHAND_A51AIRMAN }, - { /*0x0076*/ 1, 0, 0, 159, FILE_CCHICROB, 1, 1, 0, 0 }, - { /*0x0077*/ 1, 0, 0, 153, FILE_CSTEWARD, 1, 0.89201879501343, 0, FILE_GHAND_JOFROCK }, - { /*0x0078*/ 0, 0, 1, 143, FILE_CSTEWARDESS, 1, 0.85446006059647, 0, FILE_GHAND_JOFROCK }, - { /*0x0079*/ 1, 0, 0, 159, FILE_CPRESIDENT, 1, 0.93896716833115, 0, FILE_GHAND_PRESIDENT }, - { /*0x007a*/ 0, 0, 1, 143, FILE_CSTEWARDESS_COAT, 1, 0.85446006059647, 0, FILE_GHAND_STEWARDESS_COAT }, - { /*0x007b*/ 1, 0, 0, 159, FILE_CMINISKEDAR, 0.75, 0.5, 0, 0 }, - { /*0x007c*/ 1, 0, 0, 159, FILE_CNSA_LACKEY, 1, 0.93896716833115, 0, FILE_GHAND_CARRINGTON }, - { /*0x007d*/ 1, 0, 0, 159, FILE_CPRES_SECURITY, 1, 0.93896716833115, 0, FILE_GHAND_CARRINGTON }, - { /*0x007e*/ 0, 0, 1, 142, FILE_CNEGOTIATOR, 1, 0.85446006059647, 0, FILE_GHAND_JOFROCK }, - { /*0x007f*/ 1, 0, 0, 159, FILE_CG5_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_G5GUARD }, - { /*0x0080*/ 1, 0, 8, 159, FILE_CPELAGIC_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_TRAGIC_PELAGIC }, - { /*0x0081*/ 1, 0, 8, 158, FILE_CG5_SWAT_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_G5GUARD }, - { /*0x0082*/ 1, 0, 8, 158, FILE_CALASKAN_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_JOSNOW }, - { /*0x0083*/ 1, 0, 11, 106, FILE_CMAIAN_SOLDIER, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, - { /*0x0084*/ 1, 0, 0, 159, FILE_CPRESIDENT_CLONE, 1, 0.93896716833115, 0, FILE_GCOMBATHANDSLOD }, - { /*0x0085*/ 1, 0, 0, 159, FILE_CPRESIDENT_CLONE, 1, 0.93896716833115, 0, FILE_GHAND_PRESIDENT }, - { /*0x0086*/ 0, 0, 1, 159, FILE_CDARK_AF1, 1, 0.95305162668228, 0, FILE_GHAND_JOPILOT }, - { /*0x0087*/ 0, 0, 1, 159, FILE_CDARKWET, 1, 0.95305162668228, 0, FILE_GHAND_JOWETSUIT }, - { /*0x0088*/ 0, 0, 1, 159, FILE_CDARKAQUALUNG, 1, 0.95305162668228, 0, FILE_GHAND_JOWETSUIT }, - { /*0x0089*/ 0, 0, 1, 159, FILE_CDARKSNOW, 1, 0.95305162668228, 0, FILE_GHAND_JOSNOW }, - { /*0x008a*/ 0, 0, 1, 159, FILE_CDARKLAB, 1, 0.95305162668228, 0, FILE_GHAND_MRBLONDE }, - { /*0x008b*/ 0, 0, 9, 159, FILE_CFEMLABTECH, 1, 0.87323945760727, 0, FILE_GHAND_MRBLONDE }, - { /*0x008c*/ 1, 0, 8, 159, FILE_CDDSNIPER, 1, 0.93896716833115, 0, FILE_GHAND_DDSNIPER }, - { /*0x008d*/ 1, 0, 0, 159, FILE_CPILOTAF1, 1, 0.88262909650803, 0, FILE_GHAND_JOPILOT }, - { /*0x008e*/ 1, 0, 8, 159, FILE_CCILABTECH, 1, 0.93896716833115, 0, FILE_GHAND_CIFEMTECH }, - { /*0x008f*/ 0, 0, 9, 159, FILE_CCIFEMTECH, 1, 0.86854463815689, 0, FILE_GHAND_CIFEMTECH }, - { /*0x0090*/ 1, 0, 0, 159, FILE_CCARREVENINGSUIT, 1, 0.85915493965149, 0, FILE_GHAND_MRBLONDE }, - { /*0x0091*/ 1, 0, 0, 159, FILE_CJONATHON, 1, 0.93896716833115, 0, FILE_GHAND_A51GUARD }, - { /*0x0092*/ 1, 0, 8, 159, FILE_CCISOLDIER, 1, 0.93896716833115, 0, FILE_GHAND_CISOLDIER }, - { /*0x0093*/ 1, 0, 0, 159, FILE_CSKEDARKING, 1, 1.25, 0, 0 }, - { /*0x0094*/ 1, 0, 3, 106, FILE_CELVISWAISTCOAT, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, - { /*0x0095*/ 0, 0, 1, 159, FILE_CDARK_LEATHER, 1, 0.95305162668228, 0, FILE_GHAND_JOFROCK }, - { /*0x0096*/ 0, 0, 1, 159, FILE_CDARK_NEGOTIATOR, 1, 0.95305162668228, 0, FILE_GHAND_JOAF1 }, - { /*0x0097*/ 0, 0, 0, 0, 0, 1, 0, 0, FILE_GCOMBATHANDSLOD }, + // | height + // | | + { /*0x0000*/ 1, 0, 0, 0, 167, FILE_CDJBOND, 1, 1.0446009635925, 0, FILE_GHAND_DDSECURITY }, + { /*0x0001*/ 1, 0, 0, 0, 167, FILE_CCONNERY, 1, 1.0300469398499, 0, FILE_GHAND_MRBLONDE }, + { /*0x0002*/ 1, 0, 0, 0, 165, FILE_CDALTON, 1, 1.0572769641876, 0, FILE_GHAND_DDSECURITY }, + { /*0x0003*/ 1, 0, 0, 0, 167, FILE_CMOORE, 1, 1.0399061441422, 0, FILE_GHAND_DDSECURITY }, + { /*0x0004*/ 0, 1, 0, 1, 13, FILE_CHEADDARK_COMBAT, 1, 1, 0, 0 }, + { /*0x0005*/ 1, 1, 0, 3, 27, FILE_CHEADELVIS, 1, 1, 0, 0 }, + { /*0x0006*/ 1, 1, 0, 0, 13, FILE_CHEADROSS, 1, 1, 0, 0 }, + { /*0x0007*/ 1, 1, 0, 0, 13, FILE_CHEADCARRINGTON, 1, 1, 0, 0 }, + { /*0x0008*/ 1, 1, 0, 5, 13, FILE_CHEADMRBLONDE, 1, 1, 0, 0 }, + { /*0x0009*/ 1, 1, 0, 0, 13, FILE_CHEADTRENT, 1, 1, 0, 0 }, + { /*0x000a*/ 1, 1, 0, 0, 13, FILE_CHEADDDSHOCK, 1, 1, 0, 0 }, + { /*0x000b*/ 1, 1, 0, 0, 13, FILE_CHEADGRAHAM, 1, 1, 0, 0 }, + { /*0x000c*/ 0, 1, 0, 1, 13, FILE_CHEADDARK_FROCK, 1, 1, 0, 0 }, + { /*0x000d*/ 0, 1, 0, 1, 13, FILE_CHEADSECRETARY, 1, 1, 0, 0 }, + { /*0x000e*/ 0, 1, 0, 4, 13, FILE_CHEADCASSANDRA, 1, 1, 0, 0 }, + { /*0x000f*/ 1, 1, 0, 3, 27, FILE_CHEADTHEKING, 1, 1, 0, 0 }, + { /*0x0010*/ 0, 1, 0, 0, 13, FILE_CHEADFEM_GUARD, 1, 1, 0, 0 }, + { /*0x0011*/ 1, 1, 0, 0, 13, FILE_CHEADJON, 1, 1, 0, 0 }, + { /*0x0012*/ 1, 1, 0, 0, 13, FILE_CHEADMARK2, 1, 1, 0, 0 }, + { /*0x0013*/ 1, 1, 0, 0, 13, FILE_CHEADCHRIST, 1, 1, 0, 0 }, + { /*0x0014*/ 1, 1, 0, 0, 13, FILE_CHEADRUSS, 1, 1, 0, 0 }, + { /*0x0015*/ 1, 1, 0, 3, 13, FILE_CHEADGREY, 1, 1, 0, 0 }, + { /*0x0016*/ 1, 1, 0, 0, 13, FILE_CHEADDARLING, 1, 1, 0, 0 }, + { /*0x0017*/ 1, 1, 0, 0, 13, FILE_CHEADROBERT, 1, 1, 0, 0 }, + { /*0x0018*/ 1, 1, 0, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, + { /*0x0019*/ 0, 1, 0, 0, 13, FILE_CHEADFEM_GUARD2, 1, 1, 0, 0 }, + { /*0x001a*/ 1, 1, 0, 0, 13, FILE_CHEADBRIAN, 1, 1, 0, 0 }, + { /*0x001b*/ 1, 1, 0, 0, 13, FILE_CHEADJAMIE, 1, 1, 0, 0 }, + { /*0x001c*/ 1, 1, 0, 0, 13, FILE_CHEADDUNCAN2, 1, 1, 0, 0 }, + { /*0x001d*/ 1, 1, 0, 0, 13, FILE_CHEADBIOTECH, 1, 1, 0, 0 }, + { /*0x001e*/ 1, 1, 0, 0, 13, FILE_CHEADNEIL2, 1, 1, 0, 0 }, + { /*0x001f*/ 1, 1, 0, 0, 13, FILE_CHEADEDMCG, 1, 1, 0, 0 }, + { /*0x0020*/ 0, 1, 0, 1, 13, FILE_CHEADANKA, 1, 1, 0, 0 }, + { /*0x0021*/ 0, 1, 0, 1, 13, FILE_CHEADLESLIE_S, 1, 1, 0, 0 }, + { /*0x0022*/ 1, 1, 0, 0, 13, FILE_CHEADMATT_C, 1, 1, 0, 0 }, + { /*0x0023*/ 1, 1, 0, 0, 13, FILE_CHEADPEER_S, 1, 1, 0, 0 }, + { /*0x0024*/ 0, 1, 0, 1, 13, FILE_CHEADEILEEN_T, 1, 1, 0, 0 }, + { /*0x0025*/ 1, 1, 0, 0, 13, FILE_CHEADANDY_R, 1, 1, 0, 0 }, + { /*0x0026*/ 1, 1, 0, 0, 13, FILE_CHEADBEN_R, 1, 1, 0, 0 }, + { /*0x0027*/ 1, 1, 0, 0, 13, FILE_CHEADSTEVE_K, 1, 1, 0, 0 }, + { /*0x0028*/ 1, 1, 0, 0, 13, FILE_CHEADJONATHAN, 1, 1, 0, 0 }, + { /*0x0029*/ 1, 1, 0, 3, 27, FILE_CHEADMAIAN_S, 1, 1, 0, 0 }, + { /*0x002a*/ 1, 1, 0, 0, 13, FILE_CHEADSHAUN, 1, 1, 0, 0 }, + { /*0x002b*/ 1, 1, 0, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, + { /*0x002c*/ 0, 1, 0, 1, 13, FILE_CHEADEILEEN_H, 1, 1, 0, 0 }, + { /*0x002d*/ 1, 1, 0, 0, 13, FILE_CHEADSCOTT_H, 1, 1, 0, 0 }, + { /*0x002e*/ 1, 1, 0, 0, 13, FILE_CHEADSANCHEZ, 1, 1, 0, 0 }, + { /*0x002f*/ 0, 1, 0, 1, 13, FILE_CHEADDARKAQUA, 1, 1, 0, 0 }, + { /*0x0030*/ 1, 1, 0, 0, 13, FILE_CHEADDDSNIPER, 1, 1, 0, 0 }, + { /*0x0031*/ 1, 1, 0, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, + { /*0x0032*/ 1, 1, 0, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, + { /*0x0033*/ 1, 1, 0, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, + { /*0x0034*/ 1, 1, 0, 0, 13, FILE_CHEADBEAU, 1, 1, 0, 0 }, + { /*0x0035*/ 1, 1, 0, 0, 13, FILE_CHEADGRIFFEY, 1, 1, 0, 0 }, + { /*0x0036*/ 1, 1, 0, 0, 13, FILE_CHEADMOTO, 1, 1, 0, 0 }, + { /*0x0037*/ 1, 1, 0, 0, 13, FILE_CHEADKEITH, 1, 1, 0, 0 }, + { /*0x0038*/ 0, 1, 0, 1, 13, FILE_CHEADWINNER, 1, 1, 0, 0 }, + { /*0x0039*/ 1, 1, 0, 0, 13, FILE_CA51FACEPLATE, 1, 1, 0, 0 }, + { /*0x003a*/ 1, 1, 0, 3, 27, FILE_CHEADELVIS_GOGS, 1, 1, 0, 0 }, + { /*0x003b*/ 1, 1, 0, 0, 13, FILE_CHEADSTEVEM, 1, 1, 0, 0 }, + { /*0x003c*/ 0, 1, 0, 1, 13, FILE_CHEADDARK_SNOW, 1, 1, 0, 0 }, + { /*0x003d*/ 1, 1, 0, 0, 13, FILE_CHEADPRESIDENT, 1, 1, 0, 0 }, + { /*0x003e*/ 0, 1, 0, 1, 13, FILE_CHEAD_VD, 1, 1, 0, 0 }, + { /*0x003f*/ 1, 1, 0, 0, 13, FILE_CHEADKEN, 1, 1, 0, 0 }, + { /*0x0040*/ 1, 1, 0, 0, 13, FILE_CHEADJOEL, 1, 1, 0, 0 }, + { /*0x0041*/ 1, 1, 0, 0, 13, FILE_CHEADTIM, 1, 1, 0, 0 }, + { /*0x0042*/ 1, 1, 0, 0, 13, FILE_CHEADGRANT, 1, 1, 0, 0 }, + { /*0x0043*/ 1, 1, 0, 0, 13, FILE_CHEADPENNY, 1, 1, 0, 0 }, + { /*0x0044*/ 1, 1, 0, 0, 13, FILE_CHEADROBIN, 1, 1, 0, 0 }, + { /*0x0045*/ 0, 1, 0, 2, 13, FILE_CHEADALEX, 1, 1, 0, 0 }, + { /*0x0046*/ 0, 1, 0, 2, 13, FILE_CHEADJULIANNE, 1, 1, 0, 0 }, + { /*0x0047*/ 0, 1, 0, 2, 13, FILE_CHEADLAURA, 1, 1, 0, 0 }, + { /*0x0048*/ 1, 1, 0, 0, 13, FILE_CHEADDAVEC, 1, 1, 0, 0 }, + { /*0x0049*/ 1, 1, 0, 0, 13, FILE_CHEADCOOK, 1, 1, 0, 0 }, + { /*0x004a*/ 1, 1, 0, 0, 13, FILE_CHEADPRYCE, 1, 1, 0, 0 }, + { /*0x004b*/ 1, 1, 0, 0, 13, FILE_CHEADSILKE, 1, 1, 0, 0 }, + { /*0x004c*/ 1, 1, 0, 0, 13, FILE_CHEADSMITH, 1, 1, 0, 0 }, + { /*0x004d*/ 1, 1, 0, 0, 13, FILE_CHEADGARETH, 1, 1, 0, 0 }, + { /*0x004e*/ 1, 1, 0, 0, 13, FILE_CHEADMURCHIE, 1, 1, 0, 0 }, + { /*0x004f*/ 1, 1, 0, 0, 13, FILE_CHEADWONG, 1, 1, 0, 0 }, + { /*0x0050*/ 1, 1, 0, 0, 13, FILE_CHEADCARTER, 1, 1, 0, 0 }, + { /*0x0051*/ 1, 1, 0, 0, 13, FILE_CHEADTINTIN, 1, 1, 0, 0 }, + { /*0x0052*/ 1, 1, 0, 0, 13, FILE_CHEADMUNTON, 1, 1, 0, 0 }, + { /*0x0053*/ 1, 1, 0, 0, 13, FILE_CHEADSTAMPER, 1, 1, 0, 0 }, + { /*0x0054*/ 1, 1, 0, 0, 13, FILE_CHEADJONES, 1, 1, 0, 0 }, + { /*0x0055*/ 1, 1, 0, 0, 13, FILE_CHEADPHELPS, 1, 1, 0, 0 }, + { /*0x0056*/ 0, 0, 0, 1, 159, FILE_CDARK_COMBAT, 1, 0.95305162668228, 0, FILE_GCOMBATHANDSLOD }, + { /*0x0057*/ 1, 0, 0, 3, 106, FILE_CELVIS1, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, + { /*0x0058*/ 1, 0, 1, 0, 157, FILE_CAREA51GUARD, 1, 0.92769956588745, 0, FILE_GHAND_A51GUARD }, + { /*0x0059*/ 1, 0, 0, 0, 159, FILE_COVERALL, 1, 0.92769956588745, 0, FILE_GHAND_A51GUARD }, + { /*0x005a*/ 1, 0, 0, 0, 154, FILE_CCARRINGTON, 1, 0.85915493965149, 0, FILE_GHAND_CARRINGTON }, + { /*0x005b*/ 1, 0, 0, 5, 169, FILE_CMRBLONDE, 1, 1.1032863855362, 0, FILE_GHAND_MRBLONDE }, + { /*0x005c*/ 1, 0, 1, 0, 159, FILE_CSKEDAR, 1, 1, 0, 0 }, + { /*0x005d*/ 1, 0, 0, 0, 161, FILE_CTRENT, 1, 0.93896716833115, 0, FILE_GHAND_TRENT }, + { /*0x005e*/ 1, 0, 1, 0, 157, FILE_CDDSHOCK, 1, 0.93896716833115, 0, FILE_GHAND_DDFODDER }, + { /*0x005f*/ 1, 0, 1, 0, 157, FILE_CLABTECH, 1, 0.93896716833115, 0, FILE_GHAND_MRBLONDE }, + { /*0x0060*/ 1, 0, 1, 0, 158, FILE_CSTRIPES, 1, 0.92769956588745, 0, FILE_GHAND_BLACKGUARD }, + { /*0x0061*/ 0, 0, 0, 1, 159, FILE_CDARK_FROCK, 1, 0.95305162668228, 0, FILE_GHAND_JOFROCK }, + { /*0x0062*/ 0, 0, 0, 1, 159, FILE_CDARK_TRENCH, 1, 0.95305162668228, 0, FILE_GHAND_JOTRENCH }, + { /*0x0063*/ 1, 0, 0, 0, 157, FILE_COFFICEWORKER, 1, 0.93896716833115, 0, FILE_GHAND_JOFROCK }, + { /*0x0064*/ 1, 0, 0, 0, 157, FILE_COFFICEWORKER2, 1, 0.93896716833115, 0, FILE_GHAND_JOFROCK }, + { /*0x0065*/ 0, 0, 0, 1, 140, FILE_CSECRETARY, 1, 0.87323945760727, 0, FILE_GHAND_JOFROCK }, + { /*0x0066*/ 0, 0, 0, 4, 167, FILE_CCASSANDRA, 1, 0.98591554164886, 0, FILE_GHAND_VRIES }, + { /*0x0067*/ 1, 0, 0, 3, 106, FILE_CTHEKING, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, + { /*0x0068*/ 0, 0, 1, 2, 160, FILE_CFEM_GUARD, 1, 0.96713620424271, 0, FILE_GHAND_JOTRENCH }, + { /*0x0069*/ 1, 0, 1, 0, 157, FILE_CDD_LABTECH, 1, 0.93896716833115, 0, FILE_GHAND_DDLABTECH }, + { /*0x006a*/ 1, 0, 1, 0, 160, FILE_CDD_SECGUARD, 1, 0.93427228927612, 0, FILE_GHAND_DDSECURITY }, + { /*0x006b*/ 1, 1, 0, 0, 159, FILE_CDRCARROLL, 1, 1, 0, 0 }, + { /*0x006c*/ 1, 0, 0, 0, 159, FILE_CEYESPY, 1, 1, 0, 0 }, + { /*0x006d*/ 0, 0, 0, 1, 159, FILE_CDARK_RIPPED, 1, 0.95305162668228, 0, FILE_GHAND_JOFROCK }, + { /*0x006e*/ 1, 0, 1, 0, 160, FILE_CDD_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_DDSECURITY }, + { /*0x006f*/ 1, 0, 1, 0, 157, FILE_CDD_SHOCK_INF, 1, 0.93896716833115, 0, FILE_GHAND_DDSHOCK }, + { /*0x0070*/ 1, 1, 0, 0, 159, FILE_CTESTCHR, 1, 1, 0, 0 }, + { /*0x0071*/ 1, 0, 1, 0, 155, FILE_CBIOTECH, 1, 0.93896716833115, 0, FILE_GHAND_DDBIO }, + { /*0x0072*/ 1, 0, 1, 0, 159, FILE_CFBIGUY, 1, 0.93896716833115, 0, FILE_GHAND_FBIARM }, + { /*0x0073*/ 1, 0, 1, 0, 159, FILE_CCIAGUY, 1, 0.93896716833115, 0, FILE_GHAND_CIA }, + { /*0x0074*/ 1, 0, 1, 0, 159, FILE_CA51TROOPER, 1, 0.93896716833115, 0, FILE_GHAND_JOFROCK }, + { /*0x0075*/ 1, 0, 0, 0, 157, FILE_CA51AIRMAN, 1, 0.93896716833115, 0, FILE_GHAND_A51AIRMAN }, + { /*0x0076*/ 1, 0, 0, 0, 159, FILE_CCHICROB, 1, 1, 0, 0 }, + { /*0x0077*/ 1, 0, 0, 0, 153, FILE_CSTEWARD, 1, 0.89201879501343, 0, FILE_GHAND_JOFROCK }, + { /*0x0078*/ 0, 0, 0, 1, 143, FILE_CSTEWARDESS, 1, 0.85446006059647, 0, FILE_GHAND_JOFROCK }, + { /*0x0079*/ 1, 0, 0, 0, 159, FILE_CPRESIDENT, 1, 0.93896716833115, 0, FILE_GHAND_PRESIDENT }, + { /*0x007a*/ 0, 0, 0, 1, 143, FILE_CSTEWARDESS_COAT, 1, 0.85446006059647, 0, FILE_GHAND_STEWARDESS_COAT }, + { /*0x007b*/ 1, 0, 0, 0, 159, FILE_CMINISKEDAR, 0.75, 0.5, 0, 0 }, + { /*0x007c*/ 1, 0, 0, 0, 159, FILE_CNSA_LACKEY, 1, 0.93896716833115, 0, FILE_GHAND_CARRINGTON }, + { /*0x007d*/ 1, 0, 0, 0, 159, FILE_CPRES_SECURITY, 1, 0.93896716833115, 0, FILE_GHAND_CARRINGTON }, + { /*0x007e*/ 0, 0, 0, 1, 142, FILE_CNEGOTIATOR, 1, 0.85446006059647, 0, FILE_GHAND_JOFROCK }, + { /*0x007f*/ 1, 0, 0, 0, 159, FILE_CG5_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_G5GUARD }, + { /*0x0080*/ 1, 0, 1, 0, 159, FILE_CPELAGIC_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_TRAGIC_PELAGIC }, + { /*0x0081*/ 1, 0, 1, 0, 158, FILE_CG5_SWAT_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_G5GUARD }, + { /*0x0082*/ 1, 0, 1, 0, 158, FILE_CALASKAN_GUARD, 1, 0.93896716833115, 0, FILE_GHAND_JOSNOW }, + { /*0x0083*/ 1, 0, 1, 3, 106, FILE_CMAIAN_SOLDIER, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, + { /*0x0084*/ 1, 0, 0, 0, 159, FILE_CPRESIDENT_CLONE, 1, 0.93896716833115, 0, FILE_GCOMBATHANDSLOD }, + { /*0x0085*/ 1, 0, 0, 0, 159, FILE_CPRESIDENT_CLONE, 1, 0.93896716833115, 0, FILE_GHAND_PRESIDENT }, + { /*0x0086*/ 0, 0, 0, 1, 159, FILE_CDARK_AF1, 1, 0.95305162668228, 0, FILE_GHAND_JOPILOT }, + { /*0x0087*/ 0, 0, 0, 1, 159, FILE_CDARKWET, 1, 0.95305162668228, 0, FILE_GHAND_JOWETSUIT }, + { /*0x0088*/ 0, 0, 0, 1, 159, FILE_CDARKAQUALUNG, 1, 0.95305162668228, 0, FILE_GHAND_JOWETSUIT }, + { /*0x0089*/ 0, 0, 0, 1, 159, FILE_CDARKSNOW, 1, 0.95305162668228, 0, FILE_GHAND_JOSNOW }, + { /*0x008a*/ 0, 0, 0, 1, 159, FILE_CDARKLAB, 1, 0.95305162668228, 0, FILE_GHAND_MRBLONDE }, + { /*0x008b*/ 0, 0, 1, 1, 159, FILE_CFEMLABTECH, 1, 0.87323945760727, 0, FILE_GHAND_MRBLONDE }, + { /*0x008c*/ 1, 0, 1, 0, 159, FILE_CDDSNIPER, 1, 0.93896716833115, 0, FILE_GHAND_DDSNIPER }, + { /*0x008d*/ 1, 0, 0, 0, 159, FILE_CPILOTAF1, 1, 0.88262909650803, 0, FILE_GHAND_JOPILOT }, + { /*0x008e*/ 1, 0, 1, 0, 159, FILE_CCILABTECH, 1, 0.93896716833115, 0, FILE_GHAND_CIFEMTECH }, + { /*0x008f*/ 0, 0, 1, 1, 159, FILE_CCIFEMTECH, 1, 0.86854463815689, 0, FILE_GHAND_CIFEMTECH }, + { /*0x0090*/ 1, 0, 0, 0, 159, FILE_CCARREVENINGSUIT, 1, 0.85915493965149, 0, FILE_GHAND_MRBLONDE }, + { /*0x0091*/ 1, 0, 0, 0, 159, FILE_CJONATHON, 1, 0.93896716833115, 0, FILE_GHAND_A51GUARD }, + { /*0x0092*/ 1, 0, 1, 0, 159, FILE_CCISOLDIER, 1, 0.93896716833115, 0, FILE_GHAND_CISOLDIER }, + { /*0x0093*/ 1, 0, 0, 0, 159, FILE_CSKEDARKING, 1, 1.25, 0, 0 }, + { /*0x0094*/ 1, 0, 0, 3, 106, FILE_CELVISWAISTCOAT, 1, 0.57276993989944, 0, FILE_GHAND_ELVIS }, + { /*0x0095*/ 0, 0, 0, 1, 159, FILE_CDARK_LEATHER, 1, 0.95305162668228, 0, FILE_GHAND_JOFROCK }, + { /*0x0096*/ 0, 0, 0, 1, 159, FILE_CDARK_NEGOTIATOR, 1, 0.95305162668228, 0, FILE_GHAND_JOAF1 }, + { /*0x0097*/ 0, 0, 0, 0, 0, 0, 1, 0, 0, FILE_GCOMBATHANDSLOD }, }; u32 var8007dae4 = 0xbd8ff972; diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index 1f8d0482d..adf4921fe 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -14,6 +14,7 @@ #include "game/propobj.h" #include "bss.h" #include "lib/memory.h" +#include "lib/model.h" #include "lib/lib_126b0.h" #include "lib/rng.h" #include "lib/lib_16110.h" @@ -156,8 +157,8 @@ u32 bodyGetRace(s32 bodynum) bool bodyLoad(s32 bodynum) { - if (!g_HeadsAndBodies[bodynum].unk0c) { - g_HeadsAndBodies[bodynum].unk0c = fileLoad(g_HeadsAndBodies[bodynum].bodyfileid); + if (!g_HeadsAndBodies[bodynum].filedata) { + g_HeadsAndBodies[bodynum].filedata = fileLoad(g_HeadsAndBodies[bodynum].filenum); return true; } @@ -500,27 +501,152 @@ glabel var7f1a8a84 /* f02d334: 00000000 */ nop ); -struct model *func0f02d338(u32 bodynum, u32 headnum, u32 arg2, u32 arg3, bool arg4, u8 arg5) +// Mismatch: The model->unk02 < headfiledata->rwdatalen statement needs to use +// bodyfiledata instead of headfiledata, but the extra reference to bodyfiledata +// causes bodyfiledata to be promoted from t registers to a registers, which +// causes significant codegen changes. +//struct model *func0f02ce8c(s32 bodynum, s32 headnum, struct modelfiledata *bodyfiledata, struct modelfiledata *headfiledata, bool sunglasses, struct model *model, bool isplayer, u8 varyheight) +//{ +// f32 scale = g_HeadsAndBodies[bodynum].scale * 0.1f; +// f32 animscale = g_HeadsAndBodies[bodynum].animscale; +// struct modelnode *node = NULL; +// u32 stack[2]; +// +// if (cheatIsActive(CHEAT_DKMODE)) { +// scale *= 0.8f; +// } +// +// if (bodyfiledata == NULL) { +// if (g_HeadsAndBodies[bodynum].filedata == NULL) { +// g_HeadsAndBodies[bodynum].filedata = fileLoad(g_HeadsAndBodies[bodynum].filenum); +// } +// +// bodyfiledata = g_HeadsAndBodies[bodynum].filedata; +// } +// +// modelCalculateRwDataLen(bodyfiledata); +// +// if (!g_HeadsAndBodies[bodynum].unk00_01) { +// if (bodyfiledata->type == &g_ModelTypeChr) { +// node = modelGetPart(bodyfiledata, MODELPART_CHR_04); +// +// if (node != NULL) { +// if (headnum < 0) { +// headfiledata = func0f18e57c(-1 - headnum, &headnum); +// bodyfiledata->rwdatalen += headfiledata->rwdatalen; +// } else if (headnum > 0) { +// if (headfiledata == NULL) { +// if (g_Vars.normmplayerisrunning && !IS4MB()) { +// headfiledata = fileLoad(g_HeadsAndBodies[headnum].filenum); +// g_HeadsAndBodies[headnum].filedata = headfiledata; +// g_FileInfo[g_HeadsAndBodies[headnum].filenum].size = 0; +// func0f02ddbc(headfiledata, headnum, bodynum); +// } else { +// if (g_HeadsAndBodies[headnum].filedata == NULL) { +// g_HeadsAndBodies[headnum].filedata = fileLoad(g_HeadsAndBodies[headnum].filenum); +// } +// +// headfiledata = g_HeadsAndBodies[headnum].filedata; +// } +// } +// +// modelCalculateRwDataLen(headfiledata); +// +// bodyfiledata->rwdatalen += headfiledata->rwdatalen; +// +// if (g_HeadsAndBodies[bodynum].canvaryheight && varyheight) { +// // Set height to between 95% and 115% +// f32 frac = random() * (1.0f / U32_MAX) * 0.05f; +// scale *= 2.0f * frac - 0.05f + 1.0f; +// } +// } +// +// if (!isplayer) { +// if (cheatIsActive(CHEAT_SMALLCHARACTERS)) { +// scale *= 0.4f; +// } +// +// if (cheatIsActive(CHEAT_DKMODE)) { +// scale *= 1.25f; +// } +// } else { +// if (cheatIsActive(CHEAT_SMALLJO)) { +// scale *= 0.4f; +// } +// } +// } +// } else if (bodyfiledata->type == &g_ModelTypeSkedar) { +// if (g_HeadsAndBodies[bodynum].canvaryheight && varyheight && bodynum == BODY_SKEDAR) { +// // Set height to between 65% and 85% +// f32 frac = random() * (1.0f / U32_MAX); +// scale *= 2.0f * (0.1f * frac) - 0.1f + 0.75f; +// } +// } +// } +// +// if (model) { +// if (model->unk02 < bodyfiledata->rwdatalen) { +// // empty +// } +// } else { +// model = func0f0b3280(bodyfiledata); +// } +// +// if (model) { +// modelSetScale(model, scale); +// modelSetAnimScale(model, animscale); +// +// if (headfiledata && !g_HeadsAndBodies[bodynum].unk00_01) { +// bodyfiledata->rwdatalen -= headfiledata->rwdatalen; +// +// func0f0b32a0(model, node, headfiledata); +// +// if ((s16)*(s32 *)&headfiledata->type == MODELTYPE_HEAD) { +// struct modelnode *node2; +// +// if (!sunglasses) { +// node2 = modelGetPart(headfiledata, MODELPART_HEAD_SUNGLASSES); +// +// if (node2) { +// union modelrwdata *rwdata = modelGetNodeRwData(model, node2); +// rwdata->toggle.visible = false; +// } +// } +// +// node2 = modelGetPart(headfiledata, MODELPART_HEAD_HUDPIECE); +// +// if (node2) { +// union modelrwdata *rwdata = modelGetNodeRwData(model, node2); +// rwdata->toggle.visible = false; +// } +// } +// } +// } +// +// return model; +//} + +struct model *func0f02d338(s32 bodynum, s32 headnum, struct modelfiledata *bodyfiledata, struct modelfiledata *headfiledata, bool sunglasses, u8 varyheight) { - return func0f02ce8c(bodynum, headnum, arg2, arg3, arg4, 0, 0, arg5); + return func0f02ce8c(bodynum, headnum, bodyfiledata, headfiledata, sunglasses, NULL, false, varyheight); } -struct model *modelAllocateChr(u32 bodynum, u32 headnum, u32 spawnflags) +struct model *modelAllocateChr(s32 bodynum, s32 headnum, u32 spawnflags) { - bool a = 0; - u8 b = 1; + bool sunglasses = false; + u8 varyheight = true; - if (spawnflags & SPAWNFLAG_00000001) { - a = true; - } else if (spawnflags & SPAWNFLAG_00000002) { - a = random() % 2 == 0; + if (spawnflags & SPAWNFLAG_FORCESUNGLASSES) { + sunglasses = true; + } else if (spawnflags & SPAWNFLAG_MAYBESUNGLASSES) { + sunglasses = random() % 2 == 0; } - if (spawnflags & SPAWNFLAG_00004000) { - b = 0; + if (spawnflags & SPAWNFLAG_FIXEDHEIGHT) { + varyheight = false; } - return func0f02d338(bodynum, headnum, 0, 0, a, b); + return func0f02d338(bodynum, headnum, NULL, NULL, sunglasses, varyheight); } s32 func0f02d3f8(void) @@ -562,7 +688,7 @@ void chrUnpack(s32 stagenum, struct packedchr *packed, s32 cmdindex) struct pad pad; s16 rooms[2]; struct chrdata *chr; - s32 thing; + struct modelfiledata *headfiledata; struct model *model; struct prop *prop; s32 bodynum; @@ -596,7 +722,7 @@ void chrUnpack(s32 stagenum, struct packedchr *packed, s32 cmdindex) } headnum = -55555; - thing = 0; + headfiledata = NULL; if (packed->bodynum == 255) { bodynum = func0f02d3f8(); @@ -616,10 +742,10 @@ void chrUnpack(s32 stagenum, struct packedchr *packed, s32 cmdindex) index = -1 - headnum; if (index >= 0 && index < 22) { - thing = func0f18e57c(index, &headnum); + headfiledata = func0f18e57c(index, &headnum); } - model = func0f02ce8c(bodynum, headnum, 0, thing, 0, 0, 0, 0); + model = func0f02ce8c(bodynum, headnum, NULL, headfiledata, false, NULL, false, false); } else { model = modelAllocateChr(bodynum, headnum, packed->spawnflags); } @@ -642,7 +768,7 @@ void chrUnpack(s32 stagenum, struct packedchr *packed, s32 cmdindex) chr->bodynum = bodynum; chr->race = bodyGetRace(chr->bodynum); - chr->unk32c_20 = false; + chr->rtracked = false; if (bodynum == BODY_DRCAROLL) { chr->drcarollimage_left = 0; @@ -680,16 +806,16 @@ void chrUnpack(s32 stagenum, struct packedchr *packed, s32 cmdindex) chr->chrflags |= CHRCFLAG_HIDDEN; } - if (packed->spawnflags & SPAWNFLAG_00008000) { - chr->unk32c_20 = true; + if (packed->spawnflags & SPAWNFLAG_RTRACKED) { + chr->rtracked = true; } - if (packed->spawnflags & SPAWNFLAG_00002000) { - chr->unk32c_19 = true; + if (packed->spawnflags & SPAWNFLAG_NOBLOOD) { + chr->noblood = true; } - if (packed->spawnflags & SPAWNFLAG_00010000) { - chr->hidden2 |= CHRH2FLAG_0008; + if (packed->spawnflags & SPAWNFLAG_BLUESIGHT) { + chr->hidden2 |= CHRH2FLAG_BLUESIGHT; } chr->flags = packed->flags; diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index ea6995f69..a8bb416c6 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -41,7 +41,7 @@ struct mpsetup g_MpSetup; struct savefile_setup g_MpSetupSaveFile; u32 var800acc1c; struct mplockinfo g_MpLockInfo; -u32 var800acc28[18]; +struct modelfiledata *var800acc28[18]; // Forward declaractions struct mpweaponset g_MpWeaponSets[12]; @@ -10188,11 +10188,11 @@ void func0f18e558(void) s32 i; for (i = 0; i < ARRAYCOUNT(var800acc28); i++) { - var800acc28[i] = 0; + var800acc28[i] = NULL; } } -u32 func0f18e57c(u32 index, s32 *headnum) +struct modelfiledata *func0f18e57c(s32 index, s32 *headnum) { return var800acc28[index]; } diff --git a/src/game/radar.c b/src/game/radar.c index 6d0112ca7..dc84dec5e 100644 --- a/src/game/radar.c +++ b/src/game/radar.c @@ -451,7 +451,7 @@ Gfx *radarRenderRTrackedProps(Gfx *gdl) case PROPTYPE_CHR: chr = prop->chr; - if (chr && chr->unk32c_20 + if (chr && chr->rtracked && chr->actiontype != ACT_DIE && chr->actiontype != ACT_DEAD && (chr->hidden & CHRHFLAG_CLOAKED) == 0) { diff --git a/src/game/sight.c b/src/game/sight.c index f09a4c966..11de64aae 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -57,7 +57,7 @@ bool sightIsPropFriendly(struct prop *prop) if (g_Vars.normmplayerisrunning == false && prop->chr - && (prop->chr->hidden2 & CHRH2FLAG_0008)) { + && (prop->chr->hidden2 & CHRH2FLAG_BLUESIGHT)) { return true; } diff --git a/src/game/splat.c b/src/game/splat.c index b87e444c8..ea06152a1 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -28,7 +28,7 @@ void splatTick(struct prop *prop) struct chrdata *attacker = chr->lastattacker; s32 race; - if (chr->unk32c_19 || (chr->chrflags & CHRCFLAG_HIDDEN) || chr->bulletstaken == 0) { + if (chr->noblood || (chr->chrflags & CHRCFLAG_HIDDEN) || chr->bulletstaken == 0) { return; } diff --git a/src/include/constants.h b/src/include/constants.h index 0e7dd26a3..1c71999df 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -526,7 +526,7 @@ // chr->hidden2 #define CHRH2FLAG_0001 0x0001 #define CHRH2FLAG_0002 0x0002 // Equivalent to OBJFLAG3_00020000 -#define CHRH2FLAG_0008 0x0008 +#define CHRH2FLAG_BLUESIGHT 0x0008 #define CHRH2FLAG_TICKDURINGAUTOCUT 0x0010 #define CHRH2FLAG_0040 0x0040 #define CHRH2FLAG_0080 0x0080 @@ -1786,6 +1786,9 @@ #define MODELNODETYPE_HEADSPOT 0x17 #define MODELNODETYPE_DL 0x18 +#define MODELPART_CHR_04 0x04 +#define MODELPART_HEAD_SUNGLASSES 0x00 +#define MODELPART_HEAD_HUDPIECE 0x04 #define MODELPART_00 0x00 #define MODELPART_LENS 0x00 #define MODELPART_01 0x01 @@ -3084,22 +3087,22 @@ #define SOUNDMODE_HEADPHONE 2 #define SOUNDMODE_SURROUND 3 -#define SPAWNFLAG_00000001 0x00000001 -#define SPAWNFLAG_00000002 0x00000002 +#define SPAWNFLAG_FORCESUNGLASSES 0x00000001 // 100% chance of wearing sunglasses if head model supports it +#define SPAWNFLAG_MAYBESUNGLASSES 0x00000002 // 50% chance of wearing sunglasses if head model supports it #define SPAWNFLAG_INVINCIBLE 0x00000008 #define SPAWNFLAG_00000010 0x00000010 #define SPAWNFLAG_ONLYONA 0x00000020 #define SPAWNFLAG_ONLYONSA 0x00000040 #define SPAWNFLAG_ONLYONPA 0x00000080 -#define SPAWNFLAG_IGNORECOLLISION 0x00000100 +#define SPAWNFLAG_IGNORECOLLISION 0x00000100 // For initial chr placement only #define SPAWNFLAG_00000200 0x00000200 #define SPAWNFLAG_ANTINONINTERACTABLE 0x00000400 #define SPAWNFLAG_00000800 0x00000800 #define SPAWNFLAG_HIDDEN 0x00001000 -#define SPAWNFLAG_00002000 0x00002000 -#define SPAWNFLAG_00004000 0x00004000 -#define SPAWNFLAG_00008000 0x00008000 -#define SPAWNFLAG_00010000 0x00010000 +#define SPAWNFLAG_NOBLOOD 0x00002000 +#define SPAWNFLAG_FIXEDHEIGHT 0x00004000 // By default, chr heights vary slightly. This disables it. +#define SPAWNFLAG_RTRACKED 0x00008000 +#define SPAWNFLAG_BLUESIGHT 0x00010000 #define SPECIALDIE_NONE 0 #define SPECIALDIE_FALLBACK 1 diff --git a/src/include/game/game_02cde0.h b/src/include/game/game_02cde0.h index db514b13a..20ce32cdc 100644 --- a/src/include/game/game_02cde0.h +++ b/src/include/game/game_02cde0.h @@ -6,13 +6,13 @@ u32 bodyGetRace(s32 bodynum); bool bodyLoad(s32 bodynum); -struct model *func0f02ce8c(s32 bodynum, s32 headnum, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7); -struct model *func0f02d338(u32 bodynum, u32 headnum, u32 arg2, u32 arg3, bool arg4, u8 arg5); -struct model *modelAllocateChr(u32 bodynum, u32 headnum, u32 flags); +struct model *func0f02ce8c(s32 bodynum, s32 headnum, struct modelfiledata *bodyfiledata, struct modelfiledata *headfiledata, bool sunglasses, struct model *model, bool isplayer, u8 varyheight); +struct model *func0f02d338(s32 bodynum, s32 headnum, struct modelfiledata *bodyfiledata, struct modelfiledata *headfiledata, bool sunglasses, u8 varyheight); +struct model *modelAllocateChr(s32 bodynum, s32 headnum, u32 spawnflags); s32 func0f02d3f8(void); s32 bodyChooseHead(s32 bodynum); void chrUnpack(s32 stagenum, struct packedchr *packed, s32 cmdindex); struct prop *propAllocateEyespy(struct pad *pad, s16 room); -u32 func0f02ddbc(void); +void func0f02ddbc(struct modelfiledata *headfiledata, s32 headnum, s32 bodynum); #endif diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h index f4a6249c1..6e69edb65 100644 --- a/src/include/game/game_0b28d0.h +++ b/src/include/game/game_0b28d0.h @@ -10,7 +10,7 @@ u32 func0f0b2b64(void); struct model *func0f0b30ac(void *modelfiledata); void modelFree(struct model *model); struct model *func0f0b3280(void *modelfiledata); -u32 func0f0b32a0(void); +void func0f0b32a0(struct model *model, struct modelnode *node, struct modelfiledata *headfiledata); struct anim *func0f0b32e4(void); void animTurnOff(struct anim *anim); diff --git a/src/include/game/mplayer/mplayer.h b/src/include/game/mplayer/mplayer.h index 8b7ca2adf..223e26bfb 100644 --- a/src/include/game/mplayer/mplayer.h +++ b/src/include/game/mplayer/mplayer.h @@ -116,6 +116,6 @@ void func0f18e39c(char *arg0, char *filename, u16 *numsims, u16 *stagenum, u16 * s32 func0f18e420(s32 arg0, s32 arg1, u16 arg2); s32 func0f18e4c8(s32 arg0, s32 arg1, u16 arg2); void func0f18e558(void); -u32 func0f18e57c(u32 index, s32 *headnum); +struct modelfiledata *func0f18e57c(s32 index, s32 *headnum); #endif diff --git a/src/include/types.h b/src/include/types.h index 5d71e8dbe..2488fd46e 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -691,7 +691,7 @@ struct modelfiledata { s16 numparts; s16 nummatrices; f32 unk10; - u16 rwdatalen; // in words + s16 rwdatalen; // in words void *unk18; }; @@ -1457,8 +1457,8 @@ struct chrdata { u8 p1p2 : 2; u8 unk32c_18 : 1; - u8 unk32c_19 : 1; - u8 unk32c_20 : 1; + u8 noblood : 1; + u8 rtracked : 1; u8 unk32c_21 : 1; u8 unk32c_22 : 2; @@ -3248,13 +3248,14 @@ struct cheat { struct headorbody { /*0x00*/ u16 ismale : 1; /*0x00*/ u16 unk00_01 : 1; - /*0x00*/ u16 unk00_02 : 4; + /*0x00*/ u16 canvaryheight : 1; + /*0x00*/ u16 unk00_03 : 3; /*0x00*/ u16 height : 8; - /*0x02*/ u16 bodyfileid; - /*0x04*/ f32 unk04; - /*0x08*/ f32 unk08; - /*0x0c*/ void *unk0c; // likely a pointer to bodyfile data if loaded - /*0x10*/ u16 handfileid; + /*0x02*/ u16 filenum; + /*0x04*/ f32 scale; + /*0x08*/ f32 animscale; + /*0x0c*/ void *filedata; + /*0x10*/ u16 handfilenum; }; struct stagetableentry {