-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'dev/main'
- Loading branch information
Showing
110 changed files
with
1,940 additions
and
23,008 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
| name: Windows Build | ||
| on: | ||
| push: | ||
| workflow_dispatch: | ||
| jobs: | ||
| build: | ||
| name: Windows Build | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,10 @@ | ||
| <!DOCTYPE codename-engine-character> | ||
|
|
||
| <!-- tankman actually have player offsets !--> | ||
| <character isPlayer="true" flipX="true" x="0" y="180" camx="0"> | ||
| <anim name="idle" anim="Tankman Idle Dance instance 100" fps="24" loop="false" x="0" y="0" /> | ||
| <anim name="singRIGHT" anim="Tankman Right Note instance 1000" fps="24" loop="false" x="-1" y="-7" /> | ||
| <anim name="singDOWN" anim="Tankman DOWN note instance 1000" fps="24" loop="false" x="98" y="-90" /> | ||
| <anim name="singUP" anim="Tankman UP note instance 1000" fps="24" loop="false" x="24" y="56" /> | ||
| <anim name="singLEFT" anim="Tankman Note Left instance 1000" fps="24" loop="false" x="100" y="-14" /> | ||
|
|
||
| <!-- Heh! Pretty Good! --> | ||
| <anim name="singDOWN-alt" anim="PRETTY GOOD tankman instance 100" fps="24" loop="false" x="98" y="-90" /> | ||
| <!-- Ugh! --> | ||
| <anim name="singUP-alt" anim="TANKMAN UGH instance 100" fps="30" loop="false" x="24" y="56" /> | ||
| </character> | ||
| <character x="0" icon="tankman" y="180" isGF="false" flipX="true" isPlayer="true" sprite="tankman"> | ||
| <anim x="0" loop="false" y="0" fps="24" anim="Tankman Idle Dance instance 100" name="idle"/> | ||
| <anim x="-1" loop="false" y="-7" fps="24" anim="Tankman Right Note instance 1000" name="singRIGHT"/> | ||
| <anim x="98" loop="false" y="-90" fps="24" anim="Tankman DOWN note instance 1000" name="singDOWN"/> | ||
| <anim x="24" loop="false" y="56" fps="24" anim="Tankman UP note instance 1000" name="singUP"/> | ||
| <anim x="100" loop="false" y="-14" fps="24" anim="Tankman Note Left instance 1000" name="singLEFT"/> | ||
| <anim x="98" loop="false" y="17" fps="24" anim="PRETTY GOOD tankman instance 100" name="good!"/> | ||
| <anim x="-16" loop="false" y="-9" fps="30" anim="TANKMAN UGH instance 100" name="singUP-alt"/> | ||
| </character> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| var loopedTimah:FlxTimer; // Hey! a man has fallen into the river in lego city! and if youre asking why this is here, you shall disappear! - Nex | ||
| var bgFade:FlxSprite; | ||
| var hand:FlxSprite; | ||
|
|
||
| function postCreate() { | ||
| bgFade = new FlxSprite().makeSolid(FlxG.width + 100, FlxG.height + 100, 0xFFB3DFd8); | ||
| bgFade.screenCenter(); | ||
| bgFade.scrollFactor.set(); | ||
| bgFade.alpha = 0; | ||
| cutscene.insert(0, bgFade); | ||
|
|
||
| loopedTimah = new FlxTimer().start(0.83, function(tmr:FlxTimer) | ||
| { | ||
| bgFade.alpha += (1 / 5) * 0.7; | ||
| if (bgFade.alpha > 0.7) | ||
| bgFade.alpha = 0.7; | ||
| }, 5); | ||
|
|
||
| hand = new FlxSprite(0, 600).loadGraphic(Paths.image('stages/school/ui/hand_textbox')); | ||
| hand.scale.set(4, 4); | ||
| hand.updateHitbox(); | ||
| } | ||
|
|
||
| var finished:Bool = false; | ||
| function close(event) { | ||
| if(finished) return; | ||
| else event.cancelled = true; | ||
| cutscene.canProceed = false; | ||
|
|
||
| cutscene.curMusic?.fadeOut(1, 0); | ||
| for(c in cutscene.charMap) c.visible = false; | ||
|
|
||
| loopedTimah.cancel(); | ||
| loopedTimah = new FlxTimer().start(0.2, function(tmr:FlxTimer) | ||
| { | ||
| if (tmr.elapsedLoops <= 5) { | ||
| cutscene.dialogueBox.alpha -= 1 / 5; | ||
| cutscene.dialogueBox.text.alpha -= 1 / 5; | ||
| bgFade.alpha -= (1 / 5) * 0.7; | ||
| hand.alpha -= 1 / 5; | ||
| } else { | ||
| finished = true; | ||
| cutscene.close(); | ||
| } | ||
| }, 6); | ||
| } | ||
|
|
||
| var time:Float = 0; | ||
| function update(elapsed:Float) { | ||
| if(hand.visible = dialogueEnded) { | ||
| hand.x = 1060 + Math.sin((time += elapsed) * Math.PI * 2) * 12; | ||
| hand.x -= hand.x % hand.scale.x; | ||
| hand.y -= hand.y % hand.scale.y; | ||
| } | ||
| } | ||
|
|
||
| function postPlayBubbleAnim() { | ||
| cutscene.remove(hand); | ||
| if(active && visible) | ||
| cutscene.add(hand); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <!DOCTYPE codename-engine-dialogue-box> | ||
| <dialoguebox sprite="pixel/dialogueBox" antialiasing="false" graphicSizex="1227" x="-67" y="-325" textSound="pixel/pixelText" nextSound="pixel/clickText" updateHitbox="true"> | ||
| <!-- | ||
| Node containing all text settings | ||
| --> | ||
| <text font="pixel.otf" x="239" y="218" width="768" color="#3f2021" size="32" antialiasing="false" borderSize="1" borderStyle="shadow" borderColor="#D89494" shadowOffsetX="2" shadowOffsetY="2"/> | ||
|
|
||
| <!-- | ||
| All positions for characters | ||
| --> | ||
| <charpos name="left" x="-500" y="184" /> | ||
| <charpos name="middle" x="0" y="184" /> | ||
| <charpos name="right" x="490" y="184" /> | ||
|
|
||
| <!-- | ||
| All animations for the dialogue box | ||
| For example, if you wanna add an "angry" animation, add an animation named "angry" (box idle), and "angry-open" (not needed, for box apparition) | ||
| --> | ||
| <anim name="normal-firstOpen" anim="Text Box Appear instance 10" fps="24" /> | ||
| <anim name="angry-firstOpen" anim="Text Box Bump Appear instance 10" x="-16" y="-59" fps="24" /> | ||
| </dialoguebox> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import flixel.tweens.FlxTweenType; | ||
|
|
||
| var aberration:CustomShader = null; | ||
| var spirit:FlxSprite; | ||
| function postCreate() { | ||
| spirit = new FlxSprite(320, 170).loadGraphic(Paths.image('game/cutscenes/weeb/spiritFaceForward')); | ||
| spirit.setGraphicSize(Std.int(spirit.width * 6)); | ||
| if(Options.gameplayShaders) { | ||
| spirit.shader = aberration = new CustomShader('chromaticAberration'); | ||
| FlxTween.num(-0.003, 0.003, 3, {ease: FlxEase.sineInOut, type: FlxTweenType.PINGPONG}, function(num) { if(aberration == null) return; aberration.redOff = [0, -num]; aberration.blueOff = [0, num]; }); | ||
| } | ||
| cutscene.add(spirit); | ||
|
|
||
| FlxG.camera._fxFadeAlpha = 0; | ||
| cutscene.dialogueCamera.bgColor = FlxColor.fromRGBFloat(1, 1, 1, 0.3); | ||
| } | ||
|
|
||
| var finished:Bool = false; | ||
| function close(event) { | ||
| if(finished) return; | ||
| else event.cancelled = true; | ||
| cutscene.canProceed = false; | ||
|
|
||
| cutscene.curMusic?.fadeOut(1, 0); | ||
| for(c in cutscene.charMap) c.visible = false; | ||
|
|
||
| spirit.destroy(); | ||
| spirit.shader = aberration = null; | ||
| new FlxTimer().start(0.4, function(swagTimer:FlxTimer) { | ||
| cutscene.dialogueCamera.alpha -= 0.15; | ||
|
|
||
| if(cutscene.dialogueCamera.alpha > 0) swagTimer.reset(); | ||
| else { | ||
| finished = true; | ||
| cutscene.close(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function popupChar(event) { | ||
| if(!active || event.char.positionName != "left") return; | ||
| event.char.color = FlxColor.BLACK; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <!DOCTYPE codename-engine-dialogue-box> | ||
| <dialoguebox sprite="pixel/dialogueBox-evil" antialiasing="false" graphicSizex="1344" y="107" textSound="pixel/pixelText" nextSound="pixel/clickText" updateHitbox="true"> | ||
| <!-- | ||
| Node containing all text settings | ||
| --> | ||
| <text font="pixel.otf" x="265" y="220" width="768" color="#FFFFFF" size="32" antialiasing="false" borderSize="2" borderStyle="shadow" borderColor="#000000" /> | ||
|
|
||
| <!-- | ||
| All positions for characters | ||
| --> | ||
| <charpos name="left" x="-510" y="183" /> | ||
| <charpos name="middle" x="0" y="183" /> | ||
| <charpos name="right" x="510" y="183" /> | ||
|
|
||
| <!-- | ||
| All animations for the dialogue box | ||
| For example, if you wanna add an "angry" animation, add an animation named "angry" (box idle), and "angry-open" (not needed, for box apparition) | ||
| --> | ||
| <anim name="normal-firstOpen" anim="Spirit Textbox spawn instance 10" fps="24" /> | ||
| </dialoguebox> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| function postHide() { | ||
| if(curTween != null) curTween.percent = 1; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <!DOCTYPE codename-engine-dialogue-character> | ||
| <character sprite="pixel/boyfriend" x="570" y="-599" graphicSizex="1334" antialiasing="false" textSound="pixel/pixelText"> | ||
| <anim name="normal-show" anim="Boyfriend portrait enter instance 10" fps="24" /> | ||
| </character> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| function postHide() { | ||
| if(curTween != null) { | ||
| if(animation.curAnim?.name == 'angry-show') curTween.cancel(); | ||
| else curTween.percent = 1; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <!DOCTYPE codename-engine-dialogue-character> | ||
| <character sprite="pixel/senpai" x="-392" y="-599" graphicSizex="1334" antialiasing="false" textSound="pixel/pixelText"> | ||
| <anim name="normal-show" anim="Senpai Portrait Enter instance 10" fps="24" x="4.4" /> | ||
| <anim name="angry-show" anim="Senpai Portrait Angry instance 10" x="-56" y="-9" fps="24" /> | ||
| </character> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| // | ||
| function onNoteHit(event) if (event.noteType == "Alt Anim Note") event.animSuffix = "-alt"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| function onNoteHit(event) if (event.noteType == "No Anim Note") event.animCancelled = true; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <!DOCTYPE codename-engine-stage> | ||
| <stage zoom="1" name="school-evil" folder="stages/school/" > | ||
| <stage zoom="1" name="school-evil" folder="stages/school/" startCamPosY="550" startCamPosX="600"> | ||
| <sprite name="bg" x="400" y="200" sprite="animatedEvilSchool" | ||
| antialiasing="false" scale="6" scrollx="0.8" scrolly="0.9" type="loop"/> | ||
| </stage> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,10 @@ | ||
| function create() { | ||
| importScript("data/scripts/pixel"); | ||
| if (PlayState.SONG.meta.name.toLowerCase() == "roses") { | ||
| flabbergastGirls(); | ||
| bgGirls.animation.remove("danceLeft"); | ||
| bgGirls.animation.remove("danceRight"); | ||
| bgGirls.animation.addByIndices('danceLeft', 'BG fangirls dissuaded', CoolUtil.numberArray(14), "", 24, false); | ||
| bgGirls.animation.addByIndices('danceRight', 'BG fangirls dissuaded', CoolUtil.numberArray(30, 15), "", 24, false); | ||
| } | ||
| bgGirls.animation.play("danceLeft", true); // horrible fix, please fix later | ||
| } | ||
|
|
||
| public function flabbergastGirls() { | ||
| bgGirls.animation.remove("danceLeft"); | ||
| bgGirls.animation.remove("danceRight"); | ||
| bgGirls.animation.addByIndices('danceLeft', 'BG fangirls dissuaded', CoolUtil.numberArray(14), "", 24, false); | ||
| bgGirls.animation.addByIndices('danceRight', 'BG fangirls dissuaded', CoolUtil.numberArray(30, 15), "", 24, false); | ||
| bgGirls.animation.play("danceLeft", true); | ||
| } |
Oops, something went wrong.