From 15f7b5e2d20d30ad28d8f3131fcac24aeb1fe329 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sat, 13 Mar 2021 20:53:57 -0500
Subject: [PATCH 1/2] offset bullshit and pico
---
source/Character.hx | 38 ++++++++++++++++++++++++++++----------
source/HealthIcon.hx | 1 +
source/PlayState.hx | 10 ++++++++++
3 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/source/Character.hx b/source/Character.hx
index 6fd919e2b..965b89ab6 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -4,6 +4,7 @@ import flixel.FlxG;
import flixel.FlxSprite;
import flixel.animation.FlxBaseAnimation;
import flixel.graphics.frames.FlxAtlasFrames;
+import haxe.io.Path;
using StringTools;
@@ -266,6 +267,18 @@ class Character extends FlxSprite
flipX = true;
+ case 'pico-speaker':
+ frames = Paths.getSparrowAtlas('characters/picoSpeaker');
+
+ quickAnimAdd('shoot1', "Pico shoot 1");
+ quickAnimAdd('shoot2', "Pico shoot 2");
+ quickAnimAdd('shoot3', "Pico shoot 3");
+ quickAnimAdd('shoot4', "Pico shoot 4");
+
+ // here for now, will be replaced later for less copypaste
+ loadOffsetFile(curCharacter);
+ playAnim('shoot1');
+
case 'bf':
var tex = Paths.getSparrowAtlas('BOYFRIEND');
frames = tex;
@@ -521,15 +534,7 @@ class Character extends FlxSprite
animation.addByPrefix('singUPmiss', 'Tankman UP note MISS', 24, false);
animation.addByPrefix('singDOWNmiss', 'Tankman DOWN note MISS', 24, false);
- addOffset('idle');
- addOffset("singUP", 24, 56);
- addOffset("singRIGHT", -1, -7);
- addOffset("singLEFT", 100, -14);
- addOffset("singDOWN", 98, -90);
- addOffset("singUPmiss", 24, 56);
- addOffset("singRIGHTmiss", -1, -7);
- addOffset("singLEFTmiss", 100, -14);
- addOffset("singDOWNmiss", 98, -90);
+ loadOffsetFile(curCharacter);
playAnim('idle');
@@ -561,9 +566,20 @@ class Character extends FlxSprite
}
}
+ function quickAnimAdd(name:String, prefix:String)
+ {
+ animation.addByPrefix(name, prefix, 24, false);
+ }
+
private function loadOffsetFile(offsetCharacter:String)
{
- var daFile:String = Paths.file("characters/" + offsetCharacter + "Offsets.txt");
+ var daFile:Array<String> = CoolUtil.coolTextFile(Paths.file("images/characters/" + offsetCharacter + "Offsets.txt"));
+
+ for (i in daFile)
+ {
+ var splitWords:Array<String> = i.split(" ");
+ addOffset(splitWords[0], Std.parseInt(splitWords[1]), Std.parseInt(splitWords[2]));
+ }
}
override function update(elapsed:Float)
@@ -649,6 +665,8 @@ class Character extends FlxSprite
else
playAnim('danceLeft');
}
+ case 'pico-speaker':
+ playAnim('shoot' + FlxG.random.int(1, 4), true);
case 'spooky':
danced = !danced;
diff --git a/source/HealthIcon.hx b/source/HealthIcon.hx
index ff967e990..c821a84b3 100644
--- a/source/HealthIcon.hx
+++ b/source/HealthIcon.hx
@@ -21,6 +21,7 @@ class HealthIcon extends FlxSprite
animation.add('bf-pixel', [21, 21], 0, false, isPlayer);
animation.add('spooky', [2, 3], 0, false, isPlayer);
animation.add('pico', [4, 5], 0, false, isPlayer);
+ animation.add('pico-speaker', [4, 5], 0, false, isPlayer);
animation.add('mom', [6, 7], 0, false, isPlayer);
animation.add('mom-car', [6, 7], 0, false, isPlayer);
animation.add('tankman', [8, 9], 0, false, isPlayer);
diff --git a/source/PlayState.hx b/source/PlayState.hx
index c864df782..0e72585e5 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -560,9 +560,19 @@ class PlayState extends MusicBeatState
if (curStage == 'limo')
gfVersion = 'gf-car';
+ if (SONG.song.toLowerCase() == 'stress')
+ gfVersion = 'pico-speaker';
+
gf = new Character(400, 130, gfVersion);
gf.scrollFactor.set(0.95, 0.95);
+ switch (gfVersion)
+ {
+ case 'pico-speaker':
+ gf.x -= 50;
+ gf.y -= 200;
+ }
+
dad = new Character(100, 100, SONG.player2);
var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y);
From a55dcdc69c55fb9274b8e872d31b81e0c9c287ca Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sat, 13 Mar 2021 23:02:14 -0500
Subject: [PATCH 2/2] offsets for bf and gf
---
source/Character.hx | 35 ++++++-----------------------------
1 file changed, 6 insertions(+), 29 deletions(-)
diff --git a/source/Character.hx b/source/Character.hx
index 965b89ab6..5c0c86639 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -33,7 +33,7 @@ class Character extends FlxSprite
{
case 'gf':
// GIRLFRIEND CODE
- tex = Paths.getSparrowAtlas('GF_assets');
+ tex = Paths.getSparrowAtlas('characters/GF_assets');
frames = tex;
animation.addByPrefix('cheer', 'GF Cheer', 24, false);
animation.addByPrefix('singLEFT', 'GF left note', 24, false);
@@ -47,19 +47,7 @@ class Character extends FlxSprite
animation.addByIndices('hairFall', "GF Dancing Beat Hair Landing", [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], "", 24, false);
animation.addByPrefix('scared', 'GF FEAR', 24);
- addOffset('cheer');
- addOffset('sad', -2, -21);
- addOffset('danceLeft', 0, -9);
- addOffset('danceRight', 0, -9);
-
- addOffset("singUP", 0, 4);
- addOffset("singRIGHT", 0, -20);
- addOffset("singLEFT", 0, -19);
- addOffset("singDOWN", 0, -20);
- addOffset('hairBlow', 45, -8);
- addOffset('hairFall', 0, -9);
-
- addOffset('scared', -2, -17);
+ loadOffsetFile(curCharacter);
playAnim('danceRight');
@@ -280,7 +268,7 @@ class Character extends FlxSprite
playAnim('shoot1');
case 'bf':
- var tex = Paths.getSparrowAtlas('BOYFRIEND');
+ var tex = Paths.getSparrowAtlas('characters/BOYFRIEND');
frames = tex;
animation.addByPrefix('idle', 'BF idle dance', 24, false);
animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false);
@@ -299,25 +287,14 @@ class Character extends FlxSprite
animation.addByPrefix('scared', 'BF idle shaking', 24);
- addOffset('idle', -5);
- addOffset("singUP", -29, 27);
- addOffset("singRIGHT", -38, -7);
- addOffset("singLEFT", 12, -6);
- addOffset("singDOWN", -10, -50);
- addOffset("singUPmiss", -29, 27);
- addOffset("singRIGHTmiss", -30, 21);
- addOffset("singLEFTmiss", 12, 24);
- addOffset("singDOWNmiss", -11, -19);
- addOffset("hey", 7, 4);
- addOffset('firstDeath', 37, 11);
- addOffset('deathLoop', 37, 5);
- addOffset('deathConfirm', 37, 69);
- addOffset('scared', -4);
+ loadOffsetFile(curCharacter);
playAnim('idle');
flipX = true;
+ loadOffsetFile(curCharacter);
+
case 'bf-christmas':
var tex = Paths.getSparrowAtlas('christmas/bfChristmas');
frames = tex;