Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Build out much of test chamber 09

Browse source
This commit is contained in:
James Lambert 2024-01-02 21:36:53 -07:00
parent dba8b5d415
commit 95ca05b846
7 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -380,7 +380,8 @@ ANIM_TEST_CHAMBERS = build/assets/test_chambers/test_chamber_00/test_chamber_00_
build/assets/test_chambers/test_chamber_04/test_chamber_04_anim.o \ build/assets/test_chambers/test_chamber_04/test_chamber_04_anim.o \
build/assets/test_chambers/test_chamber_06/test_chamber_06_anim.o \ build/assets/test_chambers/test_chamber_06/test_chamber_06_anim.o \
build/assets/test_chambers/test_chamber_07/test_chamber_07_anim.o \ build/assets/test_chambers/test_chamber_07/test_chamber_07_anim.o \
build/assets/test_chambers/test_chamber_08/test_chamber_08_anim.o build/assets/test_chambers/test_chamber_08/test_chamber_08_anim.o \
build/assets/test_chambers/test_chamber_09/test_chamber_09_anim.o
build/anims.ld: $(ANIM_LIST) $(ANIM_TEST_CHAMBERS) tools/generate_animation_ld.js build/anims.ld: $(ANIM_LIST) $(ANIM_TEST_CHAMBERS) tools/generate_animation_ld.js
@mkdir -p $(@D) @mkdir -p $(@D)
@ -398,7 +399,8 @@ TEST_CHAMBERS = assets/test_chambers/test_chamber_00/test_chamber_00.blend \
assets/test_chambers/test_chamber_05/test_chamber_05.blend \ assets/test_chambers/test_chamber_05/test_chamber_05.blend \
assets/test_chambers/test_chamber_06/test_chamber_06.blend \ assets/test_chambers/test_chamber_06/test_chamber_06.blend \
assets/test_chambers/test_chamber_07/test_chamber_07.blend \ assets/test_chambers/test_chamber_07/test_chamber_07.blend \
assets/test_chambers/test_chamber_08/test_chamber_08.blend assets/test_chambers/test_chamber_08/test_chamber_08.blend \
assets/test_chambers/test_chamber_09/test_chamber_09.blend
TEST_CHAMBER_HEADERS = $(TEST_CHAMBERS:%.blend=build/%.h) TEST_CHAMBER_HEADERS = $(TEST_CHAMBERS:%.blend=build/%.h)
TEST_CHAMBER_OBJECTS = $(TEST_CHAMBERS:%.blend=build/%_geo.o) TEST_CHAMBER_OBJECTS = $(TEST_CHAMBERS:%.blend=build/%_geo.o)

BIN
assets/test_chambers/test_chamber_09/test_chamber_09.blend
View file

Binary file not shown.

4
assets/test_chambers/test_chamber_09/test_chamber_09.yaml Normal file
View file

@ -0,0 +1,4 @@
cutscenes:
INTRO:
- activate_signage 14
- set_signal launch_ball

4
src/levels/levels.c
View file

@ -257,6 +257,8 @@ int getChamberDisplayNumberFromLevelIndex(int levelIndex, int roomIndex){
return 12; return 12;
case 8: case 8:
return 13; return 13;
case 9:
return 14;
default: default:
return 0; return 0;
} }
@ -287,6 +289,8 @@ int getLevelIndexFromChamberDisplayNumber(int chamberNumber) {
return 7; return 7;
case 13: case 13:
return 8; return 8;
case 14:
return 9;
default: default:
return 0; return 0;
} }

2
src/main.c
View file

@ -249,7 +249,7 @@ static void gameProc(void* arg) {
savefileLoad(); savefileLoad();
levelLoadWithCallbacks(INTRO_MENU); levelLoadWithCallbacks(9);
gCurrentTestSubject = 0; gCurrentTestSubject = 0;
cutsceneRunnerReset(); cutsceneRunnerReset();
controllersInit(); controllersInit();

2
src/menu/new_game_menu.c
View file

@ -28,7 +28,7 @@ struct Chapter gChapters[] = {
{images_chapter3_rgba_16b, 4, 8}, {images_chapter3_rgba_16b, 4, 8},
{images_chapter4_rgba_16b, 6, 10}, {images_chapter4_rgba_16b, 6, 10},
{images_chapter5_rgba_16b, 8, 13}, {images_chapter5_rgba_16b, 8, 13},
{images_chapter6_rgba_16b, -1, 14}, {images_chapter6_rgba_16b, 9, 14},
{images_chapter7_rgba_16b, -1, 15}, {images_chapter7_rgba_16b, -1, 15},
{images_chapter8_rgba_16b, -1, 16}, {images_chapter8_rgba_16b, -1, 16},
{images_chapter9_rgba_16b, -1, 17}, {images_chapter9_rgba_16b, -1, 17},

1
src/scene/signage.c
View file

@ -122,6 +122,7 @@ short gLevelWarnings[] = {
LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking, LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking,
LevelWarningsCubeDispense | LevelWarningsCubeHit | LevelWarningsSpeedyIn | LevelWarningsSpeedyOut, LevelWarningsCubeDispense | LevelWarningsCubeHit | LevelWarningsSpeedyIn | LevelWarningsSpeedyOut,
LevelWarningsCubeHit | LevelWarningsBallHit | LevelWarningsBallCollect, LevelWarningsCubeHit | LevelWarningsBallHit | LevelWarningsBallCollect,
LevelWarningsCubeHit | LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking | LevelWarningsSpeedyIn | LevelWarningsSpeedyOut,
}; };
static struct Coloru8 gBacklightColors[] = { static struct Coloru8 gBacklightColors[] = {