things

assets/characters/bf/character.lua

@@ -1,4 +1,6 @@
 function onCreateCharacter(character)
+    character.flipX = not character.flipX
+
     character.animation:addByPrefix("idle" ,"BF idle dance", 24, false, {})
     character.animation:addOffset("idle", -5, 0)
 
@@ -8,13 +10,16 @@ function onCreateCharacter(character)
     character.animation:addByPrefix("singUP" ,"BF NOTE UP0", 24, false, {})
     character.animation:addOffset("singUP", -46, 27)
 
-    character.animation:addByPrefix("singRIGHT" ,"BF NOTE RIGHT0", 24, false, {})
-    character.animation:addOffset("singRIGHT", -48, -7)
+    local right = flipX and "singLEFT" or "singRIGHT"
+    character.animation:addByPrefix(right ,"BF NOTE RIGHT0", 24, false, {})
+    character.animation:addOffset(right, -48, -7)
 
-    character.animation:addByPrefix("singLEFT" ,"BF NOTE LEFT0", 24, false, {})
-    character.animation:addOffset("singLEFT", 5, -6)
+    local left = flipX and "singRIGHT" or "singLEFT"
+    character.animation:addByPrefix(left ,"BF NOTE LEFT0", 24, false, {})
+    character.animation:addOffset(left, 5, -6)
 
     character.animation:play("idle", true)
 
+
     character.barColor = Color.new(49, 176, 209, 255)
 end

assets/stages/mainStage/stage.lua

@@ -17,11 +17,12 @@ function onCreateStage(stage)
 
 
     boyfriend.position.x = 700
-    boyfriend.position.y = 100
+
+    boyfriend.position.y = (boyfriend.characterName=="bf") and 400 or 100
     stage:add(boyfriend)
 
     dad.position.x = 100
-    dad.position.y = 100
+    dad.position.y = (boyfriend.characterName=="bf") and 350 or 100
     stage:add(dad)
 
     local stagecurtains = Sprite.new(-500, -300)

src/funkin/Camera.cpp

@@ -22,6 +22,8 @@ namespace funkin {
 		flashColor = col;
 		flashDuration = duration;
 		flashAlpha = 1.0f;
+
+		flashIn=true;
 	}
 
 	Vector2 Camera::getScreenToWorld(const Vector2 pos) const { return GetScreenToWorld2D(pos, camera); }
@@ -47,7 +49,13 @@ namespace funkin {
 				position, Vector2{.x = static_cast<float>(GetScreenWidth()) / 2.0f, .y = static_cast<float>(GetScreenHeight()) / 2.0f});
 		camera.zoom = zoom;
 		camera.rotation = angle;
-		if (flashAlpha > 0.0) {
+		if(flashIn){
+			flashAlpha += delta / flashDuration;
+			if(flashAlpha >= 1.0){
+				flashIn=false;
+				flashAlpha=1;
+			}
+		}else if (flashAlpha > 0.0) {
 			flashAlpha -= delta / flashDuration;
 		}
 	}

src/funkin/Camera.hpp

@@ -18,6 +18,9 @@ namespace funkin {
 
 		float angle = 0.0f;
 		float zoom = 1.0f;
+		float flashAlpha = 0.0f;
+		float flashDuration = 0.0f;
+		Color flashColor = BLANK;
 
 		Vector2 target = Vector2Zero();
 		Vector2 position = Vector2Zero();
@@ -44,9 +47,7 @@ namespace funkin {
 		void update(float delta);
 		graphics::Shader premultiplyShader;
 	private:
-		float flashAlpha = 0.0f;
-		float flashDuration = 0.0f;
-		Color flashColor = BLANK;
+		bool flashIn = false;
 		Camera2D camera{};
 		RenderTexture canvas{};
 	};

src/funkin/Game.cpp

@@ -46,6 +46,8 @@ namespace funkin {
 
 		scene = std::move(newScene);
 		scene->create();
+
+		defaultCamera->flash(BLACK, 0.5f);
 		switching = false;
 		nextScene = nullptr;
 	}

src/funkin/Group.hpp

@@ -47,9 +47,9 @@
                                                                                                                                            \
 	template<Is##base T>                                                                                                                   \
 	void name<T>::remove(std::shared_ptr<T> object) {                                                                                      \
-		if (std::ranges::find(members, object) != members.end()) {                                                                         \
-			members.erase(std::ranges::find(members, object));                                                                             \
-		}                                                                                                                                  \
+		if (auto ranges = std::ranges::find(members, object); ranges != members.end()) {                                                                         \
+			members.erase(ranges);                                                                             \
+		}                                                                          \
 	}                                                                                                                                      \
                                                                                                                                            \
 	template<Is##base T>                                                                                                                   \

src/funkin/data/Song.cpp

@@ -12,22 +12,31 @@ using json = nlohmann::json;
 namespace funkin::data {
 	SongData Song::parseSong(const std::string &songName, const std::string &difficulty) {
 		const std::string songPath = "assets/songs/" + songName + "/";
+		if (FileExists((songPath + difficulty).c_str())) {
+			return parseLegacy(songPath + difficulty);
+		}
 		if (FileExists((songPath + songName + "-metadata.json").c_str())) {
-			return parseVSlice(songName, difficulty);
+			return parseVSlice(songPath + songName, difficulty);
 		}
-		return parseLegacy(songName, difficulty);
+		return parseLegacy(songPath + songName + "-" + difficulty + ".json");
 	}
-
-	SongData Song::parseLegacy(const std::string &songName, const std::string &difficulty) {
-		const std::string path = "assets/songs/" + songName + "/" + songName + "-" + difficulty + ".json";
+	SongData Song::parseSongFromPath(const std::string &path, const std::string &difficulty) {
+		if (FileExists((path + "-metadata.json").c_str())) {
+			return parseVSlice(path, difficulty);
+		}
+		if (FileExists((path + ".json").c_str())) {
+			return parseLegacy(path+".json");
+		}
+		return parseLegacy(path);
+	}
+	SongData Song::parseLegacy(const std::string &path) {
 		auto chart = std::ifstream(path);
 		auto parsedChart = json::parse(chart);
 		chart.close();
 
 
 		std::vector<NoteData> playerNotes = {};
 		std::vector<NoteData> opponentNotes = {};
-
 		std::vector<EventData> events = {};
 
 		nlohmann::json_abi_v3_12_0::json song;
@@ -97,8 +106,8 @@ namespace funkin::data {
 		}
 
 		// load events from json
-		if (FileExists(("assets/songs/" + songName + "/events.json").c_str())) {
-			auto eventStream = std::ifstream("assets/songs/" + songName + "/events.json");
+		if (FileExists((path + "/events.json").c_str())) {
+			auto eventStream = std::ifstream(path + "/events.json");
 			auto parsedEvents = json::parse(eventStream);
 			eventStream.close();
 
@@ -151,9 +160,7 @@ namespace funkin::data {
 				.spectator = spectator};
 	}
 
-	SongData Song::parseVSlice(const std::string &songName, const std::string &difficulty) {
-		const std::string path = "assets/songs/" + songName + "/" + songName;
-
+	SongData Song::parseVSlice(const std::string &path, const std::string &difficulty) {
 		auto chart = std::ifstream(path + "-chart.json");
 		auto meta = std::ifstream(path + "-metadata.json");
 
@@ -171,7 +178,7 @@ namespace funkin::data {
 		for (auto note: parsedChart["notes"][difficulty]) {
 			bool player = note["d"] < 4;
 
-			auto noteData = NoteData{.player = player,
+			NoteData noteData = NoteData{.player = player,
 									 .lane = static_cast<uint8_t>(static_cast<short>(note["d"]) % 4),
 									 .time = note["t"],
 									 .length = note.contains("l") ? static_cast<float>(note["l"]) : 0.0f};

src/funkin/data/Song.hpp

@@ -29,13 +29,15 @@ namespace funkin::data {
 		std::string player;
 		std::string opponent;
 		std::string spectator;
+		std::string path;
 	} SongData;
 
 
 	class Song {
 	public:
 		static SongData parseSong(const std::string &songName, const std::string &difficulty);
+		static SongData parseSongFromPath(const std::string &path, const std::string &difficulty);
 		static SongData parseVSlice(const std::string &songName, const std::string &difficulty);
-		static SongData parseLegacy(const std::string &songName, const std::string &difficulty);
+		static SongData parseLegacy(const std::string &path);
 	};
 } // namespace funkin::data

src/funkin/modding/LuaScript.cpp

@@ -274,6 +274,7 @@ namespace funkin::modding {
 		lua_Character.set("type", &objects::Character::type);
 		lua_Character.set("barColor", &objects::Character::barColor);
 		lua_Character.set("cameraOffset", &objects::Character::cameraOffset);
+		lua_Character.set("characterName", &objects::Character::characterName);
 
 		auto lua_Stage = state.new_usertype<objects::Stage>("Stage");
 		lua_Stage.set("stageName", &objects::Stage::stageName);

src/funkin/objects/Character.cpp

@@ -6,8 +6,12 @@ namespace funkin::objects {
 	Character::Character(const float x, const float y, const std::string &characterName, const CharacterType type) : Sprite(x, y) {
 		this->characterName = characterName;
 		this->type = type;
-
-		const std::string basePath = "assets/characters/" + characterName;
+		std::string basePath = "assets/characters/" + characterName;
+		if(!FileExists(basePath.c_str())){
+			TraceLog(5,("Unable to load character '"+this->characterName+"'. Fallbacking to bf").c_str());
+			this->characterName="bf";
+			basePath = "assets/characters/bf";
+		}
 
 		loadTexture(basePath + "/spritesheet.png");
 		if (FileExists((basePath + "/spritesheet.txt").c_str())) {
@@ -17,7 +21,8 @@ namespace funkin::objects {
 		}
 
 		if (type == CharacterType::BOYFRIEND) {
-		barColor = LIME;
+			barColor = LIME;
+			flipX = true;
 		}
 
 		script = std::make_shared<modding::LuaScript>(basePath + "/character.lua");
@@ -28,21 +33,13 @@ namespace funkin::objects {
 
 	bool Character::canDance(const float stepCrochet) const {
 		const auto animationName = getCurrentAnimation()->name;
-		return (holdTimer > stepCrochet * 0.0011f * singDuration && animationName.starts_with("sing") && !animationName.ends_with("miss") ||
-				holdTimer == 0.0f);
+		return (holdTimer == 0.0f || 
+				holdTimer > singDuration && animationName.starts_with("sing") && !animationName.ends_with("miss"));
 	}
 
 	void Character::dance(const bool force) {
-		if (dancesLeftAndRight) {
-			if (danced) {
-				animation.play("danceRight", force);
-			} else {
-				animation.play("danceLeft", force);
-			}
-			danced = !danced;
-		} else {
-			animation.play("idle", force);
-		}
+		animation.play(dancesLeftAndRight ? ((danced=!danced) ? "danceLeft" : "danceRight") : "idle", force);
+
 		holdTimer = 0.0f;
 	}
 

src/funkin/objects/Character.hpp

@@ -18,7 +18,7 @@ namespace funkin::objects {
 		bool dancesLeftAndRight = false;
 		std::uint8_t danceEvery = 2;
 		float holdTimer = 0.0f;
-		float singDuration = 4.0f;
+		float singDuration = 1.0f;
 		CharacterType type = CharacterType::DAD;
 		Color barColor = RED;
 		Vector2 cameraOffset = Vector2Zero();

src/funkin/objects/Stage.cpp

@@ -1,12 +1,20 @@
 #include "Stage.hpp"
 
+#include <fstream>
+#include <iostream>
+
 #include "funkin/modding/LuaScript.hpp"
 
 namespace funkin::objects {
 	Stage::Stage(const std::string &stageName, const std::shared_ptr<Character> &boyfriend, const std::shared_ptr<Character> &dad,
 				 const std::shared_ptr<Character> &girlfriend) {
+
 		this->stageName = stageName;
-		script = std::make_shared<modding::LuaScript>("assets/stages/" + stageName + "/stage.lua");
+		if(!FileExists(("assets/stages/" + stageName + "/stage.lua").c_str())){
+			TraceLog(5,("Unable to load stage '"+stageName+"'. Fallbacking to mainStage").c_str());
+			this->stageName="mainStage";
+		}
+		script = std::make_shared<modding::LuaScript>("assets/stages/" + this->stageName + "/stage.lua");
 		script->set("boyfriend", boyfriend);
 		script->set("dad", dad);
 		script->set("girlfriend", girlfriend);