Compare commits

...

3 Commits

Author SHA1 Message Date
e0f3c39997 Put in all the sequences 2025-12-22 19:55:59 +01:00
51206b96f4 Intermission 3 2025-12-21 18:50:57 +01:00
0dd0d87e32 Clean 2025-12-21 18:04:43 +01:00
7 changed files with 119 additions and 18 deletions

View File

@@ -2539,7 +2539,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.y
value: -15.5
value: -16
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.z
@@ -5881,7 +5881,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.y
value: -16.5
value: -17
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.z
@@ -19774,6 +19774,7 @@ Transform:
- {fileID: 1429024914}
- {fileID: 1516731745}
- {fileID: 1387643237}
- {fileID: 1045119746}
m_Father: {fileID: 1886023632}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &712932630 stripped
@@ -20617,7 +20618,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.y
value: -16.5
value: -17
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.z
@@ -23682,7 +23683,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1045119746}
- {fileID: 1959372908}
m_Father: {fileID: 1886023632}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -29016,12 +29016,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1045119745}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.266148, y: 14.909718, z: -30.038902}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 851913432}
m_Father: {fileID: 712073434}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1048580314 stripped
Transform:
@@ -35132,7 +35132,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.y
value: -16.5
value: -17
objectReference: {fileID: 0}
- target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3}
propertyPath: m_LocalPosition.z
@@ -52610,7 +52610,7 @@ GameObject:
m_Component:
- component: {fileID: 1933482823}
m_Layer: 0
m_Name: Improve scary transition out of intermission 2
m_Name: Intermission music / visuals continue until ready
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -55104,7 +55104,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &2026234130
Transform:
m_ObjectHideFlags: 0

View File

@@ -641,6 +641,9 @@ namespace Marro.PacManUdon
case PacManTimeSequence.Intermission2:
TimeSequenceStepIntermission2(sequenceProgress);
break;
case PacManTimeSequence.Intermission3:
TimeSequenceStepIntermission3(sequenceProgress);
break;
}
}
@@ -678,6 +681,8 @@ namespace Marro.PacManUdon
return DeltaToAbsolute(new float[] { 0, 0.316f, 0.3f, 3.96f, 2.25f, 3.93f });
case PacManTimeSequence.Intermission2:
return DeltaToAbsolute(new float[] { 0, 0.25f, 0.083f, 0.3f, 1.43f, 2.5f, 1.816f, 1.25f, 0.017f, 1f, 1.966f, 0.033f });
case PacManTimeSequence.Intermission3:
return DeltaToAbsolute(new float[] { 0, 0.316f, 0.7f, 3.35f, 0.83f, 3.67f });
}
}

View File

@@ -37,7 +37,26 @@ namespace Marro.PacManUdon
break;
case 6:
// Call handler for what should happen next
InsertTimeSequence(PacManTimeSequence.StartNewLevel);
PacManTimeSequence nextSequence;
switch (level)
{
case 2:
nextSequence = PacManTimeSequence.Intermission1;
break;
case 5:
nextSequence = PacManTimeSequence.Intermission2;
break;
case 9:
case 13:
case 17:
nextSequence = PacManTimeSequence.Intermission3;
break;
default:
nextSequence = PacManTimeSequence.StartNewLevel;
break;
}
InsertTimeSequence(nextSequence);
break;
}
}

View File

@@ -53,7 +53,7 @@ namespace Marro.PacManUdon
break;
case 4:
// Pacman starts changing ghosts
// Pacman starts chasing ghosts
pacMan.SetDirection(Vector2.right);
pacMan.BecomeBig();
break;

View File

@@ -0,0 +1,66 @@
using UnityEngine;
namespace Marro.PacManUdon
{
public partial class GameManager
{
private void TimeSequenceStepIntermission3(int sequenceProgress)
{
var blinky = ghostManager.Ghosts[0];
switch (sequenceProgress)
{
case 0:
// Show just level display
RestartLevel();
statusDisplay.SetLevelDisplayVisible(true);
break;
case 1:
// Start animation, pacman running and blinky prepared to chase
soundManager.SuppressSound(false);
soundManager.StartIntermissionSound();
pacMan.Reset();
pacMan.SetLevel(4);
pacMan.SetPowerPellet(false); // Update speed
pacMan.SetKinematic(true);
pacMan.SetActive(true);
pacMan.SetPosition(intermissionScreenElements[0].transform.localPosition);
pacMan.SetDirection(Vector2.left);
ghostManager.Reset();
ghostManager.SetLevel(5);
ghostManager.SetKinematic(true);
ghostManager.gameObject.SetActive(true);
blinky.SetElroy(2);
blinky.SetPosition(intermissionScreenElements[1].transform.localPosition);
blinky.SetDirection(Vector2.left);
blinky.SetState(PacManGhostState.Normal);
blinky.SetSpecialLook(true);
SetFrozen(false);
break;
case 2:
// Start blinky chasing
blinky.SetActive(true);
break;
case 3:
// Reached end, freeze
pacMan.SetDirection(Vector2.zero);
blinky.SetDirection(Vector2.zero);
break;
case 4:
// Ghost runs back on screen
blinky.SetPosition(intermissionScreenElements[3].transform.localPosition);
blinky.SetDirection(Vector2.right);
break;
case 5:
// End cutscene
soundManager.StopAllSound();
SetFrozen(true);
StartTimeSequence(PacManTimeSequence.StartNewLevel);
break;
}
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4f4714f9d9e4e8a4682d26d67d5ac4c9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1889,8 +1889,8 @@ TextureImporter:
y: 112
width: 32
height: 16
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.75, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -1910,8 +1910,8 @@ TextureImporter:
y: 112
width: 32
height: 16
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.75, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -2289,7 +2289,7 @@ TextureImporter:
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []