gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

story menu!!!

Browse Source
This commit is contained in:
Yoshman29
2022-11-03 20:53:19 +01:00
parent e53493f831
commit e96e62e894
6 changed files with 95 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/weeks.xml
+15 -9
View File
@@ -2,19 +2,19 @@
<config>
<characters>
<!-- BOYFRIEND -->
<char name="bf" scale="0.9">
<anim name="idle" anim="BF idle dance white" fps="24" />
<char name="bf" scale="0.9" x="80">
<anim name="idle" anim="BF idle dance white" fps="24" loop="true" />
<anim name="confirm" anim="BF HEY!!" fps="24" loop="false"/>
</char>
<!-- ANIMATION IS AUTOMATICALLY ADDED. IF YOU WANT TO SPECIFY A PREFIX, ADD AN IDLE ANIM LIKE ABOVE. -->
<char name="dad" scale="0.5" />
<char name="gf" scale="0.5" />
<char name="spooky" />
<char name="pico" />
<char name="mom" />
<char name="parents-christmas" scale="0.9" />
<char name="senpai" />
<char name="dad" scale="0.5" x="50" />
<char name="gf" scale="0.5" />
<char name="spooky" scale="0.7" x="125" />
<char name="pico" scale="0.7" x="100" y="-30" flip="true"/>
<char name="mom" scale="0.5" x="50" y="10"/>
<char name="parents-christmas" scale="0.4" x="150" y="-20" />
<char name="senpai" x="130" y="-50"/>
</characters>
<weeks>
<!-- SPRITE BUTTONS ARE LOCATED IN "images/menus/storymenu/weeks/" -->
@@ -61,5 +61,11 @@
<song name="Roses" />
<song name="Thorns" hide="true" />
</week>
<week name="TANKMAN" chars="tankman,bf,gf" sprite="week6">
<song name="Ugh" />
<song name="Guns" />
<song name="Stress" />
</week>
</weeks>
</config>
assets/images/menus/storymenu/characters/spooky.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 143 KiB

buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
1055
1081
source/funkin/menus/StoryMenuState.hx
+65 -20
View File
@@ -1,5 +1,6 @@
package funkin.menus;
import flixel.math.FlxPoint;
import funkin.system.XMLUtil;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.group.FlxGroup.FlxTypedGroup;
@@ -93,6 +94,11 @@ class StoryMenuState extends MusicBeatState {
e.scrollFactor.set();
add(e);
}
characterSprites = new FlxTypedGroup<MenuCharacterSprite>();
for(i in 0...3) {
characterSprites.add(new MenuCharacterSprite(i));
}
add(characterSprites);
for(i=>week in weeks) {
@@ -143,11 +149,27 @@ class StoryMenuState extends MusicBeatState {
}
}
public function changeWeek(change:Int, force:Bool = false) {
if (change == 0 && !force) return;
curWeek = FlxMath.wrap(curWeek + change, 0, weeks.length-1);
if (!force) CoolUtil.playMenuSFX();
for(k=>e in weekSprites.members) {
e.targetY = k - curWeek;
}
tracklist.text = 'TRACKS\n\n${[for(e in weeks[curWeek].songs) if (!e.hide) e.name.toUpperCase()].join('\n')}';
for(i in 0...3)
characterSprites.members[i].changeCharacter(characters[weeks[curWeek].chars[i]]);
changeDifficulty(0, true);
}
var __oldDiffName = null;
public function changeDifficulty(change:Int, force:Bool = false) {
if (change == 0 && !force) return;
CoolUtil.playMenuSFX(0, 0.7);
curDifficulty = FlxMath.wrap(curDifficulty + change, 0, weeks[curWeek].difficulties.length-1);
if (__oldDiffName != (__oldDiffName = weeks[curWeek].difficulties[curDifficulty].toLowerCase())) {
@@ -169,23 +191,17 @@ class StoryMenuState extends MusicBeatState {
}
}
public function changeWeek(change:Int, force:Bool = false) {
if (change == 0 && !force) return;
curWeek = FlxMath.wrap(curWeek + change, 0, weeks.length-1);
CoolUtil.playMenuSFX();
for(k=>e in weekSprites.members) {
e.targetY = k - curWeek;
}
tracklist.text = 'TRACKS\n\n${[for(e in weeks[curWeek].songs) if (!e.hide) e.name.toUpperCase()].join('\n')}';
changeDifficulty(0, true);
}
public function loadXMLs() {
loadXML(Paths.xml('weeks'));
}
public override function destroy() {
super.destroy();
for(e in characters)
if (e != null && e.offset != null)
e.offset.put();
}
public function loadXML(xmlPath:String) {
try {
var xml = new Access(Xml.parse(Assets.getText(xmlPath)).firstElement());
@@ -202,7 +218,11 @@ class StoryMenuState extends MusicBeatState {
var charObj:MenuCharacter = {
spritePath: Paths.image(char.getAtt('sprite').getDefault('menus/storymenu/characters/${char.att.name}')),
scale: Std.parseFloat(char.getAtt('scale')).getDefault(1),
xml: char
xml: char,
offset: FlxPoint.get(
Std.parseFloat(char.getAtt('x')).getDefault(0),
Std.parseFloat(char.getAtt('y')).getDefault(0)
)
};
characters[char.att.name] = charObj;
}
@@ -279,6 +299,7 @@ typedef MenuCharacter = {
var spritePath:String;
var xml:Access;
var scale:Float;
var offset:FlxPoint;
// var frames:FlxFramesCollection;
}
@@ -286,14 +307,38 @@ class MenuCharacterSprite extends FlxSprite
{
public var character:String;
public function new(pos:Int, path:String) {
super(FlxG.width * (0.25 * pos), 80);
var pos:Int;
public function new(pos:Int) {
super(0, 70);
this.pos = pos;
visible = false;
antialiasing = true;
}
public var oldChar:MenuCharacter = null;
public function changeCharacter(data:MenuCharacter) {
CoolUtil.loadAnimatedGraphic(this, Paths.image(data.spritePath));
for(e in data.xml.nodes.anim)
XMLUtil.addXMLAnimation(this, e);
visible = (data != null);
if (!visible)
return;
if (oldChar != (oldChar = data)) {
CoolUtil.loadAnimatedGraphic(this, data.spritePath);
for(e in data.xml.nodes.anim) {
if (e.getAtt("name") == "idle")
animation.remove("idle");
XMLUtil.addXMLAnimation(this, e);
}
animation.play("idle");
scale.set(data.scale, data.scale);
updateHitbox();
offset.x += data.offset.x;
offset.y += data.offset.y;
x = (FlxG.width * 0.25) * (1 + pos) - 150;
}
}
}
class MenuItem extends FlxSprite
source/funkin/system/CoolUtil.hx
+11 -3
View File
@@ -31,7 +31,13 @@ class CoolUtil
* @return The return value
*/
public static function getDefault<T>(v:T, defaultValue:T):T {
return v == null ? defaultValue : v;
return (v == null || isNaN(v)) ? defaultValue : v;
}
public static function isNaN(v:Dynamic) {
if (v is Float || v is Int)
return Math.isNaN(cast(v, Float));
return false;
}
public static function setFieldDefault<T>(v:Dynamic, name:String, defaultValue:T):T {
@@ -254,7 +260,9 @@ class CoolUtil
public static function loadAnimatedGraphic(spr:FlxSprite, path:String) {
spr.frames = loadFrames(path);
spr.animation.add("idle", [for(i in 0...spr.frames.frames.length) i], 24, true);
spr.animation.play("idle");
if (spr.frames != null && spr.frames.frames != null) {
spr.animation.add("idle", [for(i in 0...spr.frames.frames.length) i], 24, true);
spr.animation.play("idle");
}
}
}
source/funkin/system/XMLUtil.hx
+3 -2
View File
@@ -44,12 +44,12 @@ class XMLUtil {
* @param sprite Destination sprite
* @param anim Animation (Must be a `anim` XML node)
*/
public static function addXMLAnimation(sprite:FlxSprite, anim:Access):ErrorCode {
public static function addXMLAnimation(sprite:FlxSprite, anim:Access, loop:Bool = false):ErrorCode {
var animData:AnimData = {
name: null,
anim: null,
fps: 24,
loop: false,
loop: loop,
x: 0,
y: 0,
indices: []
@@ -60,6 +60,7 @@ class XMLUtil {
if (anim.has.fps) animData.fps = Std.parseInt(anim.att.fps);
if (anim.has.x) animData.x = Std.parseFloat(anim.att.x);
if (anim.has.y) animData.y = Std.parseFloat(anim.att.y);
if (anim.has.loop) animData.loop = anim.att.loop == "true";
if (anim.has.indices) {
var indicesSplit = anim.att.indices.split(",");
for(indice in indicesSplit) {