Skip to content

Commit

Permalink
amogus
Browse files Browse the repository at this point in the history
  • Loading branch information
@x8c8r
x8c8r committed Jul 17, 2024
1 parent 853e57c commit fe42112
Show file tree
Hide file tree
Showing 10 changed files with 97 additions and 11 deletions.
1 change: 1 addition & 0 deletions assets/preload/data/characterList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ Nugget
nuggetdance
blocku
afton
bean
dad-test
2 changes: 1 addition & 1 deletion assets/preload/data/do-you-get-the-refrance/do-you-get-the-refrance.json
View file

Large diffs are not rendered by default.

Binary file modified assets/preload/images/credits/artsy.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/preload/images/credits/cobblestoneface.png
View file
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 assets/shared/images/characters/sussy/bean.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 71 additions & 0 deletions assets/shared/images/characters/sussy/bean.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="BEAN.png">
<!-- Created with Adobe Animate version 24.0.3.19 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Mogus left instance 10000" x="0" y="0" width="683" height="439" pivotX="232.1" pivotY="-10.95"/>
<SubTexture name="Mogus left instance 10001" x="0" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10002" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10003" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10004" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10005" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10006" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10007" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10008" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10009" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10010" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10011" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10012" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10013" x="683" y="0" width="683" height="439"/>
<SubTexture name="Mogus left instance 10014" x="683" y="0" width="683" height="439"/>
<SubTexture name="amogus idle instance 10000" x="1366" y="0" width="473" height="449" pivotX="53.5" pivotY="0.65"/>
<SubTexture name="amogus idle instance 10001" x="0" y="449" width="473" height="449"/>
<SubTexture name="amogus idle instance 10002" x="473" y="449" width="473" height="449"/>
<SubTexture name="amogus idle instance 10003" x="1366" y="0" width="473" height="449"/>
<SubTexture name="amogus idle instance 10004" x="0" y="449" width="473" height="449"/>
<SubTexture name="amogus idle instance 10005" x="473" y="449" width="473" height="449"/>
<SubTexture name="amogus up instance 10000" x="946" y="449" width="422" height="661" pivotX="-27.45" pivotY="208.5"/>
<SubTexture name="amogus up instance 10001" x="946" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10002" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10003" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10004" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10005" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10006" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10007" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10008" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10009" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10010" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10011" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10012" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10013" x="1368" y="449" width="422" height="661"/>
<SubTexture name="amogus up instance 10014" x="1368" y="449" width="422" height="661"/>
<SubTexture name="down instance 10000" x="0" y="1110" width="590" height="416" pivotX="32.75" pivotY="-34.6"/>
<SubTexture name="down instance 10001" x="0" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10002" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10003" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10004" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10005" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10006" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10007" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10008" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10009" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10010" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10011" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10012" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10013" x="590" y="1110" width="590" height="416"/>
<SubTexture name="down instance 10014" x="590" y="1110" width="590" height="416"/>
<SubTexture name="rightt instance 10000" x="1180" y="1110" width="673" height="449" pivotX="-59.45" pivotY="-0.35"/>
<SubTexture name="rightt instance 10001" x="1180" y="1110" width="673" height="449"/>
<SubTexture name="rightt instance 10002" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10003" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10004" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10005" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10006" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10007" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10008" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10009" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10010" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10011" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10012" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10013" x="0" y="1559" width="673" height="449"/>
<SubTexture name="rightt instance 10014" x="0" y="1559" width="673" height="449"/>
</TextureAtlas>
16 changes: 16 additions & 0 deletions source/Character.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,22 @@ class Character extends FlxSprite


playAnim('idle');
case 'bean':
tex = Paths.getSparrowAtlas('characters/sussy/bean');
frames = tex;
animation.addByPrefix('idle', 'amogus idle instance ', 24);
animation.addByPrefix('singUP', 'amogus up instance ', 24);
animation.addByPrefix('singRIGHT', 'rightt instance ', 24);
animation.addByPrefix('singDOWN', 'down instance ', 24);
animation.addByPrefix('singLEFT', 'Mogus left instance ', 24);

addOffset('idle');
addOffset("singUP");
addOffset("singRIGHT");
addOffset("singLEFT");
addOffset("singDOWN");

playAnim('idle');
default:
trace('couldnt get case');
var charFile:String;
Expand Down
11 changes: 3 additions & 8 deletions source/FreeplayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class FreeplayState extends MusicBeatState

newSong("Senpai", "Senpai", 6, "sigmio"),
newSong("Roses", "Roses", 6, "sigmio"),
newSong("Thorns", "Thorns", 6, "spirit"),
newSong("Unfairness-Jside", "Unfairness J-Side", 6, "spirit",true),
newSong("Thorns", "Thorns", 6, "spirit")
// newSong("Unfairness-Jside", "Unfairness J-Side", 6, "spirit",true), // i dont think its happening bros im losing hope
],
"Funkin");

Expand All @@ -82,18 +82,13 @@ class FreeplayState extends MusicBeatState
"Remixes");

pages[2] = new FreeplayPage([
newSong("Do-You-Get-The-Refrance", "Do You Get The Refrance?", 1, "impostor", true),
newSong("Do-You-Get-The-Refrance", "Do You Get The Refrance?", 1, "bean", true),
newSong("dotdotdot", "dotdotdot", 1, "sonicexe"),
newSong("bopcityfansong", "bopcityfansong", 1, "blocku"),
newSong("celebrate", "Celebrate", 1, "afton")
],
"Extras");

pages[3] = new FreeplayPage([
newSong("Rethinker-J-Mix", "Rethinker (J mix)", 1, "bf-pixel", false)
],
"Covers");

var isDebug:Bool = false;

#if debug
Expand Down
2 changes: 1 addition & 1 deletion source/HealthIcon.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class HealthIcon extends FlxSprite
animation.add('monster-christmas', [19, 20], 0, false, isPlayer);
animation.add('dickhead', [24, 25], 0, false, isPlayer);
animation.add('dave', [26, 27], 0, false, isPlayer);
animation.add('impostor', [29, 30], 0, false, isPlayer);
animation.add('bean', [29, 30], 0, false, isPlayer);
animation.add('sonicexe', [31, 32], 0, false, isPlayer);
animation.add('Nugget', [34, 35], 0, false, isPlayer);
animation.add('nuggetdance', [34, 35], 0, false, isPlayer);
Expand Down
5 changes: 4 additions & 1 deletion source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class PlayState extends MusicBeatState
goods = 0;
misses = 0;

hasDialogue = SONG.hasDialogue;
// hasDialogue = SONG.hasDialogue;
isPixel = SONG.isPixel;
isGood = SONG.isGood;

Expand Down Expand Up @@ -876,6 +876,9 @@ class PlayState extends MusicBeatState
case 'evilblocku':
dad.y += 150;
camPos.set(dad.getGraphicMidpoint().x + 200, dad.getGraphicMidpoint().y - 200);
case 'bean':
dad.y += 300;
camPos.set(dad.getGraphicMidpoint().x + 200, dad.getGraphicMidpoint().y - 200);
}


Expand Down

0 comments on commit fe42112

Please sign in to comment.