Skip to content

Commit

Permalink
some little thingies
Browse files Browse the repository at this point in the history
  • Loading branch information
moxie-coder committed Oct 25, 2023
1 parent 87506fd commit 84799a5
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ using StringTools;

class PlayState extends MusicBeatState
{
public static var STRUM_X = 42;
public static var STRUM_X = 48.5;
public static var STRUM_X_MIDDLESCROLL = -278;

public static var ratingStuff:Array<Dynamic> = [
Expand All @@ -133,15 +133,9 @@ class PlayState extends MusicBeatState
public var modchartSaves:Map<String, FlxSave> = new Map<String, FlxSave>();
//event variables
private var isCameraOnForcedPos:Bool = false;
#if (haxe >= "4.0.0")
public var boyfriendMap:Map<String, Boyfriend> = new Map();
public var dadMap:Map<String, Character> = new Map();
public var gfMap:Map<String, Character> = new Map();
#else
public var boyfriendMap:Map<String, Boyfriend> = new Map<String, Boyfriend>();
public var dadMap:Map<String, Character> = new Map<String, Character>();
public var gfMap:Map<String, Character> = new Map<String, Character>();
#end

public var BF_X:Float = 770;
public var BF_Y:Float = 100;
Expand Down Expand Up @@ -379,7 +373,7 @@ class PlayState extends MusicBeatState
FlxG.cameras.add(camOther);
grpNoteSplashes = new FlxTypedGroup<NoteSplash>();

FlxCamera.defaultCameras = [camGame];
FlxG.cameras.setDefaultDrawTarget(camGame, true);
CustomFadeTransition.nextCamera = camOther;

persistentUpdate = true;
Expand Down Expand Up @@ -1032,8 +1026,8 @@ class PlayState extends MusicBeatState
startCharacterPos(boyfriend);
boyfriendGroup.add(boyfriend);
startCharacterLua(boyfriend.curCharacter);
var camPos:FlxPoint = new FlxPoint(girlfriendCameraOffset[0], girlfriendCameraOffset[1]);

var camPos:FlxPoint = FlxPoint.get(girlfriendCameraOffset[0], girlfriendCameraOffset[1]);
if(gf != null)
{
camPos.x += gf.getGraphicMidpoint().x + gf.cameraPosition[0];
Expand Down Expand Up @@ -1178,6 +1172,7 @@ class PlayState extends MusicBeatState
camFollowPos = new FlxObject(0, 0, 1, 1);

snapCamFollowToPos(camPos.x, camPos.y);
camPos.put();
if (prevCamFollow != null)
{
camFollow = prevCamFollow;
Expand Down

0 comments on commit 84799a5

Please sign in to comment.