diff --git a/AudioCache/au000002.mp3 b/AudioCache/au000002.mp3 new file mode 100644 index 0000000..ebec9ff Binary files /dev/null and b/AudioCache/au000002.mp3 differ diff --git a/BoneController.asc b/BoneController.asc index e73c98d..18a4cfd 100644 --- a/BoneController.asc +++ b/BoneController.asc @@ -54,7 +54,7 @@ Character * whichBoneCollidesDog(){ void on_event (EventType event, int data){ - if(event == eEventLeaveRoom){ + if(event == eEventLeaveRoom || event == eEventEnterRoomBeforeFadein){ ForceTrashBones(); } } \ No newline at end of file diff --git a/CustomTransition.asc b/CustomTransition.asc new file mode 100644 index 0000000..299ca3c --- /dev/null +++ b/CustomTransition.asc @@ -0,0 +1,63 @@ +// new module script +Timer * tVisibleFalseAfter; + +void CustomTransition_IntantFadeIn(){ + gBloodTransition.Visible = false; + gBloodTransition.Transparency = 100; + gCustomTransition.Visible = false; + gCustomTransition.Transparency = 100; +} + +void CustomTransition_IntantFadeOut(){ + gBloodTransition.Visible = false; + gBloodTransition.Transparency = 100; + gCustomTransition.Visible = true; + gCustomTransition.Transparency = 0; +} + +void CustomTransition_FadeIn(float ftime , TweenStyle blocking, float delay){ + if(FloatToInt(ftime) == 0){ + ftime = 0.3; + } + if (!Game.SkippingCutscene){ + gBloodTransition.Transparency = 100; + gBloodTransition.Visible = false; + gCustomTransition.Transparency = 0; + gCustomTransition.Visible = true; + tVisibleFalseAfter = Timer.StartRT(ftime+delay, eOnce); + gCustomTransition.TweenTransparency(ftime, 100, eEaseLinearTween, blocking, delay); + } else { + CustomTransition_IntantFadeIn(); + } + +} + +void CustomTransition_FadeOut(float ftime , TweenStyle blocking, float delay){ + if(FloatToInt(ftime) == 0){ + ftime = 0.3; + } + if (!Game.SkippingCutscene){ + gBloodTransition.Transparency = 0; + gBloodTransition.Visible = true; + gBloodTransition.X = 0; + gBloodTransition.Y = -800; + gCustomTransition.Transparency = 100; + gCustomTransition.Visible = true; + gBloodTransition.TweenY(ftime/2.0, 0, eEaseLinearTween, blocking, delay); + gCustomTransition.TweenTransparency(ftime/2.0, 0, eEaseLinearTween, blocking); + } else { + CustomTransition_IntantFadeOut(); + } +} +function repeatedly_execute_always() { + if(IsGamePaused() == 1 || !System.HasInputFocus){ + return; + } + + if(tVisibleFalseAfter!=null){ + if(tVisibleFalseAfter.EvtExpired){ + tVisibleFalseAfter=null; + gCustomTransition.Visible = false; + } + } +} \ No newline at end of file diff --git a/CustomTransition.ash b/CustomTransition.ash new file mode 100644 index 0000000..754d1a2 --- /dev/null +++ b/CustomTransition.ash @@ -0,0 +1,5 @@ +// new module header +import void CustomTransition_FadeIn(float ftime = 0, TweenStyle blocking = eNoBlockTween, float delay = 0); +import void CustomTransition_IntantFadeIn(); +import void CustomTransition_FadeOut(float ftime = 0, TweenStyle blocking = eNoBlockTween, float delay = 0); +import void CustomTransition_IntantFadeOut(); \ No newline at end of file diff --git a/Game.agf b/Game.agf index 1707e5f..f398ed1 100644 --- a/Game.agf +++ b/Game.agf @@ -73,7 +73,7 @@ DogFromHell False - 0 + 2 Windows UserDefined @@ -652,28 +652,40 @@ 1 - + Level1 2 - + Level2 3 - + Level3 4 - + Level4 5 - + Level5 6 TRASH + + 7 + Title Screen + + + 8 + Splash + + + 9 + End Screen + @@ -821,6 +833,46 @@ + + + + 320 + 224 + 0 + 0 + True + NormalButInitiallyOff + 0 + 0 + 0 + 0 + 32 + 0 + 7 + gCustomTransition + + + + + + + 800 + 224 + 0 + 0 + True + NormalButInitiallyOff + 0 + 0 + 0 + 0 + 0 + 138 + 8 + gBloodTransition + + + @@ -2292,7 +2344,7 @@ 2 0 0 - 5 + 8 38 286 True @@ -3646,6 +3698,35 @@ + + + + + + img/blood_transition/blood_transition.png + + + + + + + + + + + + + + + + + + + + + + + @@ -8303,6 +8384,428 @@ + + 27 + VACASPLASH + + + 0 + False + + + 0 + 139 + False + 0 + 0 + + + 1 + 140 + False + 0 + 0 + + + 2 + 141 + False + 0 + 0 + + + 3 + 142 + False + 0 + 0 + + + 4 + 143 + False + 0 + 0 + + + 5 + 144 + False + 0 + 0 + + + 6 + 145 + False + 0 + 0 + + + 7 + 146 + False + 0 + 0 + + + 8 + 147 + False + 0 + 0 + + + 9 + 148 + False + 0 + 0 + + + 10 + 149 + False + 0 + 0 + + + 11 + 150 + False + 0 + 0 + + + 12 + 151 + False + 0 + 0 + + + 13 + 152 + False + 0 + 0 + + + + + 1 + False + + + 0 + 139 + False + 0 + 0 + + + 1 + 140 + False + 0 + 0 + + + 2 + 141 + False + 0 + 0 + + + 3 + 142 + False + 0 + 0 + + + 4 + 143 + False + 0 + 0 + + + 5 + 144 + False + 0 + 0 + + + 6 + 145 + False + 0 + 0 + + + 7 + 146 + False + 0 + 0 + + + 8 + 147 + False + 0 + 0 + + + 9 + 148 + False + 0 + 0 + + + 10 + 149 + False + 0 + 0 + + + 11 + 150 + False + 0 + 0 + + + 12 + 151 + False + 0 + 0 + + + 13 + 152 + False + 0 + 0 + + + + + 2 + False + + + 0 + 139 + False + 0 + 0 + + + 1 + 140 + False + 0 + 0 + + + 2 + 141 + False + 0 + 0 + + + 3 + 142 + False + 0 + 0 + + + 4 + 143 + False + 0 + 0 + + + 5 + 144 + False + 0 + 0 + + + 6 + 145 + False + 0 + 0 + + + 7 + 146 + False + 0 + 0 + + + 8 + 147 + False + 0 + 0 + + + 9 + 148 + False + 0 + 0 + + + 10 + 149 + False + 0 + 0 + + + 11 + 150 + False + 0 + 0 + + + 12 + 151 + False + 0 + 0 + + + 13 + 152 + False + 0 + 0 + + + + + 3 + False + + + 0 + 139 + False + 0 + 0 + + + 1 + 140 + False + 0 + 0 + + + 2 + 141 + False + 0 + 0 + + + 3 + 142 + False + 0 + 0 + + + 4 + 143 + False + 0 + 0 + + + 5 + 144 + False + 0 + 0 + + + 6 + 145 + False + 0 + 0 + + + 7 + 146 + False + 0 + 0 + + + 8 + 147 + False + 0 + 0 + + + 9 + 148 + False + 0 + 0 + + + 10 + 149 + False + 0 + 0 + + + 11 + 150 + False + 0 + 0 + + + 12 + 151 + False + 0 + 0 + + + 13 + 152 + False + 0 + 0 + + + + + @@ -8455,6 +8958,30 @@ + + + + + + + +