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

Add trigger to prompt switch usage

Browse source
This commit is contained in:
James Lambert 2023-09-30 18:02:35 -06:00
parent f8ca236f1b
commit dd54ac6aea
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

2
assets/test_chambers/test_chamber_07/test_chamber_07.yaml
View file

@ -68,6 +68,8 @@ cutscenes:
- q_sound 07_PART1_TRAPPED_2 CH_GLADOS - q_sound 07_PART1_TRAPPED_2 CH_GLADOS
- wait_for_channel CH_GLADOS - wait_for_channel CH_GLADOS
- set_signal trap_door - set_signal trap_door
PROMPT_SWITCH:
- show_prompt CutscenePromptTypeUse
operators: operators:
- weeeee = exit_1 and flying - weeeee = exit_1 and flying
- not_move_to_gun = not move_to_gun - not_move_to_gun = not move_to_gun

2
src/levels/level_definition.h
View file

@ -57,7 +57,7 @@ enum CutscenePromptType {
CutscenePromptTypePortal1, CutscenePromptTypePortal1,
CutscenePromptTypePickup, CutscenePromptTypePickup,
CutscenePromptTypeDrop, CutscenePromptTypeDrop,
CutscenePromptTypeSwitch, CutscenePromptTypeUse,
CutscenePromptTypeCrouch, CutscenePromptTypeCrouch,
CutscenePromptTypeMove, CutscenePromptTypeMove,
CutscenePromptTypeJump, CutscenePromptTypeJump,

2
src/player/player.c
View file

@ -328,7 +328,7 @@ void playerUpdateGrabbedObject(struct Player* player) {
} }
else if ((hit.object->body)){ else if ((hit.object->body)){
player->flags |= PlayerJustSelect; player->flags |= PlayerJustSelect;
hudResolvePrompt(&gScene.hud, CutscenePromptTypeSwitch); hudResolvePrompt(&gScene.hud, CutscenePromptTypeUse);
} }
else{ else{
player->flags |= PlayerJustDeniedSelect; player->flags |= PlayerJustDeniedSelect;