From 76d56fef28368a6faa3ac2637af80391b0be8cfd Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 21 Sep 2024 14:05:20 +1000 Subject: [PATCH] Identify TV programs --- src/game/bondgun.c | 2 +- src/game/chraicommands.c | 4 +- src/game/propobj.c | 235 ++++++++++++++++++------------------- src/game/propobjbss.c | 6 +- src/game/setup.c | 26 ++-- src/include/bss.h | 6 +- src/include/constants.h | 112 +++++++++--------- src/include/data.h | 6 +- src/include/game/propobj.h | 2 +- src/include/tvcmds.h | 7 +- src/setups/setupame.c | 38 +++--- src/setups/setupark.c | 22 ++-- src/setups/setupcave.c | 14 +-- src/setups/setupdam.c | 110 ++++++++--------- src/setups/setupdepo.c | 50 ++++---- src/setups/setupdish.c | 112 +++++++++--------- src/setups/setupear.c | 122 +++++++++---------- src/setups/setupeld.c | 14 +-- src/setups/setupimp.c | 6 +- src/setups/setuplee.c | 10 +- src/setups/setuplip.c | 44 +++---- src/setups/setuplue.c | 26 ++-- src/setups/setuppete.c | 2 +- src/setups/setuprit.c | 46 ++++---- src/setups/setupsev.c | 32 ++--- src/setups/setupsho.c | 2 +- src/setups/setupstat.c | 2 +- src/setups/setuptra.c | 20 ++-- src/setups/setupwax.c | 14 +-- 29 files changed, 545 insertions(+), 547 deletions(-) diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 9779545b7..a89924242 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -8253,7 +8253,7 @@ void bgun_render(Gfx **gdlptr) rwdata->toggle.visible = true; } - gdl = tvscreen_render(&hand->gunmodel, node, &var8009cf88, gdl, 0, 1); + gdl = tvscreen_render(&hand->gunmodel, node, &g_TvCmdlistBondPanCopy, gdl, 0, 1); } renderdata.gdl = gdl; diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index 38235aff5..104ee6f3b 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -4782,13 +4782,13 @@ bool ai_set_obj_image(void) if (obj && obj->prop) { if (obj->type == OBJTYPE_SINGLEMONITOR) { struct singlemonitorobj *sm = (struct singlemonitorobj *) obj; - tvscreen_set_image_by_num(&sm->screen, cmd[4]); + tvscreen_set_program(&sm->screen, cmd[4]); } else if (obj->type == OBJTYPE_MULTIMONITOR) { struct multimonitorobj *mm = (struct multimonitorobj *) obj; u8 slot = cmd[3]; if (slot < ARRAYCOUNT(mm->screens)) { - tvscreen_set_image_by_num(&mm->screens[slot], cmd[4]); + tvscreen_set_program(&mm->screens[slot], cmd[4]); } } } diff --git a/src/game/propobj.c b/src/game/propobj.c index 7d6fb1fc9..222bf564c 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -11423,7 +11423,7 @@ void tvscreen_set_cmdlist(struct tvscreen *screen, u32 *cmdlist) screen->offset = 0; } -u32 g_TvCmdlist00[] = { +u32 g_TvCmdlistDefault[] = { tvcmd_settexture(29), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), @@ -11439,7 +11439,7 @@ u32 g_TvCmdlist00[] = { tvcmd_restart(), }; -u32 g_TvCmdlist01[] = { +u32 g_TvCmdlistSinewave1[] = { tvcmd_setcolour(0x202020ff, 1), tvcmd_settexture(28), tvcmd_scrollrelx(2048, 120), @@ -11462,7 +11462,7 @@ u32 g_TvCmdlist01[] = { tvcmd_restart(), }; -u32 g_TvCmdlist02[] = { +u32 g_TvCmdlistSinewave2[] = { tvcmd_setcolour(0x202020ff, 1), tvcmd_settexture(28), tvcmd_scaleabsx(128, 1), @@ -11474,7 +11474,7 @@ u32 g_TvCmdlist02[] = { tvcmd_restart(), }; -u32 g_TvCmdlist03[] = { +u32 g_TvCmdlistScrollTextGreen[] = { tvcmd_settexture(29), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), @@ -11490,7 +11490,7 @@ u32 g_TvCmdlist03[] = { tvcmd_restart(), }; -u32 g_TvCmdlist15[] = { +u32 g_TvCmdlistTransparent[] = { tvcmd_settexture(50), tvcmd_setcolour(0x008000fe, 1), tvcmd_scrollrely(-512, 80), @@ -11506,7 +11506,7 @@ u32 g_TvCmdlist15[] = { tvcmd_restart(), }; -u32 g_TvCmdlist04[] = { +u32 g_TvCmdlistScrollUpTextRed[] = { tvcmd_settexture(29), tvcmd_setcolour(0x280000ff, 1), tvcmd_scrollrely(512, 80), @@ -11525,7 +11525,7 @@ u32 g_TvCmdlist04[] = { tvcmd_restart(), }; -u32 g_TvCmdlist05[] = { +u32 g_TvCmdlistScrollUpTextGreen[] = { tvcmd_settexture(29), tvcmd_setcolour(0x003c00ff, 1), tvcmd_scrollrely(512, 80), @@ -11543,7 +11543,7 @@ u32 g_TvCmdlist05[] = { tvcmd_restart(), }; -u32 g_TvCmdlist06[] = { +u32 g_TvCmdlistBarsYellow[] = { tvcmd_settexture(30), tvcmd_setcolour(0x404000ff, 1), tvcmd_scrollrelx(640, 1), @@ -11551,7 +11551,7 @@ u32 g_TvCmdlist06[] = { tvcmd_restart(), }; -u32 g_TvCmdlist07[] = { +u32 g_TvCmdlistBarsTeal[] = { tvcmd_settexture(30), tvcmd_setcolour(0x004040ff, 1), tvcmd_scrollrelx(640, 1), @@ -11559,7 +11559,7 @@ u32 g_TvCmdlist07[] = { tvcmd_restart(), }; -u32 g_TvCmdlist08[] = { +u32 g_TvCmdlistBarsGreen[] = { tvcmd_settexture(30), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrelx(-640, 1), @@ -11567,7 +11567,7 @@ u32 g_TvCmdlist08[] = { tvcmd_restart(), }; -u32 g_TvCmdlist0F[] = { +u32 g_TvCmdlistPulseRed[] = { tvcmd_settexture(49), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), @@ -11578,7 +11578,7 @@ u32 g_TvCmdlist0F[] = { tvcmd_restart(), }; -u32 g_TvCmdlist10[] = { +u32 g_TvCmdlistPulseGreen[] = { tvcmd_settexture(49), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), @@ -11589,7 +11589,7 @@ u32 g_TvCmdlist10[] = { tvcmd_restart(), }; -u32 g_TvCmdlist11[] = { +u32 g_TvCmdlistSolidGray[] = { tvcmd_settexture(49), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), @@ -11598,7 +11598,7 @@ u32 g_TvCmdlist11[] = { tvcmd_restart(), }; -u32 g_TvCmdlist12[] = { +u32 g_TvCmdlistSolidRed[] = { tvcmd_settexture(49), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), @@ -11607,7 +11607,7 @@ u32 g_TvCmdlist12[] = { tvcmd_restart(), }; -u32 g_TvCmdlist13[] = { +u32 g_TvCmdlistSolidGreen[] = { tvcmd_settexture(49), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), @@ -11616,56 +11616,56 @@ u32 g_TvCmdlist13[] = { tvcmd_restart(), }; -u32 g_TvCmdlist16[] = { +u32 g_TvCmdlistMaian[] = { tvcmd_settexture(51), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist17[] = { +u32 g_TvCmdlistBio[] = { tvcmd_settexture(72), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist18[] = { +u32 g_TvCmdlistJoHead[] = { tvcmd_settexture(73), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist19[] = { +u32 g_TvCmdlistJoFrock[] = { tvcmd_settexture(74), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist1A[] = { +u32 g_TvCmdlistPlanet1[] = { tvcmd_settexture(75), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist1B[] = { +u32 g_TvCmdlistPlanet2[] = { tvcmd_settexture(76), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist1C[] = { +u32 g_TvCmdlistPlanet3[] = { tvcmd_settexture(77), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist24[] = { +u32 g_TvCmdlistCyclePlanets[] = { tvcmd_setcolour(0x000000ff, 1), tvcmd_settexture(75), tvcmd_pause(1), @@ -11688,14 +11688,14 @@ u32 g_TvCmdlist24[] = { tvcmd_restart(), }; -u32 g_TvCmdlist1D[] = { +u32 g_TvCmdlistSkedar[] = { tvcmd_settexture(78), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 var8006a4dc[] = { +u32 g_TvCmdlistWhiteCoat[] = { tvcmd_settexture(52), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(5), @@ -11708,7 +11708,7 @@ u32 var8006a4dc[] = { tvcmd_restart(), }; -u32 var8006a52c[] = { +u32 g_TvCmdlistStripedShirt[] = { tvcmd_settexture(79), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(5), @@ -11721,7 +11721,7 @@ u32 var8006a52c[] = { tvcmd_restart(), }; -u32 var8006a57c[] = { +u32 g_TvCmdlistFinger[] = { tvcmd_settexture(56), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), @@ -11734,7 +11734,7 @@ u32 var8006a57c[] = { tvcmd_restart(), }; -u32 var8006a5cc[] = { +u32 g_TvCmdlistFist[] = { tvcmd_settexture(60), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(15), @@ -11743,7 +11743,7 @@ u32 var8006a5cc[] = { tvcmd_restart(), }; -u32 var8006a5fc[] = { +u32 g_TvCmdlistPatrol1[] = { tvcmd_settexture(62), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), @@ -11758,7 +11758,7 @@ u32 var8006a5fc[] = { tvcmd_restart(), }; -u32 var8006a65c[] = { +u32 g_TvCmdlistPatrol2[] = { tvcmd_settexture(67), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), @@ -11773,21 +11773,21 @@ u32 var8006a65c[] = { tvcmd_restart(), }; -u32 g_TvCmdlist25[] = { +u32 g_TvCmdlistCassHead[] = { tvcmd_settexture(83), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist26[] = { +u32 g_TvCmdlistDiagram[] = { tvcmd_settexture(84), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist27[] = { +u32 g_TvCmdlistScrollGalaxy1Green[] = { tvcmd_settexture(85), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), @@ -11795,7 +11795,7 @@ u32 g_TvCmdlist27[] = { tvcmd_restart(), }; -u32 g_TvCmdlist28[] = { +u32 g_TvCmdlistScrollUpGalaxy1Blue[] = { tvcmd_settexture(85), tvcmd_setcolour(0x0032c8ff, 1), tvcmd_scrollrely(512, 80), @@ -11803,14 +11803,14 @@ u32 g_TvCmdlist28[] = { tvcmd_restart(), }; -u32 g_TvCmdlist29[] = { +u32 g_TvCmdlistStar[] = { tvcmd_settexture(86), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist2A[] = { +u32 g_TvCmdlistScrollStar[] = { tvcmd_settexture(86), tvcmd_setcolour(0xffffffff, 1), tvcmd_scrollrely(-512, 80), @@ -11818,7 +11818,7 @@ u32 g_TvCmdlist2A[] = { tvcmd_restart(), }; -u32 g_TvCmdlist2B[] = { +u32 g_TvCmdlistScrollGalaxy2Green[] = { tvcmd_settexture(87), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), @@ -11826,7 +11826,7 @@ u32 g_TvCmdlist2B[] = { tvcmd_restart(), }; -u32 g_TvCmdlist2C[] = { +u32 g_TvCmdlistScrollUpGalaxy2Blue[] = { tvcmd_settexture(87), tvcmd_setcolour(0x0032c8ff, 1), tvcmd_scrollrely(512, 80), @@ -11834,14 +11834,14 @@ u32 g_TvCmdlist2C[] = { tvcmd_restart(), }; -u32 g_TvCmdlist2D[] = { +u32 g_TvCmdlistNebula[] = { tvcmd_settexture(88), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist2E[] = { +u32 g_TvCmdlistScrollSymbolsGreen[] = { tvcmd_settexture(89), tvcmd_setcolour(0x007f00ff, 1), tvcmd_scrollrely(-512, 80), @@ -11857,7 +11857,7 @@ u32 g_TvCmdlist2E[] = { tvcmd_restart(), }; -u32 g_TvCmdlist2F[] = { +u32 g_TvCmdlistScrollUpSymbolsOrange[] = { tvcmd_settexture(89), tvcmd_setcolour(0xff7f00ff, 1), tvcmd_scrollrely(512, 80), @@ -11873,28 +11873,28 @@ u32 g_TvCmdlist2F[] = { tvcmd_restart(), }; -u32 g_TvCmdlist30[] = { +u32 g_TvCmdlistGreenObject1[] = { tvcmd_settexture(90), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist31[] = { +u32 g_TvCmdlistGreenObject2[] = { tvcmd_settexture(91), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist32[] = { +u32 g_TvCmdlistGreenObject3[] = { tvcmd_settexture(92), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist33[] = { +u32 g_TvCmdlistCycleGreenObjects[] = { tvcmd_setcolour(0x000000ff, 1), tvcmd_settexture(90), tvcmd_pause(1), @@ -11917,35 +11917,34 @@ u32 g_TvCmdlist33[] = { tvcmd_restart(), }; -u32 g_TvCmdlist34[] = { +u32 g_TvCmdlistPcStand[] = { tvcmd_settexture(93), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist35[] = { +u32 g_TvCmdlistEarth[] = { tvcmd_settexture(94), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist36[] = { +u32 g_TvCmdlistShrine[] = { tvcmd_settexture(95), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; -u32 g_TvCmdlist14[] = { +u32 g_TvCmdlistSolidBlack[] = { tvcmd_settexture(0), tvcmd_setcolour(0x000000ff, 0), - tvcmd_yield(), - // flow on to next cmdlist + tvcmd_stop(), }; -u32 var8006aaa0[] = { +u32 g_TvCmdlistBondZoom[] = { tvcmd_scaleabsx(1024, 0), tvcmd_scaleabsy(1024, 0), tvcmd_pause(1), @@ -11955,7 +11954,7 @@ u32 var8006aaa0[] = { tvcmd_restart(), }; -u32 var8006aae4[] = { +u32 g_TvCmdlistBondPan[] = { tvcmd_settexture(0), tvcmd_scrollrelx(1024, 20), tvcmd_pause(20), @@ -11972,70 +11971,70 @@ u32 var8006aae4[] = { tvcmd_restart(), }; -void tvscreen_set_image_by_num(struct tvscreen *screen, s32 imagenum) +void tvscreen_set_program(struct tvscreen *screen, s32 programnum) { - u32 *image = g_TvCmdlist00; + u32 *cmdlist = g_TvCmdlistDefault; - switch (imagenum) { - case TVCMDLIST_01: image = g_TvCmdlist01; break; - case TVCMDLIST_02: image = g_TvCmdlist02; break; - case TVCMDLIST_03: image = g_TvCmdlist03; break; - case TVCMDLIST_04: image = g_TvCmdlist04; break; - case TVCMDLIST_05: image = g_TvCmdlist05; break; - case TVCMDLIST_06: image = g_TvCmdlist06; break; - case TVCMDLIST_07: image = g_TvCmdlist07; break; - case TVCMDLIST_08: image = g_TvCmdlist08; break; - case TVCMDLIST_09: image = g_TvCmdlist03; break; - case TVCMDLIST_0A: image = g_TvCmdlist03; break; - case TVCMDLIST_0B: image = g_TvCmdlist03; break; - case TVCMDLIST_0C: image = g_TvCmdlist03; break; - case TVCMDLIST_0D: image = g_TvCmdlist03; break; - case TVCMDLIST_0E: image = g_TvCmdlist03; break; - case TVCMDLIST_0F: image = g_TvCmdlist0F; break; - case TVCMDLIST_10: image = g_TvCmdlist10; break; - case TVCMDLIST_11: image = g_TvCmdlist11; break; - case TVCMDLIST_12: image = g_TvCmdlist12; break; - case TVCMDLIST_13: image = g_TvCmdlist13; break; - case TVCMDLIST_14: image = g_TvCmdlist14; break; - case TVCMDLIST_15: image = g_TvCmdlist15; break; - case TVCMDLIST_16: image = g_TvCmdlist16; break; - case TVCMDLIST_17: image = g_TvCmdlist17; break; - case TVCMDLIST_18: image = g_TvCmdlist18; break; - case TVCMDLIST_19: image = g_TvCmdlist19; break; - case TVCMDLIST_1A: image = g_TvCmdlist1A; break; - case TVCMDLIST_1B: image = g_TvCmdlist1B; break; - case TVCMDLIST_1C: image = g_TvCmdlist1C; break; - case TVCMDLIST_1D: image = g_TvCmdlist1D; break; - case TVCMDLIST_24: image = g_TvCmdlist24; break; - case TVCMDLIST_1E: image = g_TvCmdlist08; break; - case TVCMDLIST_1F: image = g_TvCmdlist08; break; - case TVCMDLIST_20: image = g_TvCmdlist08; break; - case TVCMDLIST_21: image = g_TvCmdlist08; break; - case TVCMDLIST_22: image = g_TvCmdlist08; break; - case TVCMDLIST_23: image = g_TvCmdlist08; break; - case TVCMDLIST_25: image = g_TvCmdlist25; break; - case TVCMDLIST_26: image = g_TvCmdlist26; break; - case TVCMDLIST_27: image = g_TvCmdlist27; break; - case TVCMDLIST_28: image = g_TvCmdlist28; break; - case TVCMDLIST_29: image = g_TvCmdlist29; break; - case TVCMDLIST_2A: image = g_TvCmdlist2A; break; - case TVCMDLIST_2B: image = g_TvCmdlist2B; break; - case TVCMDLIST_2C: image = g_TvCmdlist2C; break; - case TVCMDLIST_2D: image = g_TvCmdlist2D; break; - case TVCMDLIST_2E: image = g_TvCmdlist2E; break; - case TVCMDLIST_2F: image = g_TvCmdlist2F; break; - case TVCMDLIST_30: image = g_TvCmdlist30; break; - case TVCMDLIST_31: image = g_TvCmdlist31; break; - case TVCMDLIST_32: image = g_TvCmdlist32; break; - case TVCMDLIST_33: image = g_TvCmdlist33; break; - case TVCMDLIST_34: image = g_TvCmdlist34; break; - case TVCMDLIST_35: image = g_TvCmdlist35; break; - case TVCMDLIST_36: image = g_TvCmdlist36; break; - case TVCMDLIST_00: + switch (programnum) { + case TVPROGRAM_SINEWAVE1: cmdlist = g_TvCmdlistSinewave1; break; + case TVPROGRAM_SINEWAVE2: cmdlist = g_TvCmdlistSinewave2; break; + case TVPROGRAM_SCROLL_TEXT_GREEN: cmdlist = g_TvCmdlistScrollTextGreen; break; + case TVPROGRAM_SCROLLUP_TEXT_RED: cmdlist = g_TvCmdlistScrollUpTextRed; break; + case TVPROGRAM_SCROLLUP_TEXT_GREEN: cmdlist = g_TvCmdlistScrollUpTextGreen; break; + case TVPROGRAM_BARS_YELLOW: cmdlist = g_TvCmdlistBarsYellow; break; + case TVPROGRAM_BARS_TEAL: cmdlist = g_TvCmdlistBarsTeal; break; + case TVPROGRAM_BARS_GREEN: cmdlist = g_TvCmdlistBarsGreen; break; + case TVPROGRAM_SCROLL_TEXT_GREEN_09: cmdlist = g_TvCmdlistScrollTextGreen; break; + case TVPROGRAM_SCROLL_TEXT_GREEN_0A: cmdlist = g_TvCmdlistScrollTextGreen; break; + case TVPROGRAM_SCROLL_TEXT_GREEN_0B: cmdlist = g_TvCmdlistScrollTextGreen; break; + case TVPROGRAM_SCROLL_TEXT_GREEN_0C: cmdlist = g_TvCmdlistScrollTextGreen; break; + case TVPROGRAM_SCROLL_TEXT_GREEN_0D: cmdlist = g_TvCmdlistScrollTextGreen; break; + case TVPROGRAM_SCROLL_TEXT_GREEN_0E: cmdlist = g_TvCmdlistScrollTextGreen; break; + case TVPROGRAM_PULSE_RED: cmdlist = g_TvCmdlistPulseRed; break; + case TVPROGRAM_PULSE_GREEN: cmdlist = g_TvCmdlistPulseGreen; break; + case TVPROGRAM_SOLID_GRAY: cmdlist = g_TvCmdlistSolidGray; break; + case TVPROGRAM_SOLID_RED: cmdlist = g_TvCmdlistSolidRed; break; + case TVPROGRAM_SOLID_GREEN: cmdlist = g_TvCmdlistSolidGreen; break; + case TVPROGRAM_SOLID_BLACK: cmdlist = g_TvCmdlistSolidBlack; break; + case TVPROGRAM_TRANSPARENT: cmdlist = g_TvCmdlistTransparent; break; + case TVPROGRAM_MAIAN: cmdlist = g_TvCmdlistMaian; break; + case TVPROGRAM_BIO: cmdlist = g_TvCmdlistBio; break; + case TVPROGRAM_JOHEAD: cmdlist = g_TvCmdlistJoHead; break; + case TVPROGRAM_JOFROCK: cmdlist = g_TvCmdlistJoFrock; break; + case TVPROGRAM_PLANET1: cmdlist = g_TvCmdlistPlanet1; break; + case TVPROGRAM_PLANET2: cmdlist = g_TvCmdlistPlanet2; break; + case TVPROGRAM_PLANET3: cmdlist = g_TvCmdlistPlanet3; break; + case TVPROGRAM_SKEDAR: cmdlist = g_TvCmdlistSkedar; break; + case TVPROGRAM_CYCLE_PLANETS: cmdlist = g_TvCmdlistCyclePlanets; break; + case TVPROGRAM_BARS_GREEN_1E: cmdlist = g_TvCmdlistBarsGreen; break; + case TVPROGRAM_BARS_GREEN_1F: cmdlist = g_TvCmdlistBarsGreen; break; + case TVPROGRAM_BARS_GREEN_20: cmdlist = g_TvCmdlistBarsGreen; break; + case TVPROGRAM_BARS_GREEN_21: cmdlist = g_TvCmdlistBarsGreen; break; + case TVPROGRAM_BARS_GREEN_22: cmdlist = g_TvCmdlistBarsGreen; break; + case TVPROGRAM_BARS_GREEN_23: cmdlist = g_TvCmdlistBarsGreen; break; + case TVPROGRAM_CASSHEAD: cmdlist = g_TvCmdlistCassHead; break; + case TVPROGRAM_DIAGRAM: cmdlist = g_TvCmdlistDiagram; break; + case TVPROGRAM_SCROLL_GALAXY1_GREEN: cmdlist = g_TvCmdlistScrollGalaxy1Green; break; + case TVPROGRAM_SCROLLUP_GALAXY1_BLUE: cmdlist = g_TvCmdlistScrollUpGalaxy1Blue; break; + case TVPROGRAM_STAR: cmdlist = g_TvCmdlistStar; break; + case TVPROGRAM_SCROLL_STAR: cmdlist = g_TvCmdlistScrollStar; break; + case TVPROGRAM_SCROLL_GALAXY2_GREEN: cmdlist = g_TvCmdlistScrollGalaxy2Green; break; + case TVPROGRAM_SCROLLUP_GALAXY2_BLUE: cmdlist = g_TvCmdlistScrollUpGalaxy2Blue; break; + case TVPROGRAM_NEBULA: cmdlist = g_TvCmdlistNebula; break; + case TVPROGRAM_SCROLL_SYMBOLS_GREEN: cmdlist = g_TvCmdlistScrollSymbolsGreen; break; + case TVPROGRAM_SCROLLUP_SYMBOLS_ORANGE: cmdlist = g_TvCmdlistScrollUpSymbolsOrange; break; + case TVPROGRAM_GREENOBJECT1: cmdlist = g_TvCmdlistGreenObject1; break; + case TVPROGRAM_GREENOBJECT2: cmdlist = g_TvCmdlistGreenObject2; break; + case TVPROGRAM_GREENOBJECT3: cmdlist = g_TvCmdlistGreenObject3; break; + case TVPROGRAM_CYCLE_GREENOBJECTS: cmdlist = g_TvCmdlistCycleGreenObjects; break; + case TVPROGRAM_PCSTAND: cmdlist = g_TvCmdlistPcStand; break; + case TVPROGRAM_EARTH: cmdlist = g_TvCmdlistEarth; break; + case TVPROGRAM_SHRINE: cmdlist = g_TvCmdlistShrine; break; + case TVPROGRAM_DEFAULT: break; } - tvscreen_set_cmdlist(screen, image); + tvscreen_set_cmdlist(screen, cmdlist); } void tvscreen_set_texture(struct tvscreen *screen, s32 texturenum) @@ -13135,7 +13134,7 @@ Gfx *tvscreen_render(struct model *model, struct modelnode *node, struct tvscree case TVCMD_RESTART: screen->offset = 0; break; - case TVCMD_YIELD: + case TVCMD_STOP: yielding = true; break; case TVCMD_SETCOLOUR: @@ -15516,16 +15515,16 @@ void obj_damage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapo struct singlemonitorobj *monitor = (struct singlemonitorobj *) obj; if (obj_get_destroyed_level(obj) == 1) { - tvscreen_set_cmdlist(&monitor->screen, g_TvCmdlist14); + tvscreen_set_cmdlist(&monitor->screen, g_TvCmdlistSolidBlack); } } else if (obj->type == OBJTYPE_MULTIMONITOR) { struct multimonitorobj *monitor = (struct multimonitorobj *) obj; if (obj_get_destroyed_level(obj) == 1) { - tvscreen_set_cmdlist(&monitor->screens[0], g_TvCmdlist14); - tvscreen_set_cmdlist(&monitor->screens[1], g_TvCmdlist14); - tvscreen_set_cmdlist(&monitor->screens[2], g_TvCmdlist14); - tvscreen_set_cmdlist(&monitor->screens[3], g_TvCmdlist14); + tvscreen_set_cmdlist(&monitor->screens[0], g_TvCmdlistSolidBlack); + tvscreen_set_cmdlist(&monitor->screens[1], g_TvCmdlistSolidBlack); + tvscreen_set_cmdlist(&monitor->screens[2], g_TvCmdlistSolidBlack); + tvscreen_set_cmdlist(&monitor->screens[3], g_TvCmdlistSolidBlack); } } else if (obj->type == OBJTYPE_GASBOTTLE) { if (obj_get_destroyed_level(obj) == 1) { diff --git a/src/game/propobjbss.c b/src/game/propobjbss.c index 955886560..98154ca73 100644 --- a/src/game/propobjbss.c +++ b/src/game/propobjbss.c @@ -9,9 +9,9 @@ struct coord var8009ce78; u32 var8009ce84; struct coord var8009ce88; u32 var8009ce94; -struct tvscreen var8009ce98; +struct tvscreen g_TvCmdlistDefaultCopy; u32 var8009cf0c; -struct tvscreen var8009cf10; +struct tvscreen g_TvCmdlistBondZoomCopy; u32 var8009cf84; -struct tvscreen var8009cf88; +struct tvscreen g_TvCmdlistBondPanCopy; u32 var8009cffc[12]; diff --git a/src/game/setup.c b/src/game/setup.c index 6a5acc659..133c2200b 100644 --- a/src/game/setup.c +++ b/src/game/setup.c @@ -252,9 +252,9 @@ void setup_create_blocked_path(struct blockedpathobj *blockedpath) void setup_reset_tvscreens(void) { - { struct tvscreen tmp = MKTVSCREEN(g_TvCmdlist00); var8009ce98 = tmp; } - { struct tvscreen tmp = MKTVSCREEN(var8006aaa0); var8009cf10 = tmp; } - { struct tvscreen tmp = MKTVSCREEN(var8006aae4); var8009cf88 = tmp; } + { struct tvscreen tmp = MKTVSCREEN(g_TvCmdlistDefault); g_TvCmdlistDefaultCopy = tmp; } + { struct tvscreen tmp = MKTVSCREEN(g_TvCmdlistBondZoom); g_TvCmdlistBondZoomCopy = tmp; } + { struct tvscreen tmp = MKTVSCREEN(g_TvCmdlistBondPan); g_TvCmdlistBondPanCopy = tmp; } } u32 var80061bdc = 0; @@ -806,8 +806,8 @@ void setup_create_single_monitor(struct singlemonitorobj *monitor, s32 cmdindex) { u32 stack[2]; - monitor->screen = var8009ce98; - tvscreen_set_image_by_num(&monitor->screen, monitor->imagenum); + monitor->screen = g_TvCmdlistDefaultCopy; + tvscreen_set_program(&monitor->screen, monitor->imagenum); // In GE, monitors with a negative pad are hanging TVs which attach to a // hangingmonitors object, which is actually just the mount. In PD, hanging @@ -870,17 +870,17 @@ void setup_create_single_monitor(struct singlemonitorobj *monitor, s32 cmdindex) void setup_create_multi_monitor(struct multimonitorobj *monitor, s32 cmdindex) { - monitor->screens[0] = var8009ce98; - tvscreen_set_image_by_num(&monitor->screens[0], monitor->imagenums[0]); + monitor->screens[0] = g_TvCmdlistDefaultCopy; + tvscreen_set_program(&monitor->screens[0], monitor->imagenums[0]); - monitor->screens[1] = var8009ce98; - tvscreen_set_image_by_num(&monitor->screens[1], monitor->imagenums[1]); + monitor->screens[1] = g_TvCmdlistDefaultCopy; + tvscreen_set_program(&monitor->screens[1], monitor->imagenums[1]); - monitor->screens[2] = var8009ce98; - tvscreen_set_image_by_num(&monitor->screens[2], monitor->imagenums[2]); + monitor->screens[2] = g_TvCmdlistDefaultCopy; + tvscreen_set_program(&monitor->screens[2], monitor->imagenums[2]); - monitor->screens[3] = var8009ce98; - tvscreen_set_image_by_num(&monitor->screens[3], monitor->imagenums[3]); + monitor->screens[3] = g_TvCmdlistDefaultCopy; + tvscreen_set_program(&monitor->screens[3], monitor->imagenums[3]); setup_create_object(&monitor->base, cmdindex); } diff --git a/src/include/bss.h b/src/include/bss.h index 6739f9252..b2870806d 100644 --- a/src/include/bss.h +++ b/src/include/bss.h @@ -115,9 +115,9 @@ extern struct model *g_EmbedModel; extern struct modelnode *g_EmbedNode; extern struct coord var8009ce78; extern struct coord var8009ce88; -extern struct tvscreen var8009ce98; -extern struct tvscreen var8009cf10; -extern struct tvscreen var8009cf88; +extern struct tvscreen g_TvCmdlistDefaultCopy; +extern struct tvscreen g_TvCmdlistBondZoomCopy; +extern struct tvscreen g_TvCmdlistBondPanCopy; extern struct stagesetup g_StageSetup; extern u8 *g_GeCreditsData; extern struct objective *g_Objectives[MAX_OBJECTIVES]; diff --git a/src/include/constants.h b/src/include/constants.h index 2d42229f7..96e9d2c58 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -4219,66 +4219,66 @@ #define TVCMD_SETCMDLIST 0x09 #define TVCMD_RANDSETCMDLIST 0x0a #define TVCMD_RESTART 0x0b -#define TVCMD_YIELD 0x0c +#define TVCMD_STOP 0x0c #define TVCMD_SETCOLOUR 0x0d #define TVCMD_ROTATEABS 0x0e #define TVCMD_ROTATEREL 0x0f -#define TVCMDLIST_00 0x00 -#define TVCMDLIST_01 0x01 -#define TVCMDLIST_02 0x02 -#define TVCMDLIST_03 0x03 -#define TVCMDLIST_04 0x04 -#define TVCMDLIST_05 0x05 -#define TVCMDLIST_06 0x06 -#define TVCMDLIST_07 0x07 -#define TVCMDLIST_08 0x08 -#define TVCMDLIST_09 0x09 -#define TVCMDLIST_0A 0x0a -#define TVCMDLIST_0B 0x0b -#define TVCMDLIST_0C 0x0c -#define TVCMDLIST_0D 0x0d -#define TVCMDLIST_0E 0x0e -#define TVCMDLIST_0F 0x0f -#define TVCMDLIST_10 0x10 -#define TVCMDLIST_11 0x11 -#define TVCMDLIST_12 0x12 -#define TVCMDLIST_13 0x13 -#define TVCMDLIST_14 0x14 -#define TVCMDLIST_15 0x15 -#define TVCMDLIST_16 0x16 -#define TVCMDLIST_17 0x17 -#define TVCMDLIST_18 0x18 -#define TVCMDLIST_19 0x19 -#define TVCMDLIST_1A 0x1a -#define TVCMDLIST_1B 0x1b -#define TVCMDLIST_1C 0x1c -#define TVCMDLIST_1D 0x1d -#define TVCMDLIST_1E 0x1e -#define TVCMDLIST_1F 0x1f -#define TVCMDLIST_20 0x20 -#define TVCMDLIST_21 0x21 -#define TVCMDLIST_22 0x22 -#define TVCMDLIST_23 0x23 -#define TVCMDLIST_24 0x24 -#define TVCMDLIST_25 0x25 -#define TVCMDLIST_26 0x26 -#define TVCMDLIST_27 0x27 -#define TVCMDLIST_28 0x28 -#define TVCMDLIST_29 0x29 -#define TVCMDLIST_2A 0x2a -#define TVCMDLIST_2B 0x2b -#define TVCMDLIST_2C 0x2c -#define TVCMDLIST_2D 0x2d -#define TVCMDLIST_2E 0x2e -#define TVCMDLIST_2F 0x2f -#define TVCMDLIST_30 0x30 -#define TVCMDLIST_31 0x31 -#define TVCMDLIST_32 0x32 -#define TVCMDLIST_33 0x33 -#define TVCMDLIST_34 0x34 -#define TVCMDLIST_35 0x35 -#define TVCMDLIST_36 0x36 +#define TVPROGRAM_DEFAULT 0x00 // scrolling green text +#define TVPROGRAM_SINEWAVE1 0x01 +#define TVPROGRAM_SINEWAVE2 0x02 // not used +#define TVPROGRAM_SCROLL_TEXT_GREEN 0x03 +#define TVPROGRAM_SCROLLUP_TEXT_RED 0x04 +#define TVPROGRAM_SCROLLUP_TEXT_GREEN 0x05 +#define TVPROGRAM_BARS_YELLOW 0x06 +#define TVPROGRAM_BARS_TEAL 0x07 // not used +#define TVPROGRAM_BARS_GREEN 0x08 +#define TVPROGRAM_SCROLL_TEXT_GREEN_09 0x09 // not used +#define TVPROGRAM_SCROLL_TEXT_GREEN_0A 0x0a // not used +#define TVPROGRAM_SCROLL_TEXT_GREEN_0B 0x0b // not used +#define TVPROGRAM_SCROLL_TEXT_GREEN_0C 0x0c // not used +#define TVPROGRAM_SCROLL_TEXT_GREEN_0D 0x0d // not used +#define TVPROGRAM_SCROLL_TEXT_GREEN_0E 0x0e // not used +#define TVPROGRAM_PULSE_RED 0x0f +#define TVPROGRAM_PULSE_GREEN 0x10 // not used +#define TVPROGRAM_SOLID_GRAY 0x11 +#define TVPROGRAM_SOLID_RED 0x12 +#define TVPROGRAM_SOLID_GREEN 0x13 +#define TVPROGRAM_SOLID_BLACK 0x14 +#define TVPROGRAM_TRANSPARENT 0x15 +#define TVPROGRAM_MAIAN 0x16 // not used +#define TVPROGRAM_BIO 0x17 // not used +#define TVPROGRAM_JOHEAD 0x18 // not used +#define TVPROGRAM_JOFROCK 0x19 // not used +#define TVPROGRAM_PLANET1 0x1a // not used +#define TVPROGRAM_PLANET2 0x1b // not used +#define TVPROGRAM_PLANET3 0x1c // not used +#define TVPROGRAM_SKEDAR 0x1d // not used +#define TVPROGRAM_BARS_GREEN_1E 0x1e // not used +#define TVPROGRAM_BARS_GREEN_1F 0x1f // not used +#define TVPROGRAM_BARS_GREEN_20 0x20 +#define TVPROGRAM_BARS_GREEN_21 0x21 +#define TVPROGRAM_BARS_GREEN_22 0x22 +#define TVPROGRAM_BARS_GREEN_23 0x23 +#define TVPROGRAM_CYCLE_PLANETS 0x24 // not used +#define TVPROGRAM_CASSHEAD 0x25 // not used +#define TVPROGRAM_DIAGRAM 0x26 // not used +#define TVPROGRAM_SCROLL_GALAXY1_GREEN 0x27 // not used +#define TVPROGRAM_SCROLLUP_GALAXY1_BLUE 0x28 // not used +#define TVPROGRAM_STAR 0x29 // not used +#define TVPROGRAM_SCROLL_STAR 0x2a // not used +#define TVPROGRAM_SCROLL_GALAXY2_GREEN 0x2b // not used +#define TVPROGRAM_SCROLLUP_GALAXY2_BLUE 0x2c // not used +#define TVPROGRAM_NEBULA 0x2d // not used +#define TVPROGRAM_SCROLL_SYMBOLS_GREEN 0x2e // not used +#define TVPROGRAM_SCROLLUP_SYMBOLS_ORANGE 0x2f // not used +#define TVPROGRAM_GREENOBJECT1 0x30 // not used +#define TVPROGRAM_GREENOBJECT2 0x31 // not used +#define TVPROGRAM_GREENOBJECT3 0x32 // not used +#define TVPROGRAM_CYCLE_GREENOBJECTS 0x33 // not used +#define TVPROGRAM_PCSTAND 0x34 // not used +#define TVPROGRAM_EARTH 0x35 // not used +#define TVPROGRAM_SHRINE 0x36 // not used #define USETIMER_CONTINUE 0 #define USETIMER_STOP 1 diff --git a/src/include/data.h b/src/include/data.h index 2e5339e6c..41a466f3b 100644 --- a/src/include/data.h +++ b/src/include/data.h @@ -218,9 +218,9 @@ extern struct autogunobj *g_ThrownLaptops; extern struct beam *g_ThrownLaptopBeams; extern s32 g_MaxThrownLaptops; extern struct prop *g_Lifts[10]; -extern u32 g_TvCmdlist00[]; -extern u32 var8006aaa0[]; -extern u32 var8006aae4[]; +extern u32 g_TvCmdlistDefault[]; +extern u32 g_TvCmdlistBondZoom[]; +extern u32 g_TvCmdlistBondPan[]; extern struct pschannel *g_PsChannels; extern s8 var8006ae18; extern s8 var8006ae1c; diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index 00cb258f9..f4de6a066 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -95,7 +95,7 @@ void chopper_fire_rocket(struct chopperobj *chopper, bool side); u32 obj_tick(struct prop *prop); s32 obj_tick_player(struct prop *prop); Gfx *props_render_beams(Gfx *gdl); -void tvscreen_set_image_by_num(struct tvscreen *screen, s32 imagenum); +void tvscreen_set_program(struct tvscreen *screen, s32 programnum); Gfx *tvscreen_render(struct model *model, struct modelnode *node, struct tvscreen *screen, Gfx *gdl, s32 arg4, s32 arg5); Gfx *gfx_render_radial_shadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, u32 colour); Gfx *obj_render(struct prop *prop, Gfx *gdl, bool xlupass); diff --git a/src/include/tvcmds.h b/src/include/tvcmds.h index 760ff645a..3bf42f5bf 100644 --- a/src/include/tvcmds.h +++ b/src/include/tvcmds.h @@ -73,11 +73,10 @@ TVCMD_RESTART /** - * Stop executing the list and yield control back to the engine. - * A frame will pass before the script is resumed. + * Stop executing the list. Once stopped, it cannot be resumed. */ -#define tvcmd_yield() \ - TVCMD_YIELD +#define tvcmd_stop() \ + TVCMD_STOP /** * Fade to the given RBGA colour, takeing time240 to get there. diff --git a/src/setups/setupame.c b/src/setups/setupame.c index 9edd5573c..41d10adcc 100644 --- a/src/setups/setupame.c +++ b/src/setups/setupame.c @@ -385,43 +385,43 @@ u32 props[] = { tag(0x3b, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01A4, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01A3, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01A2, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 35) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01A2, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_23) tag(0x3c, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01A5, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01A6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01A7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 35) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01A7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_23) tag(0x3a, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01A8, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01A9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01AA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 32) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01AA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_20) tag(0x39, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01AB, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01AC, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01AD, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 33) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01AD, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_21) tag(0x5e, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01B0, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01AF, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01AE, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 35) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01AE, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_23) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01B1, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01BA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01BB, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) #if VERSION >= VERSION_NTSC_1_0 tag(0x63, 1) #endif - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01BC, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01BC, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x0d, 1) stdobject(0x0100, MODEL_LIGHTSWITCH2, PAD_AME_013E, OBJFLAG_FALL, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01B3, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01B4, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01B5, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 8) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01B5, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01B2, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x0c, 1) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01B6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01B6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_REDSOFA, PAD_AME_00DB, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x36, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_01B7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_01B8, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_01B9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 32) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_01B9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_20) tag(0x35, 1) stdobject(0x0100, MODEL_DD_REDARM, PAD_AME_00DC, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_REDARM, PAD_AME_00DD, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) @@ -429,9 +429,9 @@ u32 props[] = { stdobject(0x0100, MODEL_DD_DESK, PAD_AME_022E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_AME_0232, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_PUSHABLE, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_AME_0231, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, OBJFLAG3_PUSHABLE, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_0230, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 35) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_0233, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 35) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_0234, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_0230, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_23) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_0233, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_23) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_0234, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) chr(SPAWNFLAG_BASICGUARD, 0x06, PAD_AME_0011, BODY_DD_GUARD, HEAD_RANDOM, 0x040a, 0x001d, -1, 1000, 9, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_SURPRISABLE | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_CANLOSEGUN, CHRFLAG1_ADJUSTPUNCHSPEED | CHRFLAG1_LONG_CAMSPY_OBSERVATION, TEAM_ENEMY, SQUADRON_01, -1, 3, 2, 0, 20, 0) weapon(0x0100, MODEL_CHRCMP150, 0x0006, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_BASICGUARD, 0x05, PAD_AME_01C0, BODY_DD_GUARD, HEAD_RANDOM, AILIST_INIT_DD_GUARD, 0x001e, -1, 1000, 100, CHRFLAG0_CAN_EXAMINE_BODY | CHRFLAG0_CAN_RETREAT | CHRFLAG0_SURPRISABLE | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_CAN_FLEESURRENDER | CHRFLAG0_CAN_HEAR_ALARMS | CHRFLAG0_COVER_TYPE2 | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_01, -1, 0, 2, 0, 20, 0) @@ -570,7 +570,7 @@ u32 props[] = { rename_object(-1, WEAPON_NECKLACE, L_AME_011, L_AME_012, L_AME_013, L_AME_014, L_AME_015) // "Obtain De Vries' necklace." stdobject(0x0100, MODEL_DD_STONEDESK, PAD_AME_0134, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_AME_0132, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 33) + singlemonitor(0x0100, MODEL_PC1, PAD_AME_0132, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_21) tag(0x50, 6) tag(0x51, 6) tag(0x52, 6) @@ -590,19 +590,19 @@ u32 props[] = { camera2(0x0000, 0xffff67da, 0xfffd8eec, 0xfffe7c44, 0x0004a147, 0x0005f851, 0x00000219) tag(0x16, -1) tag(0x04, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_AME_025C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_AME_025C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x03, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_AME_013C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_AME_013C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x14, 1) stdobject(0x0100, MODEL_LIGHTSWITCH, PAD_AME_013D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000) tag(0x10, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_0258, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 8, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_0258, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_BARS_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x11, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_0259, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 34, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_0259, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_BARS_GREEN_22, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x12, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_025A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 35, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_025A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_BARS_GREEN_23, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x13, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_025B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 33, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_AME_025B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_BARS_GREEN_21, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x19, 2) tag(0x1a, 2) stdobject(0x0100, MODEL_DD_BANNER, -1, OBJFLAG_FALL | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) diff --git a/src/setups/setupark.c b/src/setups/setupark.c index c01ed6e5a..70a456970 100644 --- a/src/setups/setupark.c +++ b/src/setups/setupark.c @@ -320,35 +320,35 @@ u32 props[] = { stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_01A0, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_019F, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x01, 1) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_019E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_019E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_01A1, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_01A2, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01A3, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01A3, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_01A4, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_01A5, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01A6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01A6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_01A7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_01A8, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01A9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01A9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_01AC, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_01AB, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01AA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01AA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_01AD, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_LIGHTSWITCH2, PAD_ARK_012E, OBJFLAG_FALL, 0, 0, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_01AF, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01B1, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01B2, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01B1, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01B2, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_REDSOFA, PAD_ARK_00CB, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_01B3, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_01B4, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01B5, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_01B5, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_DD_REDARM, PAD_ARK_00CC, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_DD_REDARM, PAD_ARK_00CD, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_ARK_0225, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_0226, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_ARK_0228, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_022A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) - singlemonitor(0x0100, MODEL_PC1, PAD_ARK_022B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 3) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_022A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_PC1, PAD_ARK_022B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_BLASTSHIELD, PAD_ARK_0232, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_BLASTSHIELD, PAD_ARK_0233, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_BLASTSHIELD, PAD_ARK_0234, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) @@ -485,7 +485,7 @@ u32 props[] = { stdobject(0x0100, MODEL_A51_CRATE2, PAD_ARK_0132, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_A51_CRATE2, PAD_ARK_0133, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_DD_STONEDESK, PAD_ARK_0124, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000) - multimonitor(0x0099, MODEL_COMHUB, PAD_ARK_012C, OBJFLAG_00000002, 0, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_ARK_012C, OBJFLAG_00000002, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x0a, 1) stdobject(0x0100, MODEL_LIGHTSWITCH, PAD_ARK_012D, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000) tinted_glass(0x0100, MODEL_DD_WINDOW, PAD_ARK_0111, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_PATHBLOCKER | OBJFLAG_AISEETHROUGH, 0, 0, 1000, 0x04b007d0) diff --git a/src/setups/setupcave.c b/src/setups/setupcave.c index 6646abeda..0f729ad8f 100644 --- a/src/setups/setupcave.c +++ b/src/setups/setupcave.c @@ -263,7 +263,7 @@ u32 props[] = { weapon(0x0180, MODEL_CHRBRIEFCASE, PAD_CAVE_0113, OBJFLAG_FALL | OBJFLAG_INVINCIBLE | OBJFLAG_FORCENOBOUNCE, OBJFLAG2_IMMUNETOANTI, 0, WEAPON_SUITCASE) rename_object(-1, WEAPON_SUITCASE, L_CAVE_010, L_CAVE_011, L_CAVE_012, L_CAVE_013, L_CAVE_014) // "Obtain suitcase." tag(0x01, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_CAVE_0156, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_CAVE_0156, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x02, 1) weapon(0x0080, MODEL_STEWARDESS_TROLLEY, PAD_CAVE_00B6, OBJFLAG_00000008, 0, 0, WEAPON_DISGUISE41) rename_object(-1, WEAPON_DISGUISE41, L_CAVE_015, L_CAVE_016, L_CAVE_017, L_CAVE_018, L_CAVE_019) // "Obtain air stewardess uniform." @@ -335,7 +335,7 @@ u32 props[] = { lift_door(-8, -15, 3) lift_door(-8, -16, 3) tag(0x05, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_CAVE_0153, OBJFLAG_00000002 | OBJFLAG_CORE_GEO_INUSE, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_CAVE_0153, OBJFLAG_00000002 | OBJFLAG_CORE_GEO_INUSE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x07, 17) tag(0x08, 17) tag(0x09, 17) @@ -452,7 +452,7 @@ u32 props[] = { door(0x0100, MODEL_AF1_INNERDOOR, PAD_CAVE_018D, OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x0000e666, 0x00005555, 0x00005555, 0x000007ae, DOORFLAG_0004, DOORTYPE_SLIDING, 0x00000000, 0x00000384, 0x00000000, 0x00000000, 0x00000800) door(0x0100, MODEL_AF1_INNERDOOR, PAD_CAVE_018F, OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_DEACTIVATED, OBJFLAG2_AICANNOTUSE, 0, 1000, 0x0000f333, 0x0000e666, 0x00005555, 0x00005555, 0x000007ae, DOORFLAG_0004, DOORTYPE_SLIDING, 0x00000002, 0x00000384, 0x00000000, 0x00000000, 0x00000800) tag(0x19, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_CAVE_0154, OBJFLAG_00000002 | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_CAVE_0154, OBJFLAG_00000002 | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) hovercar(0x0080, MODEL_TESTERBOT, PAD_CAVE_01BA, OBJFLAG_00000008 | OBJFLAG_HOVERCAR_INIT | OBJFLAG_HOVERCAR_40000000 | OBJFLAG_HOVERCAR_ISHOVERBOT, 0, 0, 100, 0x042e) hovercar(0x0080, MODEL_HOOVERBOT, PAD_CAVE_01BA, OBJFLAG_00000008 | OBJFLAG_HOVERCAR_INIT | OBJFLAG_HOVERCAR_40000000 | OBJFLAG_HOVERCAR_ISHOVERBOT, 0, 0, 100, 0x042f) hovercar(0x0080, MODEL_HOOVERBOT, PAD_CAVE_01C3, OBJFLAG_00000008 | OBJFLAG_HOVERCAR_INIT | OBJFLAG_HOVERCAR_40000000 | OBJFLAG_HOVERCAR_ISHOVERBOT, 0, 0, 100, 0x0431) @@ -1735,8 +1735,8 @@ u8 func1007_console_activation[] = { label(0x02) set_stage_flag(STAGEFLAG_CONSOLE_ACTIVATED) - set_object_image(OBJ_CONSOLE, 0, TVCMDLIST_0F) - set_object_image(OBJ_CONSOLE, 1, TVCMDLIST_0F) + set_object_image(OBJ_CONSOLE, 0, TVPROGRAM_PULSE_RED) + set_object_image(OBJ_CONSOLE, 1, TVPROGRAM_PULSE_RED) set_chr_flag_bankx(0x12, CHRFLAG0_SKIPSAFETYCHECKS, BANK_0) show_hudmsg(CHR_P1P2, L_CAVE_035) // "System shutdown initiated..." mute_channel(CHANNEL_1) @@ -1753,7 +1753,7 @@ u8 func1007_console_activation[] = { endloop(0x04) label(0x02) - set_object_image(OBJ_CONSOLE, 0, TVCMDLIST_14) + set_object_image(OBJ_CONSOLE, 0, TVPROGRAM_SOLID_BLACK) mute_channel(CHANNEL_1) assign_sound(SFX_0479, CHANNEL_1) set_object_sound_playing(CHANNEL_1, OBJ_CONSOLE, TRUE) @@ -1767,7 +1767,7 @@ u8 func1007_console_activation[] = { endloop(0x05) label(0x31) - set_object_image(OBJ_CONSOLE, 1, TVCMDLIST_14) + set_object_image(OBJ_CONSOLE, 1, TVPROGRAM_SOLID_BLACK) play_x_track(XREASON_DEFAULT, 88, 88) beginloop(0x06) diff --git a/src/setups/setupdam.c b/src/setups/setupdam.c index 62354186c..2bb49eda0 100644 --- a/src/setups/setupdam.c +++ b/src/setups/setupdam.c @@ -491,14 +491,14 @@ u32 props[] = { tag(0x05, 8) tag(0x06, 8) tag(0x07, 8) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F2, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F3, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F4, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F5, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F6, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F7, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F8, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F9, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F2, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F3, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F4, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F5, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F6, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F7, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F8, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01F9, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) tag(0x08, 1) tag(0x09, 1) tag(0x0a, 1) @@ -508,7 +508,7 @@ u32 props[] = { tag(0x0e, 1) tag(0x0f, 1) tag(0x13, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01FA, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 19, 19, 19, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_DAM_01FA, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_SOLID_GREEN, TVPROGRAM_DEFAULT) tag(0x14, 1) key(0x0080, MODEL_CHRBRIEFCASE, 0x004e, OBJFLAG_ASSIGNEDTOCHR | OBJFLAG_COLLECTABLE | OBJFLAG_BOUNCEIFSHOT | OBJFLAG_01000000, 0, 0, 0) rename_object(-1, WEAPON_RESEARCHTAPE, L_DAM_022, L_DAM_023, L_DAM_024, L_DAM_025, L_DAM_026) // "" @@ -523,22 +523,22 @@ u32 props[] = { tag(0x23, 5) tag(0x24, 5) tag(0x25, 5) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FB, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FC, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FD, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FE, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FF, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FB, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SOLID_BLACK) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FC, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SOLID_BLACK) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FD, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SOLID_BLACK) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FE, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SOLID_BLACK) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_01FF, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SOLID_BLACK) tag(0x17, 1) #if VERSION >= VERSION_PAL_BETA - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0200, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0200, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) #else - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0200, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0200, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) #endif tag(0x1a, 1) #if VERSION >= VERSION_PAL_BETA - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0201, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0201, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) #else - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0201, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_DAM_0201, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) #endif camera(0x00c0, MODEL_CCTV_PD, PAD_DAM_0219, OBJFLAG_00000002 | OBJFLAG_00000008, 0, 0, 400, 0x01f7, 0x00004000, 0x0000001e, 0x000002bc) camera(0x00c0, MODEL_CCTV_PD, PAD_DAM_021A, OBJFLAG_00000002 | OBJFLAG_00000008, 0, 0, 400, 0x00dd, 0x00004000, 0x0000001e, 0x000002bc) @@ -554,12 +554,12 @@ u32 props[] = { stdobject(0x0065, MODEL_A51_CRATE1, -1, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) tag(0x26, 1) stdobject(0x0100, MODEL_COREHATCH, PAD_DAM_011E, OBJFLAG_FALL | OBJFLAG_00000010 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_FORCENOBOUNCE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_021F, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0220, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0221, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0222, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0223, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0224, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_021F, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0220, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0221, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0222, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0223, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_DAM_0224, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x1f, 1) shield(0x0100, MODEL_CHRSHIELD, PAD_DAM_021D, OBJFLAG_FALL, OBJFLAG2_EXCLUDE_SA | OBJFLAG2_EXCLUDE_PA | OBJFLAG2_EXCLUDE_PD, 0, 1000) tag(0x20, 1) @@ -1127,9 +1127,9 @@ u8 func100a_reactor_switch[] = { assign_sound(SFX_8147, CHANNEL_0) set_object_sound_playing(CHANNEL_0, OBJ_REACTOR_SWITCH, TRUE) set_lights_state(0x007f, LIGHTOP_TRANSITION, 255, 6, 120) - set_object_image(OBJ_REACTOR_SWITCH, 0, TVCMDLIST_12) - set_object_image(OBJ_REACTOR_SWITCH, 1, TVCMDLIST_12) - set_object_image(OBJ_REACTOR_SWITCH, 2, TVCMDLIST_12) + set_object_image(OBJ_REACTOR_SWITCH, 0, TVPROGRAM_SOLID_RED) + set_object_image(OBJ_REACTOR_SWITCH, 1, TVPROGRAM_SOLID_RED) + set_object_image(OBJ_REACTOR_SWITCH, 2, TVPROGRAM_SOLID_RED) show_hudmsg(CHR_P1P2, L_DAM_018) // "Reactor has been shut down." set_stage_flag(STAGEFLAG_REACTOR_SHUT_DOWN) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2295,21 +2295,21 @@ u8 func1015_shuffle_hatchswitches[] = { shuffle_pelagic_switches yield yield - set_object_image(OBJ_BADHATCHSWITCH1, 0, TVCMDLIST_12) + set_object_image(OBJ_BADHATCHSWITCH1, 0, TVPROGRAM_SOLID_RED) yield - set_object_image(OBJ_BADHATCHSWITCH2, 0, TVCMDLIST_12) + set_object_image(OBJ_BADHATCHSWITCH2, 0, TVPROGRAM_SOLID_RED) yield - set_object_image(OBJ_BADHATCHSWITCH3, 0, TVCMDLIST_12) + set_object_image(OBJ_BADHATCHSWITCH3, 0, TVPROGRAM_SOLID_RED) yield - set_object_image(OBJ_BADHATCHSWITCH4, 0, TVCMDLIST_12) + set_object_image(OBJ_BADHATCHSWITCH4, 0, TVPROGRAM_SOLID_RED) yield - set_object_image(OBJ_HATCHSWITCH1, 0, TVCMDLIST_13) + set_object_image(OBJ_HATCHSWITCH1, 0, TVPROGRAM_SOLID_GREEN) yield - set_object_image(OBJ_HATCHSWITCH2, 0, TVCMDLIST_13) + set_object_image(OBJ_HATCHSWITCH2, 0, TVPROGRAM_SOLID_GREEN) yield - set_object_image(OBJ_HATCHSWITCH3, 0, TVCMDLIST_13) + set_object_image(OBJ_HATCHSWITCH3, 0, TVPROGRAM_SOLID_GREEN) yield - set_object_image(OBJ_HATCHSWITCH4, 0, TVCMDLIST_13) + set_object_image(OBJ_HATCHSWITCH4, 0, TVPROGRAM_SOLID_GREEN) yield set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2327,7 +2327,7 @@ u8 func1015_shuffle_hatchswitches[] = { label(0x07) \ assign_sound(SFX_043A, CHANNEL_7) \ set_object_sound_playing(CHANNEL_7, switch, TRUE) \ - set_object_image(switch, 0, TVCMDLIST_14) \ + set_object_image(switch, 0, TVPROGRAM_SOLID_BLACK) \ set_stage_flag(flag) \ \ beginloop(0x0b) \ @@ -2335,7 +2335,7 @@ u8 func1015_shuffle_hatchswitches[] = { endloop(0x0b) \ \ label(0x07) \ - set_object_image(switch, 0, TVCMDLIST_13) \ + set_object_image(switch, 0, TVPROGRAM_SOLID_GREEN) \ yield \ yield \ yield \ @@ -2385,7 +2385,7 @@ u8 func101a_badhatchswitches[] = { yield assign_sound(SFX_01C0, CHANNEL_6) set_object_sound_playing(CHANNEL_6, OBJ_BADHATCHSWITCH1, FALSE) - set_object_image(OBJ_BADHATCHSWITCH1, 0, TVCMDLIST_0F) + set_object_image(OBJ_BADHATCHSWITCH1, 0, TVPROGRAM_PULSE_RED) goto_next(0x04) // 2 @@ -2395,7 +2395,7 @@ u8 func101a_badhatchswitches[] = { yield assign_sound(SFX_01C0, CHANNEL_6) set_object_sound_playing(CHANNEL_6, OBJ_BADHATCHSWITCH2, FALSE) - set_object_image(OBJ_BADHATCHSWITCH2, 0, TVCMDLIST_0F) + set_object_image(OBJ_BADHATCHSWITCH2, 0, TVPROGRAM_PULSE_RED) goto_next(0x04) // 3 @@ -2405,7 +2405,7 @@ u8 func101a_badhatchswitches[] = { yield assign_sound(SFX_01C0, CHANNEL_6) set_object_sound_playing(CHANNEL_6, OBJ_BADHATCHSWITCH3, FALSE) - set_object_image(OBJ_BADHATCHSWITCH3, 0, TVCMDLIST_0F) + set_object_image(OBJ_BADHATCHSWITCH3, 0, TVPROGRAM_PULSE_RED) goto_next(0x04) // 4 @@ -2415,7 +2415,7 @@ u8 func101a_badhatchswitches[] = { yield assign_sound(SFX_01C0, CHANNEL_6) set_object_sound_playing(CHANNEL_6, OBJ_BADHATCHSWITCH4, FALSE) - set_object_image(OBJ_BADHATCHSWITCH4, 0, TVCMDLIST_0F) + set_object_image(OBJ_BADHATCHSWITCH4, 0, TVPROGRAM_PULSE_RED) goto_next(0x04) label(0x04) @@ -2430,10 +2430,10 @@ u8 func101a_badhatchswitches[] = { label(0x04) mute_channel(CHANNEL_6) unset_stage_flag(STAGEFLAG_HATCHSWITCHES_RESETTING) - set_object_image(OBJ_BADHATCHSWITCH1, 0, TVCMDLIST_12) - set_object_image(OBJ_BADHATCHSWITCH2, 0, TVCMDLIST_12) - set_object_image(OBJ_BADHATCHSWITCH3, 0, TVCMDLIST_12) - set_object_image(OBJ_BADHATCHSWITCH4, 0, TVCMDLIST_12) + set_object_image(OBJ_BADHATCHSWITCH1, 0, TVPROGRAM_SOLID_RED) + set_object_image(OBJ_BADHATCHSWITCH2, 0, TVPROGRAM_SOLID_RED) + set_object_image(OBJ_BADHATCHSWITCH3, 0, TVPROGRAM_SOLID_RED) + set_object_image(OBJ_BADHATCHSWITCH4, 0, TVPROGRAM_SOLID_RED) goto_first(0x00) endlist @@ -2854,11 +2854,11 @@ u8 func101e_alarm_images[] = { set_object_flag(0x28, OBJFLAG_UNCOLLECTABLE) set_object_flag2(0x27, OBJFLAG2_INVISIBLE) set_object_flag2(0x28, OBJFLAG2_INVISIBLE) - set_object_image(0x21, 0, TVCMDLIST_0F) - set_object_image(0x22, 0, TVCMDLIST_0F) - set_object_image(0x23, 0, TVCMDLIST_0F) - set_object_image(0x24, 0, TVCMDLIST_0F) - set_object_image(0x25, 0, TVCMDLIST_0F) + set_object_image(0x21, 0, TVPROGRAM_PULSE_RED) + set_object_image(0x22, 0, TVPROGRAM_PULSE_RED) + set_object_image(0x23, 0, TVPROGRAM_PULSE_RED) + set_object_image(0x24, 0, TVPROGRAM_PULSE_RED) + set_object_image(0x25, 0, TVPROGRAM_PULSE_RED) beginloop(0x0b) if_alarm_active(/*goto*/ 0x07) @@ -2868,11 +2868,11 @@ u8 func101e_alarm_images[] = { endloop(0x0b) label(0x04) - set_object_image(0x21, 0, TVCMDLIST_14) - set_object_image(0x22, 0, TVCMDLIST_14) - set_object_image(0x23, 0, TVCMDLIST_14) - set_object_image(0x24, 0, TVCMDLIST_14) - set_object_image(0x25, 0, TVCMDLIST_14) + set_object_image(0x21, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x22, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x23, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x24, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x25, 0, TVPROGRAM_SOLID_BLACK) goto_first(0x00) endlist diff --git a/src/setups/setupdepo.c b/src/setups/setupdepo.c index e3cd5dcf0..d6721a008 100644 --- a/src/setups/setupdepo.c +++ b/src/setups/setupdepo.c @@ -267,7 +267,7 @@ u32 props[] = { chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_ANTINONINTERACTABLE, CHR_TRENT, PAD_DEPO_003B, BODY_TRENT, HEAD_TRENT, 0x0411, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_IGNORECOLLISION | SPAWNFLAG_ANTINONINTERACTABLE, CHR_STRIPES, PAD_DEPO_003C, BODY_STRIPES, HEAD_JON, 0x0411, -1, -1, 200, 100, CHRFLAG0_CHUCKNORRIS | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_02, -1, 0, 0, 0, 0, 0) tag(OBJ_GENERATOR, 1) - multimonitor(0x0100, MODEL_PD_CONSOLE, PAD_DEPO_00D0, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 0, 0) + multimonitor(0x0100, MODEL_PD_CONSOLE, PAD_DEPO_00D0, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x3f, 1) door(0x0100, MODEL_DOOR2_G5, PAD_DEPO_009C, OBJFLAG_DEACTIVATED, OBJFLAG2_LOCKEDFRONT, 0, 1000, 0x0000e666, 0x00010000, 0x0001aaaa, 0x0001aaaa, 0x00000ccc, DOORFLAG_WINDOWED | DOORFLAG_0004, DOORTYPE_SLIDING, 0x00000010, 0x00000258, 0x012c0320, 0x00000001, 0x00000300) door(0x0100, MODEL_DOOR2_G5, PAD_DEPO_009D, OBJFLAG_DEACTIVATED, OBJFLAG2_LOCKEDBACK, 0, 1000, 0x0000e666, 0x00010000, 0x0001aaaa, 0x0001aaaa, 0x00000ccc, DOORFLAG_WINDOWED | DOORFLAG_0004, DOORTYPE_SLIDING, 0x00000010, 0x00000258, 0x012c0320, 0xffffffff, 0x00000000) @@ -323,21 +323,21 @@ u32 props[] = { stdobject(0x0200, MODEL_CHRDOORDECODER, PAD_DEPO_0050, OBJFLAG_00000008 | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_FORCENOBOUNCE, OBJFLAG2_IMMUNETOANTI, 0, 1000) tag(OBJ_LIGHTSWITCH, 1) - singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00ED, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, 6) + singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00ED, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_BARS_YELLOW) tag(0x03, 1) - singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00E6, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 19) + singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00E6, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN) tag(0x04, 1) - singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00E8, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 19) + singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00E8, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN) tag(0x05, 1) - singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00E9, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 19) + singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00E9, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN) tag(0x06, 1) - singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00EA, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 19) + singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00EA, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN) tag(0x12, 1) - singlemonitor(0x0019, MODEL_G5_ALARM, PAD_DEPO_00E7, OBJFLAG_00000002, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE, 1000, 4) + singlemonitor(0x0019, MODEL_G5_ALARM, PAD_DEPO_00E7, OBJFLAG_00000002, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLLUP_TEXT_RED) tag(0x13, 1) - singlemonitor(0x0019, MODEL_G5_ALARM, PAD_DEPO_00EB, OBJFLAG_00000002, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE, 1000, 4) + singlemonitor(0x0019, MODEL_G5_ALARM, PAD_DEPO_00EB, OBJFLAG_00000002, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLLUP_TEXT_RED) tag(OBJ_SAFEKEYPAD, 1) - singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00EC, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 1) + singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_DEPO_00EC, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SINEWAVE1) tag(OBJ_SAFEDOOR, 1) door(0x0100, MODEL_G5SAFEDOOR, PAD_DEPO_00C2, OBJFLAG_00000010 | OBJFLAG_DEACTIVATED, OBJFLAG2_AICANNOTUSE, 0, 1000, 0x005a0000, 0x03e80000, 0x00500000, 0x00500000, 0x00001999, 0, DOORTYPE_SWINGING, 0x00000040, 0x00000e10, 0x00000000, 0x00000000, 0x00000300) @@ -587,8 +587,8 @@ u8 func1008_check_generator[] = { // Generator activated label(0x08) if_stage_flag_eq(STAGEFLAG_GENERATOR_SHUT_DOWN2, TRUE, /*goto*/ 0x09) - set_object_image(OBJ_GENERATOR, 0, TVCMDLIST_14) - set_object_image(OBJ_GENERATOR, 1, TVCMDLIST_14) + set_object_image(OBJ_GENERATOR, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(OBJ_GENERATOR, 1, TVPROGRAM_SOLID_BLACK) mute_channel(CHANNEL_4) mute_channel(CHANNEL_0) assign_sound(SFX_8147, CHANNEL_0) @@ -625,7 +625,7 @@ u8 func1003_laser_switch_1[] = { if_stage_flag_eq(STAGEFLAG_LASERSET1_DISABLED, TRUE, /*goto*/ 0x09) // Deactivated - set_object_image(OBJ_LASERSWITCH1, 0, TVCMDLIST_14) + set_object_image(OBJ_LASERSWITCH1, 0, TVPROGRAM_SOLID_BLACK) show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET1_DISABLED) open_door(OBJ_LASER_1A) @@ -648,7 +648,7 @@ u8 func1003_laser_switch_1[] = { label(0x09) show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET1_DISABLED) - set_object_image(OBJ_LASERSWITCH1, 0, TVCMDLIST_13) + set_object_image(OBJ_LASERSWITCH1, 0, TVPROGRAM_SOLID_GREEN) close_door(OBJ_LASER_1A) close_door(OBJ_LASER_1B) close_door(OBJ_LASER_1C) @@ -692,7 +692,7 @@ u8 func1004_laser_switch_2[] = { if_stage_flag_eq(STAGEFLAG_LASERSET2_DISABLED, TRUE, /*goto*/ 0x09) // Deactivated - set_object_image(OBJ_LASERSWITCH2, 0, TVCMDLIST_14) + set_object_image(OBJ_LASERSWITCH2, 0, TVPROGRAM_SOLID_BLACK) show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET2_DISABLED) open_door(OBJ_LASER_2A) @@ -713,7 +713,7 @@ u8 func1004_laser_switch_2[] = { // Activated label(0x09) - set_object_image(OBJ_LASERSWITCH2, 0, TVCMDLIST_13) + set_object_image(OBJ_LASERSWITCH2, 0, TVPROGRAM_SOLID_GREEN) show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET2_DISABLED) close_door(OBJ_LASER_2A) @@ -758,7 +758,7 @@ u8 func1005_laser_switch_3[] = { if_stage_flag_eq(STAGEFLAG_LASERSET3_DISABLED, TRUE, /*goto*/ 0x09) // Deactivated - set_object_image(OBJ_LASERSWITCH3, 0, TVCMDLIST_14) + set_object_image(OBJ_LASERSWITCH3, 0, TVPROGRAM_SOLID_BLACK) show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET3_DISABLED) open_door(OBJ_LASER_3A) @@ -779,7 +779,7 @@ u8 func1005_laser_switch_3[] = { // Activated label(0x09) - set_object_image(OBJ_LASERSWITCH3, 0, TVCMDLIST_13) + set_object_image(OBJ_LASERSWITCH3, 0, TVPROGRAM_SOLID_GREEN) show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET3_DISABLED) close_door(OBJ_LASER_3A) @@ -824,7 +824,7 @@ u8 func1006_laser_switch_4[] = { if_stage_flag_eq(STAGEFLAG_LASERSET4_DISABLED, TRUE, /*goto*/ 0x09) // Deactivated - set_object_image(OBJ_LASERSWITCH4, 0, TVCMDLIST_14) + set_object_image(OBJ_LASERSWITCH4, 0, TVPROGRAM_SOLID_BLACK) show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET4_DISABLED) open_door(OBJ_LASER_4A) @@ -845,7 +845,7 @@ u8 func1006_laser_switch_4[] = { // Activated label(0x09) - set_object_image(OBJ_LASERSWITCH4, 0, TVCMDLIST_13) + set_object_image(OBJ_LASERSWITCH4, 0, TVPROGRAM_SOLID_GREEN) show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET4_DISABLED) close_door(OBJ_LASER_4A) @@ -915,10 +915,10 @@ u8 func1007_init_lasers[] = { // Agent - take down lasers label(0x0d) - set_object_image(OBJ_LASERSWITCH1, 0, TVCMDLIST_14) - set_object_image(OBJ_LASERSWITCH2, 0, TVCMDLIST_14) - set_object_image(OBJ_LASERSWITCH3, 0, TVCMDLIST_14) - set_object_image(OBJ_LASERSWITCH4, 0, TVCMDLIST_14) + set_object_image(OBJ_LASERSWITCH1, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(OBJ_LASERSWITCH2, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(OBJ_LASERSWITCH3, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(OBJ_LASERSWITCH4, 0, TVPROGRAM_SOLID_BLACK) open_door(OBJ_LASER_1A) open_door(OBJ_LASER_2A) open_door(OBJ_LASER_3A) @@ -2742,7 +2742,7 @@ u8 func1022_light_switch[] = { assign_sound(SFX_043F, CHANNEL_7) play_sound_from_entity(CHANNEL_7, OBJ_LIGHTSWITCH, 0x012c, 0x0190, 0x00) yield - set_object_image(OBJ_LIGHTSWITCH, 0, TVCMDLIST_14) + set_object_image(OBJ_LIGHTSWITCH, 0, TVPROGRAM_SOLID_BLACK) play_sound(SFX_8147, -1) set_lights_state(0x000b, LIGHTOP_TRANSITION, 255, 6, 120) set_lights_state(0x000c, LIGHTOP_TRANSITION, 255, 6, 120) @@ -2805,7 +2805,7 @@ u8 func1022_light_switch[] = { play_sound_from_entity(CHANNEL_7, OBJ_LIGHTSWITCH, 0x012c, 0x0190, 0x00) yield play_sound(SFX_8148, -1) - set_object_image(0x3d, 0, TVCMDLIST_06) + set_object_image(0x3d, 0, TVPROGRAM_BARS_YELLOW) set_lights_state(0x000b, LIGHTOP_TRANSITION, 6, 255, 120) set_lights_state(0x000c, LIGHTOP_TRANSITION, 6, 255, 120) set_lights_state(0x000d, LIGHTOP_TRANSITION, 6, 255, 120) diff --git a/src/setups/setupdish.c b/src/setups/setupdish.c index b97c61cad..c28ba61d5 100644 --- a/src/setups/setupdish.c +++ b/src/setups/setupdish.c @@ -203,25 +203,25 @@ u32 props[] = { stdobject(0x0100, MODEL_DD_CHAIR, PAD_DISH_021B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_DISH_021A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x1b, 1) - singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_021C, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_021C, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x01, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_DISH_021F, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_DISH_021D, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x10, 1) - singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_021E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_021E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x02, 1) stdobject(0x00b3, MODEL_DD_CHAIR, PAD_DISH_0220, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_DISH_0222, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x0f, 1) - singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_0221, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_0221, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x33, -1) tag(0x0d, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_DISH_0223, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_DISH_0225, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x0e, 1) - singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_0224, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_0224, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x7f, 1) - singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_022D, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_022D, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) require_object_holographed(0x0000000e) tag(0x05, 18) tag(0x06, 18) @@ -307,11 +307,11 @@ u32 props[] = { stdobject(0x0100, MODEL_DD_DESK, PAD_DISH_0228, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_DD_CHAIR, PAD_DISH_0226, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x30, 1) - singlemonitor(0x0180, MODEL_GOODPC, PAD_DISH_0227, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0180, MODEL_GOODPC, PAD_DISH_0227, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x2e, 1) weapon(0x0180, MODEL_CHRECMMINE, -1, OBJFLAG_FALL | OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_ECMMINE) tag(0x32, 1) - multimonitor(0x0140, MODEL_CIHUB, PAD_DISH_0239, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0140, MODEL_CIHUB, PAD_DISH_0239, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x26, 1) weapon(0x0100, MODEL_CHREYESPY, -1, OBJFLAG_FALL | OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_EYESPY) tag(0x27, 1) @@ -321,7 +321,7 @@ u32 props[] = { tag(0x28, 1) weapon(0x0200, MODEL_CHRDOORDECODER, -1, OBJFLAG_FALL | OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_DOORDECODER) tag(0x35, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_023B, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_023B, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x88, 1) stdobject(0x0200, MODEL_CHRDOORDECODER, PAD_DISH_0130, OBJFLAG_00000008 | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_INVISIBLE, 0, 1000) tag(0x2c, 1) @@ -331,9 +331,9 @@ u32 props[] = { tag(0x29, 1) weapon(0x0180, MODEL_XRAYSPECS, -1, OBJFLAG_FALL | OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_XRAYSCANNER) tag(0x38, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_023C, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_023C, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x39, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_023D, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_023D, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x2a, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, -1, OBJFLAG_FALL | OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_DISGUISE41) tag(0x2b, 1) @@ -455,35 +455,35 @@ u32 props[] = { stdobject(0x0100, MODEL_A51_CRATE1, PAD_DISH_0202, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_A51_CRATE1, PAD_DISH_0204, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) tag(0x46, 1) - singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_022A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_022A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x45, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_023E, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_023E, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x47, 1) - singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_022B, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_DISH_022B, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x48, 1) - multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0240, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0240, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x49, 1) - multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0241, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0241, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x4a, 1) - multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0242, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0242, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x4b, 1) - multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0243, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0243, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x4c, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0247, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0247, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x4d, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0246, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0246, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x4e, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0245, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0245, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x4f, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0244, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_0244, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x54, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024C, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024C, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x55, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024D, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024D, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x56, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024E, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024E, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x57, 1) - multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024F, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, 20, 0, 0, 0) + multimonitor(0x0100, MODEL_CIHUB, PAD_DISH_024F, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x58, 15) tag(0x59, 15) tag(0x5a, 15) @@ -539,9 +539,9 @@ u32 props[] = { door(0x0100, MODEL_LASDOOR, PAD_DISH_0286, OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_DONTPAUSE, 0, 1000, 0x00011999, 0x00011999, 0x7fffffff, 0x7fffffff, 0x7fffffff, DOORFLAG_DAMAGEONCONTACT, DOORTYPE_LASER, 0x00000000, 0x00004650, 0x00000000, 0x00000000, 0x00000000) door(0x0100, MODEL_LASDOOR, PAD_DISH_0287, OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_DONTPAUSE, 0, 1000, 0x00011999, 0x00011999, 0x7fffffff, 0x7fffffff, 0x7fffffff, DOORFLAG_DAMAGEONCONTACT, DOORTYPE_LASER, 0x00000000, 0x00004650, 0x00000000, 0x00000000, 0x00000000) tag(0x65, 1) - multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0250, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20, 0, 0, 0) + multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0250, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x66, 1) - multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0251, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 20, 0, 0, 0) + multimonitor(0x00cc, MODEL_CIHUB, PAD_DISH_0251, OBJFLAG_00000002, OBJFLAG2_DONTPAUSE, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x8b, 1) autogun(0x00a6, MODEL_CI_ROOFGUN, PAD_DISH_0235, OBJFLAG_UPSIDEDOWN, 0, 0, 1000, 0x0075, 0x00005555, 0xffffaaab, 0x00000aaa, 0x00320000) tag(0x8c, 1) @@ -549,11 +549,11 @@ u32 props[] = { tag(0x8d, 1) autogun(0x00a6, MODEL_CI_ROOFGUN, PAD_DISH_0233, OBJFLAG_UPSIDEDOWN, 0, 0, 1000, 0x0097, 0x00005555, 0xffffaaab, 0x00000aaa, 0x00320000) tag(0x8e, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_0236, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_0236, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x8f, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_0237, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_0237, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x90, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_0238, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_DISH_0238, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) endprops }; @@ -1353,7 +1353,7 @@ u8 func1005_devicetraining_xray[] = { if_object_flag2(0x38, OBJFLAG2_IMMUNETOANTI, /*goto*/ 0x87) remove_hudmsgs show_hudmsg(CHR_BOND, L_DISH_041) // "Laser Grid 1 has been deactivated." - set_object_image(0x38, 0, TVCMDLIST_12) + set_object_image(0x38, 0, TVPROGRAM_SOLID_RED) set_object_flag2(0x38, OBJFLAG2_IMMUNETOANTI) open_door(0x3a) label(0x87) @@ -1369,7 +1369,7 @@ u8 func1005_devicetraining_xray[] = { label(0x5c) if_object_flag2(0x39, OBJFLAG2_IMMUNETOANTI, /*goto*/ 0x88) - set_object_image(0x39, 0, TVCMDLIST_12) + set_object_image(0x39, 0, TVPROGRAM_SOLID_RED) remove_hudmsgs show_hudmsg(CHR_BOND, L_DISH_042) // "Laser Grid 2 has been deactivated." set_object_flag2(0x39, OBJFLAG2_IMMUNETOANTI) @@ -3722,7 +3722,7 @@ u8 func101c_holo1_main[] = { endloop(0x8f) \ \ label(0x2f) \ - set_object_image(object, 0, TVCMDLIST_12) \ + set_object_image(object, 0, TVPROGRAM_SOLID_RED) \ unset_object_flag2(object, OBJFLAG2_INVHIDDEN) \ \ beginloop(0x04) \ @@ -3734,7 +3734,7 @@ u8 func101c_holo1_main[] = { endloop(0x04) \ \ label(0x2f) \ - set_object_image(object, 0, TVCMDLIST_13) \ + set_object_image(object, 0, TVPROGRAM_SOLID_GREEN) \ set_object_flag2(object, OBJFLAG2_INVHIDDEN) \ assign_sound(SFX_043A, CHANNEL_7) \ set_object_sound_playing(CHANNEL_7, object, TRUE) \ @@ -3762,7 +3762,7 @@ u8 func1020_holo1_monitor_switches[] = { endloop(0x8f) label(0x2f) - set_object_image(0x4f, 0, TVCMDLIST_12) + set_object_image(0x4f, 0, TVPROGRAM_SOLID_RED) unset_object_flag2(0x4f, OBJFLAG2_INVHIDDEN) beginloop(0x04) @@ -3774,7 +3774,7 @@ u8 func1020_holo1_monitor_switches[] = { endloop(0x04) label(0x2f) - set_object_image(0x4f, 0, TVCMDLIST_13) + set_object_image(0x4f, 0, TVPROGRAM_SOLID_GREEN) set_object_flag2(0x4f, OBJFLAG2_INVHIDDEN) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, 0x4f, TRUE) @@ -3811,8 +3811,8 @@ u8 func1020_holo1_monitor_switches[] = { goto_first(0x04) \ \ label(0x2f) \ - set_object_image(object2, 0, TVCMDLIST_12) \ - set_object_image(object1, 0, TVCMDLIST_13) \ + set_object_image(object2, 0, TVPROGRAM_SOLID_RED) \ + set_object_image(object1, 0, TVPROGRAM_SOLID_GREEN) \ remove_hudmsgs \ show_hudmsg(CHR_BOND, msg) \ assign_sound(SFX_DOOR_81B0, CHANNEL_7) \ @@ -3840,7 +3840,7 @@ u8 func1020_holo1_monitor_switches[] = { u8 func1021_holo1_code1[] = { label(0x8f) - set_object_image(0x48, 0, TVCMDLIST_12) + set_object_image(0x48, 0, TVPROGRAM_SOLID_RED) unset_object_flag2(0x4c, OBJFLAG2_IMMUNETOANTI) holo1_code_thing_p1(0x48, 0x4c, 0x0240) @@ -3857,7 +3857,7 @@ u8 func1021_holo1_code1[] = { u8 func1021_holo1_code2[] = { label(0x8f) - set_object_image(0x49, 0, TVCMDLIST_12) + set_object_image(0x49, 0, TVPROGRAM_SOLID_RED) unset_object_flag2(0x4d, OBJFLAG2_IMMUNETOANTI) holo1_code_thing_p1(0x49, 0x4d, 0x0241) @@ -3873,7 +3873,7 @@ u8 func1021_holo1_code2[] = { u8 func1021_holo1_code3[] = { label(0x8f) unset_object_flag2(0x4e, OBJFLAG2_IMMUNETOANTI) - set_object_image(0x4a, 0, TVCMDLIST_12) + set_object_image(0x4a, 0, TVPROGRAM_SOLID_RED) holo1_code_thing_p1(0x4a, 0x4e, 0x0242) @@ -3888,7 +3888,7 @@ u8 func1021_holo1_code3[] = { u8 func1021_holo1_code4[] = { label(0x8f) unset_object_flag2(0x4f, OBJFLAG2_IMMUNETOANTI) - set_object_image(0x4b, 0, TVCMDLIST_12) + set_object_image(0x4b, 0, TVPROGRAM_SOLID_RED) holo1_code_thing_p1(0x4b, 0x4f, 0x0243) @@ -3979,10 +3979,10 @@ u8 func1022_holo2_main[] = { unset_object_flag2(0x55, OBJFLAG2_IMMUNETOANTI) unset_object_flag2(0x56, OBJFLAG2_IMMUNETOANTI) unset_object_flag2(0x57, OBJFLAG2_IMMUNETOANTI) - set_object_image(0x54, 0, TVCMDLIST_14) - set_object_image(0x55, 0, TVCMDLIST_14) - set_object_image(0x56, 0, TVCMDLIST_14) - set_object_image(0x57, 0, TVCMDLIST_14) + set_object_image(0x54, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x55, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x56, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x57, 0, TVPROGRAM_SOLID_BLACK) unset_stage_flag(STAGEFLAG_HOLO_ABORTING) unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) @@ -4072,14 +4072,14 @@ u8 func1022_holo2_main[] = { reloop(0x04) \ \ label(0x06) \ - set_object_image(object, 0, TVCMDLIST_14) \ + set_object_image(object, 0, TVPROGRAM_SOLID_BLACK) \ unset_object_flag2(object, OBJFLAG2_IMMUNETOANTI) \ endloop(0x04) \ \ label(0x2f) \ assign_sound(SFX_043A, CHANNEL_7) \ set_object_sound_playing(CHANNEL_7, object, TRUE) \ - set_object_image(object, 0, TVCMDLIST_13) \ + set_object_image(object, 0, TVPROGRAM_SOLID_GREEN) \ set_object_flag2(object, OBJFLAG2_IMMUNETOANTI) \ set_returnlist(CHR_SELF, function) \ set_ailist(CHR_SELF, 0x041b) @@ -4162,10 +4162,10 @@ u8 func042f_holo2_part2[] = { remove_hudmsgs show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_105) // "Training failed - you must face forward." set_ailist(CHR_SELF, GAILIST_IDLE) - set_object_image(0x54, 0, TVCMDLIST_12) - set_object_image(0x55, 0, TVCMDLIST_12) - set_object_image(0x56, 0, TVCMDLIST_12) - set_object_image(0x57, 0, TVCMDLIST_12) + set_object_image(0x54, 0, TVPROGRAM_SOLID_RED) + set_object_image(0x55, 0, TVPROGRAM_SOLID_RED) + set_object_image(0x56, 0, TVPROGRAM_SOLID_RED) + set_object_image(0x57, 0, TVPROGRAM_SOLID_RED) beginloop(0x08) if_timer_gt(120, /*goto*/ 0x2f) @@ -4238,8 +4238,8 @@ u8 func1027_holo3_main[] = { label(0x2f) unset_object_flag2(0x65, OBJFLAG2_IMMUNETOANTI) unset_object_flag2(0x66, OBJFLAG2_IMMUNETOANTI) - set_object_image(0x65, 0, TVCMDLIST_14) - set_object_image(0x66, 0, TVCMDLIST_14) + set_object_image(0x65, 0, TVPROGRAM_SOLID_BLACK) + set_object_image(0x66, 0, TVPROGRAM_SOLID_BLACK) unset_stage_flag(STAGEFLAG_HOLO_ABORTING) unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS) unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE) @@ -4453,7 +4453,7 @@ u8 func102c_holo3_object1[] = { label(0x2f) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, 0x65, TRUE) - set_object_image(0x65, 0, TVCMDLIST_13) + set_object_image(0x65, 0, TVPROGRAM_SOLID_GREEN) set_object_flag2(0x65, OBJFLAG2_IMMUNETOANTI) set_returnlist(CHR_SELF, AILIST_HOLO3_OBJECT1) set_ailist(CHR_SELF, AILIST_HOLO3_CHECK_DONE) @@ -4468,7 +4468,7 @@ u8 func102d_holo3_object2[] = { label(0x2f) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, 0x65, TRUE) - set_object_image(0x66, 0, TVCMDLIST_13) + set_object_image(0x66, 0, TVPROGRAM_SOLID_GREEN) set_object_flag2(0x66, OBJFLAG2_IMMUNETOANTI) set_returnlist(CHR_SELF, AILIST_HOLO3_OBJECT2) set_ailist(CHR_SELF, AILIST_HOLO3_CHECK_DONE) diff --git a/src/setups/setupear.c b/src/setups/setupear.c index f49a00129..41c4a5b53 100644 --- a/src/setups/setupear.c +++ b/src/setups/setupear.c @@ -264,46 +264,46 @@ u32 props[] = { tag(0x3f, 1) door(0x0100, MODEL_DD_GRATE, PAD_EAR_016A, OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_AICANNOTUSE | OBJFLAG2_DOOR_ALTCOORDSYSTEM, 0, 1000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, DOORFLAG_UNBLOCKABLEOPEN, DOORTYPE_SLIDING, 0x00000008, 0x00000384, 0x00000000, 0x00000000, 0x00000300) tag(0x01, 1) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0213, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0213, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x02, 1) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0214, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0214, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x03, 1) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0215, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0216, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0217, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0218, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0219, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021A, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021B, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0215, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0216, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0217, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0218, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_DEACTIVATED | OBJFLAG_MONITOR_RENDERPOSTBG, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0219, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021A, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021B, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x3a, 1) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021C, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 4) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021D, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021E, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021F, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0220, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0221, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0222, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0223, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0224, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0225, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0226, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0227, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0228, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0229, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022A, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022B, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022C, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022D, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022E, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022F, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0230, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0231, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0232, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0233, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0234, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0235, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0236, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0245, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, 35) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021C, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLLUP_TEXT_RED) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021D, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021E, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_021F, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0220, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0221, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0222, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0223, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0224, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0225, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0226, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0227, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0228, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0229, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022A, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022B, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022C, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022D, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022E, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_022F, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0230, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0231, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0232, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0233, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0234, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0235, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_TVSCREEN, PAD_EAR_0236, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0245, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000, TVPROGRAM_BARS_GREEN_23) chr(SPAWNFLAG_BASICGUARD, 0x2f, PAD_EAR_0146, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 200, 100, CHRFLAG0_SURPRISABLE | CHRFLAG0_SKIPSAFETYCHECKS | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAMP | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) weapon(0x0100, MODEL_CHRCMP150, 0x002f, OBJFLAG_ASSIGNEDTOCHR, 0, 0, WEAPON_CMP150) chr(SPAWNFLAG_BASICGUARD, 0x30, PAD_EAR_0147, BODY_DD_SHOCK_INF, HEAD_RANDOM, AILIST_INIT_BASIC_GUARD, -1, -1, 200, 100, CHRFLAG0_SKIPSAFETYCHECKS | CHRFLAG0_SQUADALERTANYDIST | CHRFLAG0_CAMP | CHRFLAG0_CANLOSEGUN, 0, TEAM_ENEMY, SQUADRON_03, -1, 0, 0, 0, 0, 0) @@ -406,54 +406,54 @@ u32 props[] = { chr(SPAWNFLAG_ANTINONINTERACTABLE, 0x3a, PAD_EAR_0106, BODY_DDSHOCK, HEAD_DARLING, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) chr(SPAWNFLAG_ANTINONINTERACTABLE | SPAWNFLAG_BLUESIGHT, 0x39, PAD_EAR_010C, BODY_DRCAROLL, 0x00, GAILIST_IDLE, -1, -1, 1000, 100, CHRFLAG0_CAN_RETREAT | CHRFLAG0_FORCESAFETYCHECKS | CHRFLAG0_00008000, 0, TEAM_ENEMY, SQUADRON_08, -1, 0, 0, 0, 0, 0) tag(0x0b, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0246, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0246, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x0c, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0247, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0247, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x0d, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0248, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0248, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x0e, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0249, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0249, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x10, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x11, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x12, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024C, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024C, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x13, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024D, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024D, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x08, 3) tag(0x14, 2) tag(0x15, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x16, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024F, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_024F, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x17, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0250, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0250, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x18, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0251, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0251, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x09, 3) tag(0x19, 2) tag(0x1a, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0252, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0252, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x1b, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0253, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0253, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x1c, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0254, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0254, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x1d, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0255, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0255, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x07, 3) tag(0x0f, 2) tag(0x1e, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0256, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0256, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x1f, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0257, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0257, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x20, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0258, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0258, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x21, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0259, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0259, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE | OBJFLAG3_INTERACTSHORTRANGE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_LAB_TABLE, PAD_EAR_023C, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x0a, 1) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_025A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_01000000, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_025A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_01000000, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x37, 1) hovercar(0x00c0, MODEL_HOOVERBOT, PAD_EAR_0001, OBJFLAG_00000008 | OBJFLAG_HOVERCAR_INIT | OBJFLAG_HOVERCAR_40000000 | OBJFLAG_HOVERCAR_ISHOVERBOT, OBJFLAG2_IMMUNETOANTI, 0, 100, 0x0411) tag(0x38, 1) @@ -474,13 +474,13 @@ u32 props[] = { tag(0x3e, 1) stdobject(0x0100, MODEL_DD_CHAIR, PAD_EAR_020C, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_DD_DESK, PAD_EAR_020B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_020A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_020A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_LAB_CHAIR, PAD_EAR_020D, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_LAB_TABLE, PAD_EAR_020E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_020F, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_020F, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) stdobject(0x0100, MODEL_LAB_CHAIR, PAD_EAR_0211, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) stdobject(0x0100, MODEL_LAB_TABLE, PAD_EAR_0210, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) - singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0212, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERPC, PAD_EAR_0212, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) glass(0x0100, MODEL_WINDOW, PAD_EAR_01D4, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_PATHBLOCKER | OBJFLAG_AISEETHROUGH, 0, 0, 1000) glass(0x0100, MODEL_WINDOW, PAD_EAR_01D3, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_PATHBLOCKER | OBJFLAG_AISEETHROUGH, 0, 0, 1000) glass(0x0100, MODEL_WINDOW, PAD_EAR_01D2, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_PATHBLOCKER | OBJFLAG_AISEETHROUGH, 0, 0, 1000) diff --git a/src/setups/setupeld.c b/src/setups/setupeld.c index 8fd949e83..1ed5308ee 100644 --- a/src/setups/setupeld.c +++ b/src/setups/setupeld.c @@ -636,16 +636,16 @@ u32 props[] = { tag(0x0c, 4) tag(0x0d, 4) tag(0x0e, 4) - singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01F9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01FA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01F8, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01F7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) + singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01F9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01FA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01F8, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0100, MODEL_GOODPC, PAD_ELD_01F7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x04, 3) tag(0x03, 3) tag(0x05, 3) - multimonitor(0x0099, MODEL_CIHUB, PAD_ELD_01FC, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) - multimonitor(0x0099, MODEL_CIHUB, PAD_ELD_01FB, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) - multimonitor(0x0099, MODEL_CIHUB, PAD_ELD_01FD, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_ELD_01FC, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_CIHUB, PAD_ELD_01FB, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_CIHUB, PAD_ELD_01FD, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) door(0x0100, MODEL_AIVILLADOOR2A, PAD_ELD_017F, OBJFLAG_DEACTIVATED | OBJFLAG_DOOR_OPENTOFRONT | OBJFLAG_DOOR_TWOWAY, 0, 0, 1000, 0x005a0000, 0x03e80000, 0x012c0000, 0x012c0000, 0x00030000, 0, DOORTYPE_SWINGING, 0x00000000, 0x000005dc, 0x00000000, 0x00000001, 0x00000600) door(0x0100, MODEL_AIVILLADOOR2A, PAD_ELD_0180, OBJFLAG_DEACTIVATED | OBJFLAG_DOOR_TWOWAY, 0, 0, 1000, 0x005a0000, 0x03e80000, 0x012c0000, 0x012c0000, 0x00030000, 0, DOORTYPE_SWINGING, 0x00000000, 0x000005dc, 0x00000000, 0xffffffff, 0x00000000) tag(0x09, 1) diff --git a/src/setups/setupimp.c b/src/setups/setupimp.c index 7f7faf8ef..d68946c1e 100644 --- a/src/setups/setupimp.c +++ b/src/setups/setupimp.c @@ -381,11 +381,11 @@ u32 props[] = { tag(0x08, 1) autogun(0x00a6, MODEL_CI_ROOFGUN, PAD_IMP_0233, OBJFLAG_UPSIDEDOWN, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 0x0097, 0x00005555, 0xffffaaab, 0x00000aaa, 0x00320000) tag(0x0a, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_IMP_0236, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_IMP_0236, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x0b, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_IMP_0237, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_IMP_0237, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x0c, 1) - multimonitor(0x0099, MODEL_CIHUB, PAD_IMP_0238, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 0, 0, 0) + multimonitor(0x0099, MODEL_CIHUB, PAD_IMP_0238, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x0d, 1) stdobject(0x0100, MODEL_DROPSHIP, -1, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) tag(0x0e, 1) diff --git a/src/setups/setuplee.c b/src/setups/setuplee.c index bd71da1ad..d3eeec802 100644 --- a/src/setups/setuplee.c +++ b/src/setups/setuplee.c @@ -568,15 +568,15 @@ u32 props[] = { door(0x0100, MODEL_SK_SHIP_HULLDOOR3, PAD_LEE_0142, OBJFLAG_00000010 | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x00010000, 0x0000bd1f, 0x00050000, 0x00002aaa, 0x00000ccc, 0, DOORTYPE_SLIDING, 0x00000000, 0x000000f0, 0x00000000, 0x00000001, 0x00001d00) door(0x0100, MODEL_SK_SHIP_HULLDOOR4, PAD_LEE_0143, OBJFLAG_00000010 | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x00010000, 0x0000bd1f, 0x00050000, 0x00002aaa, 0x00000ccc, 0, DOORTYPE_SLIDING, 0x00000000, 0x000000f0, 0x00000000, 0xfffffffd, 0x00001d00) tag(0x09, 1) - multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01F1, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 21, 20, 20, 0) - multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01F2, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, 21, 20, 20, 0) + multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01F1, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_TRANSPARENT, TVPROGRAM_SOLID_BLACK, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT) + multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01F2, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_TRANSPARENT, TVPROGRAM_SOLID_BLACK, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT) weapon(0x0100, MODEL_CHRSKROCKET, PAD_LEE_01D2, 0, 0, 0, WEAPON_SLAYER) tag(0x04, 3) tag(0x05, 3) tag(0x06, 3) - multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01F0, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, 21, 20, 20, 0) - multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01EF, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, 21, 20, 20, 0) - multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01EE, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, 21, 20, 20, 0) + multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01F0, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_TRANSPARENT, TVPROGRAM_SOLID_BLACK, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT) + multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01EF, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_TRANSPARENT, TVPROGRAM_SOLID_BLACK, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT) + multimonitor(0x00cc, MODEL_SK_CONSOLE2, PAD_LEE_01EE, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_TRANSPARENT, TVPROGRAM_SOLID_BLACK, TVPROGRAM_SOLID_BLACK, TVPROGRAM_DEFAULT) tinted_glass(0x0100, MODEL_SK_WINDOW1, PAD_LEE_01CA, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_PATHBLOCKER | OBJFLAG_INVINCIBLE | OBJFLAG_AISEETHROUGH | OBJFLAG_DEACTIVATED, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x00c801f4) tinted_glass(0x0100, MODEL_SK_WINDOW1, PAD_LEE_01CB, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_PATHBLOCKER | OBJFLAG_INVINCIBLE | OBJFLAG_AISEETHROUGH | OBJFLAG_DEACTIVATED, OBJFLAG2_NOFALL | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x00c801f4) tag(0x19, 2) diff --git a/src/setups/setuplip.c b/src/setups/setuplip.c index db89fe452..e81ac4238 100644 --- a/src/setups/setuplip.c +++ b/src/setups/setuplip.c @@ -539,13 +539,13 @@ u32 props[] = { weapon(0x0180, MODEL_LABCOAT, PAD_LIP_042F, OBJFLAG_FALL, 0, 0, WEAPON_DISGUISE40) rename_object(-1, WEAPON_DISGUISE40, L_LIP_015, L_LIP_016, L_LIP_017, L_LIP_018, L_LIP_019) // "Obtain lab clothes." tag(0x03, 1) - singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0428, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0428, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x02, 1) - singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0427, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0427, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x01, 1) - singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0429, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0429, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x04, 1) - singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0426, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_0426, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x05, 1) weapon(0x0180, MODEL_CHRDATATHIEF, PAD_LIP_00DA, OBJFLAG_FALL | OBJFLAG_UNCOLLECTABLE, OBJFLAG2_INVISIBLE, 0, WEAPON_DATAUPLINK) rename_object(-1, WEAPON_DATAUPLINK, L_LIP_024, L_LIP_025, L_LIP_026, L_LIP_027, L_LIP_028) // "Obtain Data Uplink." @@ -554,8 +554,8 @@ u32 props[] = { rename_object(-1, WEAPON_DATAUPLINK, L_LIP_024, L_LIP_025, L_LIP_026, L_LIP_027, L_LIP_028) // "Obtain Data Uplink." tag(0x3c, 2) tag(0x3d, 2) - singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_03C6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) - singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_03C7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3) + singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_03C6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) + singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_LIP_03C7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) door(0x0100, MODEL_A51_HORIZ_DOOR_BOT, PAD_LIP_027F, OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x0000f333, 0x00085555, 0x00085555, 0x00001999, DOORFLAG_AUTOMATIC, DOORTYPE_VERTICAL, 0x00000000, 0x0000003c, 0x00000000, 0x00000001, 0x00000100) door(0x0100, MODEL_A51_HORIZ_DOOR_TOP, PAD_LIP_027E, OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x0000f333, 0x00085555, 0x00085555, 0x00001999, 0, DOORTYPE_VERTICAL, 0x00000000, 0x0fffffff, 0x00000000, 0xffffffff, 0x00000000) door(0x0100, MODEL_A51_HORIZ_DOOR_BOT, PAD_LIP_027D, OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x0000f333, 0x00085555, 0x00085555, 0x00001999, DOORFLAG_AUTOMATIC, DOORTYPE_VERTICAL, 0x00000000, 0x0000003c, 0x00000000, 0x00000001, 0x00000100) @@ -757,35 +757,35 @@ u32 props[] = { tag(0x1a, 2) tag(0x22, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_033C, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x033c, 0x033d, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045C, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045C, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x1c, 2) tag(0x24, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_0340, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0340, 0x0341, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_0459, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_0459, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x1e, 2) tag(0x26, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_0344, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0344, 0x0345, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045A, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045A, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x20, 2) tag(0x28, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_0348, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0348, 0x0349, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x1b, 2) tag(0x23, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_033F, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x033f, 0x033e, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045E, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045E, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x1d, 2) tag(0x25, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_0343, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0343, 0x0342, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045F, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045F, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x1f, 2) tag(0x27, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_0347, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0347, 0x0346, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_0460, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_0460, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x21, 2) tag(0x29, 2) lift(0x0100, MODEL_CHAMBER, PAD_LIP_034B, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x034b, 0x034a, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LIP_045D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x32, 1) stdobject(0x0100, MODEL_A51_CRATE1, -1, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_A51TABLE, PAD_LIP_0461, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) @@ -3429,7 +3429,7 @@ u8 func1018_disable_chambers[] = { assign_sound(SFX_043A, CHANNEL_7) \ set_object_sound_playing(CHANNEL_7, switch, TRUE) \ show_hudmsg(CHR_P1P2, 0x2a42) /* "Containment unit raised up." */ \ - set_object_image(switch, 0, TVCMDLIST_13) \ + set_object_image(switch, 0, TVPROGRAM_SOLID_GREEN) \ unset_object_flag(chamber, OBJFLAG_DEACTIVATED) \ set_stage_flag(stageflag) \ restart_timer \ @@ -3453,7 +3453,7 @@ u8 func1018_disable_chambers[] = { assign_sound(SFX_043A, CHANNEL_7) \ set_object_sound_playing(CHANNEL_7, switch, TRUE) \ show_hudmsg(CHR_P1P2, 0x2a43) /* "Containment unit lowered down." */ \ - set_object_image(switch, 0, TVCMDLIST_12) \ + set_object_image(switch, 0, TVPROGRAM_SOLID_RED) \ unset_object_flag(chamber, OBJFLAG_DEACTIVATED) \ unset_stage_flag(stageflag) \ restart_timer \ @@ -3488,7 +3488,7 @@ u8 func1019_chamber1[] = { set_object_sound_playing(CHANNEL_0, OBJ_CHAMBER1, TRUE) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, OBJ_CHAMBER1_SWITCH, TRUE) - set_object_image(OBJ_CHAMBER1_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_CHAMBER1_SWITCH, 0, TVPROGRAM_SOLID_GREEN) show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up." unset_object_flag(OBJ_CHAMBER1, OBJFLAG_DEACTIVATED) set_stage_flag(STAGEFLAG_CHAMBER1_RAISED) @@ -3524,7 +3524,7 @@ u8 func1019_chamber1[] = { set_chr_chrflag(CHR_ALIEN, CHRCFLAG_HIDDEN) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, OBJ_CHAMBER1_SWITCH, TRUE) - set_object_image(OBJ_CHAMBER1_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_CHAMBER1_SWITCH, 0, TVPROGRAM_SOLID_RED) show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down." unset_object_flag(OBJ_CHAMBER1, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_CHAMBER1_RAISED) @@ -3559,7 +3559,7 @@ u8 func101a_chamber2[] = { set_object_sound_playing(CHANNEL_0, OBJ_CHAMBER2, TRUE) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, OBJ_CHAMBER2_SWITCH, TRUE) - set_object_image(OBJ_CHAMBER2_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_CHAMBER2_SWITCH, 0, TVPROGRAM_SOLID_GREEN) show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up." unset_object_flag(OBJ_CHAMBER2, OBJFLAG_DEACTIVATED) set_stage_flag(STAGEFLAG_CHAMBER2_RAISED) @@ -3584,7 +3584,7 @@ u8 func101a_chamber2[] = { set_object_sound_playing(CHANNEL_0, OBJ_CHAMBER2, TRUE) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, OBJ_CHAMBER2_SWITCH, TRUE) - set_object_image(OBJ_CHAMBER2_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_CHAMBER2_SWITCH, 0, TVPROGRAM_SOLID_RED) show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down." unset_object_flag(OBJ_CHAMBER2, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_CHAMBER2_RAISED) @@ -3647,7 +3647,7 @@ u8 func1020_chamber8[] = { assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, OBJ_CHAMBER8_SWITCH, TRUE) show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up." - set_object_image(OBJ_CHAMBER8_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_CHAMBER8_SWITCH, 0, TVPROGRAM_SOLID_GREEN) unset_object_flag(OBJ_CHAMBER8, OBJFLAG_DEACTIVATED) set_stage_flag(STAGEFLAG_CHAMBER8_RAISED) restart_timer @@ -3673,7 +3673,7 @@ u8 func1020_chamber8[] = { assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, OBJ_CHAMBER8_SWITCH, TRUE) show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down." - set_object_image(OBJ_CHAMBER8_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_CHAMBER8_SWITCH, 0, TVPROGRAM_SOLID_RED) unset_object_flag(OBJ_CHAMBER8, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_CHAMBER8_RAISED) restart_timer diff --git a/src/setups/setuplue.c b/src/setups/setuplue.c index a6947da00..6efd8ed46 100644 --- a/src/setups/setuplue.c +++ b/src/setups/setuplue.c @@ -334,7 +334,7 @@ u32 props[] = { tag(0x04, 1) chopper(0x0a00, MODEL_A51INTERCEPTOR, PAD_LUE_034E, OBJFLAG_00000008 | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_CHOPPER_INIT, OBJFLAG2_INVISIBLE, OBJFLAG3_00000200 | OBJFLAG3_REACTTOSIGHT, 100, 0x040a) tag(0x05, 1) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0409, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0409, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x08, 1) weapon(0x0180, MODEL_CHRBUG, -1, OBJFLAG_FALL, 0, 0, WEAPON_COMMSRIDER) rename_object(-1, WEAPON_COMMSRIDER, L_LUE_021, L_LUE_022, L_LUE_023, L_LUE_024, L_LUE_025) // "Obtain comms rider." @@ -348,13 +348,13 @@ u32 props[] = { stdobject(0x0100, MODEL_CHRBUG, PAD_LUE_035B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_UNCOLLECTABLE | OBJFLAG_BOUNCEIFSHOT | OBJFLAG_01000000, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_INVISIBLE, 0, 1000) rename_object(-1, WEAPON_EXPLOSIVES, L_LUE_048, L_LUE_049, L_LUE_050, L_LUE_051, L_LUE_052) // "Obtain explosive." tag(0x09, 1) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0406, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, OBJFLAG3_INTERACTABLE, 1000, 19) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0406, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_REMOVEWHENDESTROYED, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN) tag(0x0b, 1) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0407, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0407, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x0c, 1) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0408, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_0408, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x10, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_LUE_04F7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_INVINCIBLE, OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_LUE_04F7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_INVINCIBLE, OBJFLAG2_INTERACTCHECKLOS, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x54, 1) stdobject(0x000c, MODEL_EXPLOSIVEBRICK, PAD_LUE_036B, OBJFLAG_00000008 | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_INVISIBLE, 0, 1000) tag(0x17, 1) @@ -461,7 +461,7 @@ u32 props[] = { stdobject(0x0100, MODEL_G5_MAINFRAME, PAD_LUE_04E9, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000) stdobject(0x0100, MODEL_G5_MAINFRAME, PAD_LUE_04EA, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000) stdobject(0x0100, MODEL_G5_MAINFRAME, PAD_LUE_04EB, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, 0, 1000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_040B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_INTERACTCHECKLOS, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_LUE_040B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, OBJFLAG2_INTERACTCHECKLOS, 0, 1000, TVPROGRAM_SOLID_RED) stdobject(0x0100, MODEL_A51TABLE, PAD_LUE_04D5, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) tag(0x44, 2) tag(0x45, 2) @@ -999,7 +999,7 @@ u8 func100c_maingate_switch[] = { goto_next(0x06) label(0x2e) - set_object_image(OBJ_MAINGATE_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_MAINGATE_SWITCH, 0, TVPROGRAM_SOLID_RED) label(0x06) if_chr_activated_object(CHR_P1P2, OBJ_MAINGATE_SWITCH, /*goto*/ 0x2e) reloop(0x04) @@ -1007,7 +1007,7 @@ u8 func100c_maingate_switch[] = { label(0x2e) assign_sound(SFX_043F, CHANNEL_7) play_sound_from_entity(CHANNEL_7, OBJ_MAINGATE_SWITCH, 0x012c, 0x0190, 0x00) - set_object_image(OBJ_MAINGATE_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_MAINGATE_SWITCH, 0, TVPROGRAM_SOLID_GREEN) if_door_state(OBJ_MAINGATE1, (DOORSTATE_OPEN | DOORSTATE_OPENING), /*goto*/ 0x2e) show_hudmsg(CHR_P1P2, L_LUE_043) // "Main gate has been opened." open_door(OBJ_MAINGATE1) @@ -1024,7 +1024,7 @@ u8 func100c_maingate_switch[] = { label(0x2e) assign_sound(SFX_043F, CHANNEL_7) play_sound_from_entity(CHANNEL_7, OBJ_MAINGATE_SWITCH, 0x012c, 0x0190, 0x00) - set_object_image(OBJ_MAINGATE_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_MAINGATE_SWITCH, 0, TVPROGRAM_SOLID_RED) show_hudmsg(CHR_P1P2, L_LUE_044) // "Main gate has been closed." close_door(OBJ_MAINGATE1) close_door(OBJ_MAINGATE2) @@ -1148,7 +1148,7 @@ u8 func1405_antenna_switch[] = { assign_sound(SFX_00CD, CHANNEL_1) set_object_sound_playing(CHANNEL_1, OBJ_ANTENNA_SWITCH, TRUE) #endif - set_object_image(OBJ_ANTENNA_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_ANTENNA_SWITCH, 0, TVPROGRAM_SOLID_RED) unset_object_flag(OBJ_ANTENNA, OBJFLAG_DEACTIVATED) show_hudmsg(CHR_P1P2, L_LUE_030) // "Antenna lowered." set_stage_flag(STAGEFLAG_ANTENNA_LOWERED) @@ -1184,7 +1184,7 @@ u8 func1405_antenna_switch[] = { assign_sound(SFX_00CD, CHANNEL_1) set_object_sound_playing(CHANNEL_1, OBJ_ANTENNA_SWITCH, TRUE) #endif - set_object_image(OBJ_ANTENNA_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_ANTENNA_SWITCH, 0, TVPROGRAM_SOLID_GREEN) unset_object_flag(OBJ_ANTENNA, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_ANTENNA_LOWERED) show_hudmsg(CHR_P1P2, L_LUE_029) // "Antenna raised." @@ -1230,7 +1230,7 @@ u8 func1006_lift_switches[] = { goto_next(0x0b) label(0x2e) - set_object_image(OBJ_LIFT1_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_LIFT1_SWITCH, 0, TVPROGRAM_SOLID_GREEN) if_stage_flag_eq(STAGEFLAG_LIFT1_CALLED, TRUE, /*goto*/ 0x06) set_stage_flag(STAGEFLAG_LIFT1_CALLED) open_door(0x0e) @@ -1256,7 +1256,7 @@ u8 func1006_lift_switches[] = { goto_next(0x0b) label(0x2e) - set_object_image(OBJ_LIFT2_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_LIFT2_SWITCH, 0, TVPROGRAM_SOLID_GREEN) if_stage_flag_eq(STAGEFLAG_LIFT2_CALLED, TRUE, /*goto*/ 0x06) set_stage_flag(STAGEFLAG_LIFT2_CALLED) open_door(0x0f) diff --git a/src/setups/setuppete.c b/src/setups/setuppete.c index 20c340001..d13268cae 100644 --- a/src/setups/setuppete.c +++ b/src/setups/setuppete.c @@ -220,7 +220,7 @@ u32 props[] = { weapon(0x0180, MODEL_CHRBRIEFCASE, -1, OBJFLAG_FALL, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_ONSHELF, WEAPON_TRACERBUG) rename_object(-1, WEAPON_TRACERBUG, L_PETE_043, L_PETE_044, L_PETE_045, L_PETE_046, L_PETE_047) // "Obtain Tracer Bug." tag(0x0e, 1) - singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_PETE_00EB, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_REMOVEWHENDESTROYED, OBJFLAG3_INTERACTABLE, 1000, 19) + singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, PAD_PETE_00EB, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI | OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_REMOVEWHENDESTROYED, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_GREEN) tag(0x07, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, PAD_PETE_00A6, OBJFLAG_FALL | OBJFLAG_AIUNDROPPABLE | OBJFLAG_INVINCIBLE | OBJFLAG_COLLECTABLE | OBJFLAG_FORCENOBOUNCE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_PLAYERUNDROPPABLE | OBJFLAG3_ONSHELF, WEAPON_DATAUPLINK) rename_object(-1, WEAPON_DATAUPLINK, L_PETE_049, L_PETE_050, L_PETE_051, L_PETE_052, L_PETE_053) // "Obtain Reprogrammer." diff --git a/src/setups/setuprit.c b/src/setups/setuprit.c index 2425b55d7..2c028aa7e 100644 --- a/src/setups/setuprit.c +++ b/src/setups/setuprit.c @@ -327,17 +327,17 @@ u32 props[] = { tag(0x17, 1) weapon(0x0180, MODEL_CHRREMOTEMINE, -1, OBJFLAG_FALL, 0, 0, WEAPON_TIMEDMINE) tag(0x02, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0116, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0116, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x27, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0117, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0117, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x28, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0118, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0118, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x29, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0119, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0119, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x2a, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_011A, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_011A, OBJFLAG_00000002 | OBJFLAG_00000008 | OBJFLAG_INVINCIBLE | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_REMOVEWHENDESTROYED, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x03, 1) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_RIT_0112, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_RIT_0112, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_DEACTIVATED, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x0f, 3) tag(0x05, 1) lift(0x0100, MODEL_A51_LIFT_THINWALL, PAD_RIT_010C, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x010c, 0x010d, -1, -1, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x1b000000) @@ -354,9 +354,9 @@ u32 props[] = { tag(0x06, 1) lift(0x0100, MODEL_A51_LIFT_THINWALL, PAD_RIT_010F, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x010f, 0x010e, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x1b000000) tag(0x07, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0113, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0113, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x08, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0114, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_RIT_0114, OBJFLAG_00000002, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x12, 1) stdobject(0x0100, MODEL_AF1_PILOTCHAIR, PAD_RIT_013A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_AF1_PILOTCHAIR, PAD_RIT_013B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) @@ -443,9 +443,9 @@ u32 props[] = { tag(0x1c, 1) door(0x0100, MODEL_DD_GRATE, PAD_RIT_00F0, OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_AICANNOTUSE, 0, 1000, 0x00010000, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, DOORFLAG_0004, DOORTYPE_SLIDING, 0x00000010, 0x00000384, 0x00000000, 0x00000000, 0x00000000) tag(0x1e, 1) - singlemonitor(0x0100, MODEL_GOODSTATION, PAD_RIT_0168, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODSTATION, PAD_RIT_0168, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x21, 1) - singlemonitor(0x0100, MODEL_GOODSTATION, PAD_RIT_0167, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_GOODSTATION, PAD_RIT_0167, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x00, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, PAD_RIT_00B3, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, 0, OBJFLAG3_PLAYERUNDROPPABLE, WEAPON_SUITCASE) rename_object(-1, WEAPON_SUITCASE, L_RIT_010, L_RIT_011, L_RIT_012, L_RIT_013, L_RIT_014) // "Obtain Suitcase." @@ -1162,7 +1162,7 @@ u8 func100a_autopilot_switch[] = { label(0x06) assign_sound(SFX_043A, CHANNEL_7) set_object_sound_playing(CHANNEL_7, OBJ_AUTOPILOT_SWITCH, TRUE) - set_object_image(OBJ_AUTOPILOT_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_AUTOPILOT_SWITCH, 0, TVPROGRAM_SOLID_GREEN) set_stage_flag(STAGEFLAG_PLANE_STABILIZED) yield show_hudmsg(CHR_P1P2, L_RIT_024) // "Air Force One has been stabilized." @@ -1897,7 +1897,7 @@ u8 func100c_cockpit[] = { label(0x06) label(0x10) set_stage_flag(STAGEFLAG_PLANE_NOSEDIVING) - set_object_image(OBJ_AUTOPILOT_SWITCH, 0, TVCMDLIST_0F) + set_object_image(OBJ_AUTOPILOT_SWITCH, 0, TVPROGRAM_PULSE_RED) // Wait 10 seconds label(0x09) @@ -1947,7 +1947,7 @@ u8 func100c_cockpit[] = { // Unreachable label(0x7c) label(0x2d) - set_object_image(0x03, 0, TVCMDLIST_13) + set_object_image(0x03, 0, TVPROGRAM_SOLID_GREEN) set_stage_flag(STAGEFLAG_PLANE_STABILIZED) show_hudmsg(CHR_BOND, L_RIT_028) // "Pilots have been saved." stop_ambient_track @@ -2225,7 +2225,7 @@ u8 func1002_intro[] = { u8 func1010_dumbwaiter1[] = { label(0x03) set_object_flag(OBJ_DUMBWAITER1, OBJFLAG_DEACTIVATED) - set_object_image(OBJ_DUMBWAITER1_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_DUMBWAITER1_SWITCH, 0, TVPROGRAM_SOLID_RED) beginloop(0x04) chr_toggle_p1p2(CHR_SELF) @@ -2234,7 +2234,7 @@ u8 func1010_dumbwaiter1[] = { label(0x2d) play_sound(SFX_043A, CHANNEL_7) - set_object_image(OBJ_DUMBWAITER1_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_DUMBWAITER1_SWITCH, 0, TVPROGRAM_SOLID_GREEN) unset_object_flag(OBJ_DUMBWAITER1, OBJFLAG_DEACTIVATED) yield yield @@ -2288,7 +2288,7 @@ u8 func1010_dumbwaiter1[] = { u8 func1011_dumbwaiter2[] = { label(0x03) set_object_flag(OBJ_DUMBWAITER2, OBJFLAG_DEACTIVATED) - set_object_image(OBJ_DUMBWAITER2_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_DUMBWAITER2_SWITCH, 0, TVPROGRAM_SOLID_RED) beginloop(0x04) chr_toggle_p1p2(CHR_SELF) @@ -2297,7 +2297,7 @@ u8 func1011_dumbwaiter2[] = { label(0x2d) play_sound(SFX_043A, CHANNEL_7) - set_object_image(OBJ_DUMBWAITER2_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_DUMBWAITER2_SWITCH, 0, TVPROGRAM_SOLID_GREEN) unset_object_flag(OBJ_DUMBWAITER2, OBJFLAG_DEACTIVATED) yield yield @@ -3638,7 +3638,7 @@ u8 func1019_midcutscene_from_menu[] = { u8 func101a_equipment_switch[] = { set_object_flag(0x1b, OBJFLAG_DEACTIVATED) - set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVPROGRAM_SOLID_RED) beginloop(0x04) chr_toggle_p1p2(CHR_SELF) @@ -3660,7 +3660,7 @@ u8 func101a_equipment_switch[] = { // Switch activated with keycard label(0x2d) - set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVPROGRAM_SOLID_GREEN) set_stage_flag(STAGEFLAG_EQUIPMENT_RAISED) open_door(0x1c) show_hudmsg(CHR_P1P2, L_RIT_061) // "Cargo bay has been raised." @@ -3681,7 +3681,7 @@ u8 func101a_equipment_switch[] = { label(0x06) set_object_flag(0x1b, OBJFLAG_DEACTIVATED) - set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVPROGRAM_SOLID_RED) beginloop(0x09) if_door_state(0x1c, DOORSTATE_CLOSING, /*goto*/ 0x2d) @@ -3697,7 +3697,7 @@ u8 func101a_equipment_switch[] = { u8 func101b_hoverbike_switch[] = { unset_savefile_flag(GAMEFILEFLAG_CRASHSITE_BIKE) set_object_flag(0x1f, OBJFLAG_DEACTIVATED) - set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVPROGRAM_SOLID_RED) label(0x08) open_door(0x20) @@ -3725,7 +3725,7 @@ u8 func101b_hoverbike_switch[] = { // Activated with keycard label(0x2d) - set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVCMDLIST_13) + set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVPROGRAM_SOLID_GREEN) show_hudmsg(CHR_P1P2, L_RIT_060) // "Cargo bay has been lowered." set_savefile_flag(GAMEFILEFLAG_CRASHSITE_BIKE) assign_sound(SFX_043A, CHANNEL_7) @@ -3746,7 +3746,7 @@ u8 func101b_hoverbike_switch[] = { label(0x06) set_object_flag(0x1f, OBJFLAG_DEACTIVATED) - set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVCMDLIST_12) + set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVPROGRAM_SOLID_RED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; diff --git a/src/setups/setupsev.c b/src/setups/setupsev.c index 94bad8a71..b6b197f0f 100644 --- a/src/setups/setupsev.c +++ b/src/setups/setupsev.c @@ -305,17 +305,17 @@ u32 props[] = { lift_door(-2, -4, 1) door_scale(0x00010000) tag(0x03, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0428, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0428, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x02, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0427, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0427, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x01, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0429, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0429, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x04, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0426, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0426, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x3c, 2) tag(0x3d, 2) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_03C6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_03C7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_03C6, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_03C7, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) door(0x0100, MODEL_A51_HORIZ_DOOR_BOT, PAD_SEV_027F, OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x0000f333, 0x00085555, 0x00085555, 0x00001999, DOORFLAG_AUTOMATIC, DOORTYPE_VERTICAL, 0x00000000, 0x0000003c, 0x00000000, 0x00000001, 0x00000100) door(0x0100, MODEL_A51_HORIZ_DOOR_TOP, PAD_SEV_027E, OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x0000f333, 0x00085555, 0x00085555, 0x00001999, 0, DOORTYPE_VERTICAL, 0x00000000, 0x0fffffff, 0x00000000, 0xffffffff, 0x00000000) door(0x0100, MODEL_A51_HORIZ_DOOR_BOT, PAD_SEV_027D, OBJFLAG_DEACTIVATED, 0, 0, 1000, 0x0000f333, 0x0000f333, 0x00085555, 0x00085555, 0x00001999, DOORFLAG_AUTOMATIC, DOORTYPE_VERTICAL, 0x00000000, 0x0000003c, 0x00000000, 0x00000001, 0x00000100) @@ -508,35 +508,35 @@ u32 props[] = { tag(0x1a, 2) tag(0x22, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_033C, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x033c, 0x033d, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045C, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045C, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x1c, 2) tag(0x24, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_0340, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0340, 0x0341, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_0459, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_0459, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x1e, 2) tag(0x26, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_0344, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0344, 0x0345, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045A, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045A, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x20, 2) tag(0x28, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_0348, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0348, 0x0349, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x1b, 2) tag(0x23, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_033F, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x033f, 0x033e, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045E, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045E, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x1d, 2) tag(0x25, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_0343, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0343, 0x0342, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045F, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045F, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x1f, 2) tag(0x27, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_0347, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0347, 0x0346, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_0460, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_0460, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x21, 2) tag(0x29, 2) lift(0x0100, MODEL_CHAMBER, PAD_SEV_034B, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x034b, 0x034a, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_SEV_045D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, 0, 1000, TVPROGRAM_SOLID_RED) tag(0x32, 1) stdobject(0x0100, MODEL_A51_CRATE1, -1, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_A51TABLE, PAD_SEV_0461, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) @@ -675,9 +675,9 @@ u32 props[] = { stdobject(0x0100, MODEL_DD_CHAIR, PAD_SEV_0490, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, 0, 0, 1000) tag(OBJ_CONSOLE, 1) #if VERSION >= VERSION_PAL_BETA - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0435, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0435, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) #else - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0435, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_SEV_0435, OBJFLAG_FALL | OBJFLAG_CORE_GEO_INUSE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) #endif stdobject(0x0100, MODEL_G5_MAINFRAME, PAD_SEV_04ED, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) stdobject(0x0100, MODEL_G5_MAINFRAME, PAD_SEV_04EE, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) diff --git a/src/setups/setupsho.c b/src/setups/setupsho.c index 394197812..61ea29a3d 100644 --- a/src/setups/setupsho.c +++ b/src/setups/setupsho.c @@ -360,7 +360,7 @@ u32 props[] = { stdobject(0x0100, MODEL_TARGETAMP, PAD_SHO_0001, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_COLLECTABLE | OBJFLAG_BOUNCEIFSHOT | OBJFLAG_01000000, OBJFLAG2_IMMUNETOGUNFIRE, 0, 1000) rename_object(-1, WEAPON_TARGETAMPLIFIER, L_SHO_020, L_SHO_021, L_SHO_022, L_SHO_023, L_SHO_024) // "Obtain Target Amplifier." tag(0x0b, 1) - multimonitor(0x0019, MODEL_COMHUB, PAD_SHO_0137, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE | OBJFLAG_FORCENOBOUNCE, 0, OBJFLAG3_INTERACTABLE, 1000, 3, 3, 3, 0) + multimonitor(0x0019, MODEL_COMHUB, PAD_SHO_0137, OBJFLAG_00000002 | OBJFLAG_INVINCIBLE | OBJFLAG_FORCENOBOUNCE, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x13, 1) stdobject(0x0100, MODEL_SK_PLINTH_ML, PAD_SHO_0146, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_COLLECTABLE | OBJFLAG_01000000, 0, 0, 3000) tag(0x14, 1) diff --git a/src/setups/setupstat.c b/src/setups/setupstat.c index 95af07a79..65ff85326 100644 --- a/src/setups/setupstat.c +++ b/src/setups/setupstat.c @@ -223,7 +223,7 @@ u32 props[] = { tag(0x05, 1) lift(0x0100, MODEL_SKEDARBRIDGE, PAD_STAT_0136, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0136, 0x0136, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) tag(0x0b, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_STAT_0137, OBJFLAG_00000002, 0, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_STAT_0137, OBJFLAG_00000002, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x23, 1) stdobject(0x0019, MODEL_RUBBLE1, -1, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) tag(0x24, 1) diff --git a/src/setups/setuptra.c b/src/setups/setuptra.c index c5301e56a..f79dbf71e 100644 --- a/src/setups/setuptra.c +++ b/src/setups/setuptra.c @@ -397,9 +397,9 @@ u32 props[] = { tag(0x02, 1) stdobject(0x0100, MODEL_CHRREMOTEMINE, PAD_TRA_013F, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_BOUNCEIFSHOT | OBJFLAG_01000000, OBJFLAG2_REMOVEWHENDESTROYED | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_INVISIBLE, 0, 1000) tag(0x03, 1) - singlemonitor(0x0100, MODEL_SINISTERSTATION, PAD_TRA_048E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0100, MODEL_SINISTERSTATION, PAD_TRA_048E, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) tag(0x04, 1) - singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_TRA_03FD, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, 3) + singlemonitor(0x0033, MODEL_SINISTERSTATION, PAD_TRA_03FD, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR, OBJFLAG2_IMMUNETOANTI, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SCROLL_TEXT_GREEN) glass(0x0100, MODEL_MEDLABWIN1, PAD_TRA_0436, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_PATHBLOCKER | OBJFLAG_INVINCIBLE | OBJFLAG_AISEETHROUGH, OBJFLAG2_BULLETPROOF, 0, 1000) glass(0x0100, MODEL_MEDLABWIN2, PAD_TRA_0437, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_PATHBLOCKER | OBJFLAG_INVINCIBLE | OBJFLAG_AISEETHROUGH, OBJFLAG2_BULLETPROOF, 0, 1000) glass(0x0100, MODEL_MEDLABWIN2, PAD_TRA_0438, OBJFLAG_00000002 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_ORTHOGONAL | OBJFLAG_PATHBLOCKER | OBJFLAG_INVINCIBLE | OBJFLAG_AISEETHROUGH, OBJFLAG2_BULLETPROOF, 0, 1000) @@ -536,35 +536,35 @@ u32 props[] = { tag(0x46, 2) tag(0x3e, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_033C, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x033c, 0x033d, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045C, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045C, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x48, 2) tag(0x40, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_0340, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0340, 0x0341, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_0459, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_0459, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x4a, 2) tag(0x42, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_0344, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0344, 0x0345, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045A, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045A, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x4c, 2) tag(0x44, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_0348, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0348, 0x0349, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045B, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x47, 2) tag(0x3f, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_033F, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x033f, 0x033e, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045E, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045E, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x49, 2) tag(0x41, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_0343, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0343, 0x0342, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045F, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045F, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x4b, 2) tag(0x43, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_0347, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x0347, 0x0346, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_0460, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_0460, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) tag(0x4d, 2) tag(0x45, 2) lift(0x0100, MODEL_CHAMBER, PAD_TRA_034B, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE | OBJFLAG_AISEETHROUGH, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000, 0x034b, 0x034a, -1, -1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x00000000) - singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, 18) + singlemonitor(0x0100, MODEL_MODEMBOX, PAD_TRA_045D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000, TVPROGRAM_SOLID_RED) stdobject(0x0100, MODEL_A51_EXP1, PAD_TRA_0421, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_INVINCIBLE | OBJFLAG_UNCOLLECTABLE | OBJFLAG_FORCENOBOUNCE | OBJFLAG_01000000 | OBJFLAG_CANNOT_ACTIVATE, OBJFLAG2_NOFALL | OBJFLAG2_FALLWITHOUTROTATION | OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_BULLETPROOF | OBJFLAG2_IMMUNETOEXPLOSIONS, 0, 1000) stdobject(0x0100, MODEL_A51GRATE, PAD_TRA_0443, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) stdobject(0x0100, MODEL_A51GRATE, PAD_TRA_0444, OBJFLAG_00000008 | OBJFLAG_XTOPADBOUNDS | OBJFLAG_YTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) diff --git a/src/setups/setupwax.c b/src/setups/setupwax.c index 283a655e3..eef1c6bf9 100644 --- a/src/setups/setupwax.c +++ b/src/setups/setupwax.c @@ -498,19 +498,19 @@ u32 props[] = { camera2(0x0000, 0xffff67da, 0xfffd8eec, 0xfffe7c44, 0x0004a147, 0x0005f851, 0x00000219) tag(0x16, -1) tag(0x04, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_WAX_025C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_WAX_025C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(0x03, 1) - multimonitor(0x0099, MODEL_COMHUB, PAD_WAX_013C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, 0, 1000, 3, 3, 3, 0) + multimonitor(0x0099, MODEL_COMHUB, PAD_WAX_013C, OBJFLAG_00000002, OBJFLAG2_IMMUNETOANTI, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT) tag(OBJ_LIGHTSWITCH, 1) stdobject(0x0100, MODEL_LIGHTSWITCH, PAD_WAX_013D, OBJFLAG_00000002 | OBJFLAG_DEACTIVATED, 0, OBJFLAG3_INTERACTABLE, 1000) tag(0x10, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_0258, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_0258, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x11, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_0259, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_0259, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x12, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_025A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_025A, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x13, 1) - multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_025B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, 3, 3, 0, 0) + multimonitor(0x0099, MODEL_PD_CONSOLE, PAD_WAX_025B, OBJFLAG_FALL | OBJFLAG_XTOPADBOUNDS | OBJFLAG_ZTOPADBOUNDS | OBJFLAG_CORE_GEO_INUSE, 0, 0, 1000, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_SCROLL_TEXT_GREEN, TVPROGRAM_DEFAULT, TVPROGRAM_DEFAULT) tag(0x19, 2) tag(0x1a, 2) stdobject(0x0100, MODEL_DD_BANNER, -1, OBJFLAG_FALL | OBJFLAG_IGNOREFLOORCOLOUR | OBJFLAG_IGNOREROOMCOLOUR | OBJFLAG_INVINCIBLE, 0, 0, 1000) @@ -1698,7 +1698,7 @@ u8 func1007_bomb_logic[] = { assign_sound(SFX_8144, CHANNEL_1) play_repeating_sound_from_object(CHANNEL_1, OBJ_PLANTED_BOMB, 1, 600, 1200) unset_object_flag2(OBJ_PLANTED_BOMB, OBJFLAG2_INVISIBLE) - set_object_image(OBJ_PLANTED_BOMB, 0, TVCMDLIST_0F) + set_object_image(OBJ_PLANTED_BOMB, 0, TVPROGRAM_PULSE_RED) unset_object_flag(OBJ_PLANTED_BOMB, OBJFLAG_INVINCIBLE) // Start 4 minute timer