Quick Fixes

Author: ryantpayton

Audio/Audio.cpp

@@ -198,7 +198,7 @@ namespace ms
 		if (path == bgmpath)
 			return;
 
-		nl::audio ad = nl::nx::Sound.resolve(path);
+		nl::audio ad = nl::nx::Sound002.resolve(path);
 		auto data = reinterpret_cast<const void*>(ad.data());
 
 		if (data)
@@ -224,7 +224,7 @@ namespace ms
 		if (path == bgmpath)
 			return;
 
-		nl::audio ad = nl::nx::Sound.resolve(path);
+		nl::audio ad = nl::nx::Sound002.resolve(path);
 		auto data = reinterpret_cast<const void*>(ad.data());
 
 		if (data)

Gameplay/MapleMap/MapBackgrounds.cpp

@@ -32,7 +32,7 @@ namespace ms
 		WOFFSET = VWIDTH / 2;
 		HOFFSET = VHEIGHT / 2;
 
-		nl::node backsrc = nl::nx::Map["Back"];
+		nl::node backsrc = nl::nx::Map001["Back"];
 
 		animated = src["ani"].get_bool();
 		animation = backsrc[src["bS"] + ".img"][animated ? "ani" : "back"][src["no"]];

Gameplay/MapleMap/MapEffect.cpp

@@ -27,7 +27,7 @@ namespace ms
 {
 	MapEffect::MapEffect(std::string path) : active(false)
 	{
-		nl::node Effect = nl::nx::Map["Effect.img"];
+		nl::node Effect = nl::nx::Map002["Effect.img"];
 
 		effect = Effect.resolve(path);
 

Gameplay/MapleMap/Npc.cpp

@@ -17,6 +17,8 @@
 //////////////////////////////////////////////////////////////////////////////////
 #include "Npc.h"
 
+#include <codecvt>
+
 #ifdef USE_NX
 #include <nlnx/nx.hpp>
 #endif
@@ -63,6 +65,21 @@ namespace ms
 		name = strsrc["name"];
 		func = strsrc["func"];
 
+		std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+		std::wstring wide = converter.from_bytes(func);
+
+		for (size_t i = 0; i < wide.size(); i++)
+		{
+			wchar_t c = wide[i];
+
+			// Korean
+			if (c >= 0x1100 && c <= 0x11FF)
+			{
+				func = "";
+				break;
+			}
+		}
+
 		namelabel = Text(Text::Font::A13B, Text::Alignment::CENTER, Color::Name::YELLOW, Text::Background::NAMETAG, name);
 		funclabel = Text(Text::Font::A13B, Text::Alignment::CENTER, Color::Name::YELLOW, Text::Background::NAMETAG, func);
 

Gameplay/Physics/Physics.cpp

@@ -21,7 +21,7 @@ namespace ms
 {
 	const double GRAVFORCE = 0.14;
 	const double SWIMGRAVFORCE = 0.03;
-	const double FRICTION = 0.3;
+	const double FRICTION = 0.5;
 	const double SLOPEFACTOR = 0.1;
 	const double GROUNDSLIP = 3.0;
 	const double FLYFRICTION = 0.05;

Gameplay/Stage.cpp

@@ -87,7 +87,7 @@ namespace ms
 		std::string strid = string_format::extend_id(mapid, 9);
 		std::string prefix = std::to_string(mapid / 100000000);
 
-		nl::node src = mapid == -1 ? nl::nx::UI["CashShopPreview.img"] : nl::nx::Map["Map"]["Map" + prefix][strid + ".img"];
+		nl::node src = mapid == -1 ? nl::nx::UI["CashShopPreview.img"] : nl::nx::Map002["Map"]["Map" + prefix][strid + ".img"];
 
 		tilesobjs = MapTilesObjs(src);
 		backgrounds = MapBackgrounds(src["back"]);