Skip to content

Commit

Permalink
satin panties bg
Browse files Browse the repository at this point in the history
  • Loading branch information
@DidgieDeez
DidgieDeez committed Jul 19, 2024
1 parent 6da17f9 commit 2c13ec2
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 5 deletions.
2 changes: 1 addition & 1 deletion assets/preload/data/satin-panties/satin-panties.json
View file

Large diffs are not rendered by default.

Binary file added assets/shared/images/stages/limo/limoDancernormal.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.
35 changes: 35 additions & 0 deletions assets/shared/images/stages/limo/limoDancernormal.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="limoDancer.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="bg dancer sketch PINK0000" x="0" y="0" width="394" height="394" frameX="0" frameY="-15" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0001" x="0" y="0" width="394" height="394" frameX="0" frameY="-15" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0002" x="404" y="0" width="394" height="391" frameX="0" frameY="-18" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0003" x="404" y="0" width="394" height="391" frameX="0" frameY="-18" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0004" x="404" y="0" width="394" height="391" frameX="0" frameY="-18" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0005" x="808" y="0" width="395" height="390" frameX="0" frameY="-19" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0006" x="808" y="0" width="395" height="390" frameX="0" frameY="-19" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0007" x="1213" y="0" width="389" height="385" frameX="-6" frameY="-24" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0008" x="1213" y="0" width="389" height="385" frameX="-6" frameY="-24" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0009" x="1612" y="0" width="249" height="358" frameX="-123" frameY="-52" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0010" x="1612" y="0" width="249" height="358" frameX="-123" frameY="-52" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0011" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0012" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0013" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0014" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0015" x="261" y="404" width="404" height="410" frameX="-113" frameY="0" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0016" x="261" y="404" width="404" height="410" frameX="-113" frameY="0" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0017" x="675" y="404" width="394" height="404" frameX="-120" frameY="-5" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0018" x="675" y="404" width="394" height="404" frameX="-120" frameY="-5" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0019" x="675" y="404" width="394" height="404" frameX="-120" frameY="-5" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0020" x="1079" y="404" width="395" height="404" frameX="-119" frameY="-5" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0021" x="1079" y="404" width="395" height="404" frameX="-119" frameY="-5" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0022" x="1484" y="404" width="395" height="402" frameX="-119" frameY="-7" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0023" x="1484" y="404" width="395" height="402" frameX="-119" frameY="-7" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0024" x="0" y="824" width="254" height="361" frameX="-141" frameY="-49" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0025" x="0" y="824" width="254" height="361" frameX="-141" frameY="-49" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0026" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0027" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0028" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
<SubTexture name="bg dancer sketch PINK0029" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
</TextureAtlas>
Binary file added assets/shared/images/stages/limo/limoDrivenormal.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.
9 changes: 9 additions & 0 deletions assets/shared/images/stages/limo/limoDrivenormal.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="limoDrive.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Limo stage0000" x="0" y="0" width="2048" height="646"/>
<SubTexture name="Limo stage0001" x="0" y="656" width="2048" height="646"/>
<SubTexture name="Limo stage0002" x="0" y="1312" width="2048" height="646"/>
<SubTexture name="Limo stage0003" x="0" y="0" width="2048" height="646"/>
</TextureAtlas>
5 changes: 4 additions & 1 deletion source/BackgroundDancer.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ class BackgroundDancer extends FlxSprite
{
super(x, y);

frames = Paths.getSparrowAtlas("stages/limo/limoDancer");
if (PlayState.curStage == 'limo')
frames = Paths.getSparrowAtlas("stages/limo/limoDancer");
else
frames = Paths.getSparrowAtlas("stages/limo/limoDancernormal");
animation.addByIndices('danceLeft', 'bg dancer sketch PINK', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
animation.addByIndices('danceRight', 'bg dancer sketch PINK', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
animation.play('danceLeft');
Expand Down
72 changes: 69 additions & 3 deletions source/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ class PlayState extends MusicBeatState
"spooky" => 2,
"philly" => 3,
"limo" => 4,
"limonormal" => 4,
"mall" => 5,
"mallEvil" => 5,
"school" => 6,
Expand Down Expand Up @@ -499,6 +500,53 @@ class PlayState extends MusicBeatState
fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('stages/limo/fastCarLol'));
// add(limo);
}
else if (SONG.stage == "limonormal")
{
curStage = 'limonormal';
defaultCamZoom = 0.90;

var skyBG:FlxSprite = new FlxSprite(-120, -50).loadGraphic(Paths.image('stages/limo/limoSunset'));
skyBG.scrollFactor.set(0.1, 0.1);
add(skyBG);

var bgLimo:FlxSprite = new FlxSprite(-200, 480);
bgLimo.frames = Paths.getSparrowAtlas('stages/limo/bgLimo');
bgLimo.animation.addByPrefix('drive', "background limo pink", 24);
bgLimo.animation.play('drive');
bgLimo.scrollFactor.set(0.4, 0.4);
add(bgLimo);

grpLimoDancers = new FlxTypedGroup<BackgroundDancer>();
add(grpLimoDancers);

for (i in 0...5)
{
var dancer:BackgroundDancer = new BackgroundDancer((370 * i) + 130, bgLimo.y - 400);
dancer.scrollFactor.set(0.4, 0.4);
grpLimoDancers.add(dancer);
}

var overlayShit:FlxSprite = new FlxSprite(-500, -600).loadGraphic(Paths.image('stages/limo/limoOverlay'));
overlayShit.alpha = 0.5;
// add(overlayShit);

// var shaderBullshit = new BlendModeEffect(new OverlayShader(), FlxColor.RED);

// FlxG.camera.setFilters([new ShaderFilter(cast shaderBullshit.shader)]);

// overlayShit.shader = shaderBullshit;

var limoTex = Paths.getSparrowAtlas('stages/limo/limoDrivenormal');

limo = new FlxSprite(-120, 550);
limo.frames = limoTex;
limo.animation.addByPrefix('drive', "Limo stage", 24);
limo.animation.play('drive');
limo.antialiasing = true;

fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('stages/limo/fastCarLol'));
// add(limo);
}
else if (SONG.stage == "mall")
{
curStage = 'mall';
Expand Down Expand Up @@ -817,9 +865,9 @@ class PlayState extends MusicBeatState
{
switch (curStage)
{
case 'limo':
case 'limo' | 'limonormal':
gfVersion = 'gf-car';
case 'mall' | 'mallEvil':
case 'mall' | 'mallEvil' | 'mallsuspicious':
gfVersion = 'gf-christmas';
case 'school':
gfVersion = 'gf-pixelgroove';
Expand Down Expand Up @@ -914,6 +962,13 @@ class PlayState extends MusicBeatState

resetFastCar();
add(fastCar);
case 'limonormal':
boyfriend.y -= 220;
boyfriend.x += 260;

resetFastCar();
add(fastCar);


case 'mall':
boyfriend.x += 200;
Expand Down Expand Up @@ -954,8 +1009,9 @@ class PlayState extends MusicBeatState
add(gf);

// Shitty layering but whatev it works LOL
if (curStage == 'limo')
if (curStage == 'limo' || curStage == 'limonormal')
add(limo);


add(dad);

Expand Down Expand Up @@ -1947,6 +2003,8 @@ class PlayState extends MusicBeatState
{
case 'limo':
camFollow.x = boyfriend.getMidpoint().x - 300;
case 'limonormal':
camFollow.x = boyfriend.getMidpoint().x - 300;
case 'mall':
camFollow.y = boyfriend.getMidpoint().y - 200;
case 'school':
Expand Down Expand Up @@ -3189,6 +3247,14 @@ class PlayState extends MusicBeatState
dancer.dance();
});

if (FlxG.random.bool(10) && fastCarCanDrive)
fastCarDrive();
case 'limonormal':
grpLimoDancers.forEach(function(dancer:BackgroundDancer)
{
dancer.dance();
});

if (FlxG.random.bool(10) && fastCarCanDrive)
fastCarDrive();
case "philly":
Expand Down

0 comments on commit 2c13ec2

Please sign in to comment.