Skip to content

Commit

Permalink
0.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
PortilizenHub committed Aug 15, 2022
1 parent 1676cb5 commit c4210e9
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 51 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# 0.3.2

- Added Level 3 story
- Replaced haxe flixel logo for compiled applications
- Added art folder (source code)
- Added version display (main menu)
- Removed "G" (this was not added by me)
- Fixed 0.3.1 changelog (github)

# 0.3.1
- WE ARE ON [NEWGROUNDS]()

- WE ARE ON [NEWGROUNDS](https://www.newgrounds.com/portal/view/853774)
- Put levels in folders (source code)
- Added mods folder in compiled versions

Expand Down
17 changes: 10 additions & 7 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,13 @@
<!-- _______________________________ Libraries ______________________________ -->

<haxelib name="flixel" />
<!--<haxelib name="newgrounds" />-->
<!--<haxelib name="hscript" />-->
<!--<haxelib name="polymod" />-->

<!--In case you want to use the addons package-->
<haxelib name="flixel-addons" />

<!--In case you want to use the ui package-->
<haxelib name="flixel-ui" />

<!--<haxelib name="newgrounds" />-->
<!--<haxelib name="hscript" />-->
<!--<haxelib name="polymod" />-->

<!--In case you want to use nape with flixel-->
<!--<haxelib name="nape-haxe4" />-->

Expand Down Expand Up @@ -91,4 +88,10 @@
<!-- _________________________________ Custom _______________________________ -->

<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->

<icon path="art/icon16.png" size='16'/>
<icon path="art/icon32.png" size='32'/>
<icon path="art/icon64.png" size='64'/>
<icon path="art/iconOG.png" size='64'/>

</project>
Binary file added art/icon16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/icon32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/icon64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/iconOG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added assets/images/playstate/story/alone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions source/Dialogue.hx
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,23 @@ class Dialogue extends FlxState
}
}

if (LevelSelect.level == 3)
{
switch (curLine)
{
case 1:
createStory('Hello?', 'assets/images/playstate/story/alone.png');

case 2:
createStory('Oh, hey there little cats', 'assets/images/playstate/story/alone.png');

case 3:
createStory("Don't worry, I will take care\nof you", 'assets/images/playstate/story/alone.png');

case 4:
FlxG.switchState(new levels.LevelThree());
}
}

}
}
10 changes: 8 additions & 2 deletions source/LevelSelect.hx
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,20 @@ class LevelSelect extends FlxSubState
FlxG.camera.fade(FlxColor.BLACK, 1);
FlxG.state.closeSubState();
FlxG.camera.color = FlxColor.BLACK;
FlxG.switchState(new levels.LevelThree());
if (OptionsSubState.publicDialogueVAR == true)
FlxG.switchState(new Dialogue());
else if (OptionsSubState.publicDialogueVAR == false)
FlxG.switchState(new levels.LevelThree());

case 'Level 4':
level = 4;
FlxG.camera.fade(FlxColor.BLACK, 1);
FlxG.state.closeSubState();
FlxG.camera.color = FlxColor.BLACK;
FlxG.switchState(new levels.LevelThree());
if (OptionsSubState.publicDialogueVAR == true)
FlxG.switchState(new Dialogue());
else if (OptionsSubState.publicDialogueVAR == false)
FlxG.switchState(new levels.LevelThree());

case 'Exit to Main Menu':
trace('go to da menu');
Expand Down
48 changes: 7 additions & 41 deletions source/MenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ import openfl.text.TextFormat;

class MenuState extends FlxState
{
var locked:Bool = false;

var titleText:FlxText;
var datxt:FlxText;
var vertxt:FlxText;

var bd:FlxBackdrop;

Expand All @@ -32,7 +31,6 @@ class MenuState extends FlxState
var optionsButton:FlxUIButton;

var easterEgg:FlxSprite;
var fatal:FlxSprite;

var arr:Array<String>;

Expand Down Expand Up @@ -62,11 +60,6 @@ class MenuState extends FlxState
titleText = new FlxText(154, 90, 0, "Sushi Cats 2!", 48, true);
titleText.font = 'assets/data/fonts/lowbatt.ttf';

fatal = new FlxSprite(154, 90,
'assets/images/fatal.png.png.png.png.png..png.png.png.png.png..png.png.png.png.png..png.png.png.png.png..png.png.png.png.png..png.png.png.png.png..png.png.png.png.png..png.png.png.png.png..png.png.png.png.png');
fatal.alpha = 0;
add(fatal);

if (ModsSubState.originalMod == false)
{
modsButton = new FlxUIButton(206, 290, "Mods!", onModsClick);
Expand All @@ -78,13 +71,15 @@ class MenuState extends FlxState
modsButton = new FlxUIButton(256, 290, "Mods!", onModsClick);
playButton = new FlxUIButton(256, 260, "Play!", onOGPlayClick);
}

datxt = new FlxText(148, 320, 0, "Made with love to the Haxe Community\noriginal by Renchu (@BSOD).\nsequel by Portilizen", 14);
datxt.alignment = CENTER;
datxt.color = FlxColor.fromString("383259");
datxt.autoSize = false;

ttlObj = [bd, titleText, modsButton, playButton, optionsButton, datxt];
vertxt = new FlxText(2, 460, 0, PlayState.version, 14);
vertxt.color = FlxColor.fromString("383259");

ttlObj = [bd, vertxt, titleText, modsButton, playButton, optionsButton, datxt];

for (o in ttlObj)
add(o);
Expand All @@ -108,53 +103,24 @@ class MenuState extends FlxState

function onOGPlayClick()
{
if (locked == false)
{
FlxG.camera.bgColor = FlxColor.BLACK;
LevelSelect.level = 1;
FlxG.switchState(new Dialogue());
}
else if (locked == true)
{
FlxG.camera.fade(FlxColor.BLACK, 1);
for (o in ttlObj)
{
FlxTween.tween(o, {alpha: 0}, 1, {
onComplete: (_) ->
{
FlxG.camera.bgColor = FlxColor.BLACK;
FlxG.switchState(new LevelSelect());
}
});
}
}

}

function onOptionsClick()
{
if (locked == false)
openSubState(new OptionsSubState());
openSubState(new OptionsSubState());
}

function onModsClick()
{
if (locked == false)
openSubState(new ModsSubState());
openSubState(new ModsSubState());
}

override public function update(elapsed:Float)
{
if (FlxG.keys.justReleased.G)
{
bd.alpha = 0;
fatal.alpha = 10;
locked = true;
for (o in ttlObj)
o.alpha = 0;
playButton.alpha = 10;
}

super.update(elapsed);
}
}
1 change: 1 addition & 0 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class PlayState extends FlxState
public static var paused:Bool = false;
public static var canPause:Bool = true;
public static var points:Int = 0;
public static var version:String = "v0.3.2";

override public function create()
{
Expand Down

0 comments on commit c4210e9

Please sign in to comment.