Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean

Aquaria/Continuity.cpp

@@ -1209,11 +1209,11 @@ void Continuity::loadSongBank()
 	songSlotNames.clear();
 	songBank.clear();
 
-	loadIntoSongBank(dsq->user.localisePath("data/songs.xml"));
+	loadIntoSongBank(localisePath("data/songs.xml"));
 
 	if (dsq->mod.isActive())
 	{
-		loadIntoSongBank(dsq->user.localisePath(dsq->mod.getPath() + "scripts/songs.xml", dsq->mod.getPath()));
+		loadIntoSongBank(localisePath(dsq->mod.getPath() + "scripts/songs.xml", dsq->mod.getPath()));
 	}
 }
 
@@ -2543,6 +2543,7 @@ void Continuity::loadFile(int slot)
 {
 	dsq->user.save();
 	this->reset();
+	knowsSong.clear(); // Adds shield song by default, which interferes with mods that don't start with it
 
 	TiXmlDocument doc;
 	loadFileData(slot, doc);
@@ -2906,7 +2907,9 @@ void Continuity::loadFile(int slot)
 		//dsq->game->transitionToScene();
 	}
 
+	// Possibly mod-specific data the the continuity reset didn't catch
 	loadSongBank();
+	this->worldMap.load();
 }
 
 void Continuity::setNaijaModel(std::string model)
@@ -3244,12 +3247,12 @@ void Continuity::reset()
 
 	loadIngredientDisplayNames("data/ingredientnames.txt");
 
-	std::string fname = dsq->user.localisePath("data/ingredientnames.txt");
+	std::string fname = localisePath("data/ingredientnames.txt");
 	loadIngredientDisplayNames(fname);
 
 	if(dsq->mod.isActive())
 	{
-		fname = dsq->user.localisePath(dsq->mod.getPath() + "ingredientnames.txt", dsq->mod.getPath());
+		fname = localisePath(dsq->mod.getPath() + "ingredientnames.txt", dsq->mod.getPath());
 		loadIngredientDisplayNames(fname);
 	}
 
@@ -3260,13 +3263,13 @@ void Continuity::reset()
 	if(dsq->mod.isActive())
 	{
 		//load mod ingredients
-		fname = dsq->user.localisePath(dsq->mod.getPath() + "ingredients.txt", dsq->mod.getPath());
+		fname = localisePath(dsq->mod.getPath() + "ingredients.txt", dsq->mod.getPath());
 		loadIngredientData(fname);
 	}
 
 	//load ingredients for the main game
 	if(ingredientData.empty() && recipes.empty()) {
-		fname = dsq->user.localisePath("data/ingredients.txt");
+		fname = localisePath("data/ingredients.txt");
 		loadIngredientData(fname);
 	}
 

Aquaria/DSQ.cpp

@@ -485,7 +485,7 @@ void DSQ::loadFonts()
 
 	destroyFonts();
 
-	std::string file = user.localisePath("data/font-small.glf");
+	std::string file = localisePath("data/font-small.glf");
 
 	font.load(file, 1, false);
 	font.fontTopColor = Vector(0.9,0.9,1);
@@ -513,7 +513,7 @@ void DSQ::loadFonts()
 	goldFont.overrideTexture = core->addTexture("font");
 
 
-	file = user.localisePath("data/font.ttf");
+	file = localisePath("data/font.ttf");
 
 	debugLog("ttf...");
 	arialFontData = (unsigned char *)readFile(file, &arialFontDataSize);
@@ -2167,9 +2167,7 @@ void DSQ::applyPatches()
 		vfs.MountExternalPath(mod.getBaseModPath().c_str(), "_mods");
 	}
 
-	// user wants mods, but not yet loaded
+	loadMods();
-	if(activePatches.size() && modEntries.empty())
-		loadMods();
 
 	for (std::set<std::string>::iterator it = activePatches.begin(); it != activePatches.end(); ++it)
 		for(int i = 0; i < modEntries.size(); ++i)

Aquaria/Game.cpp

@@ -7919,29 +7919,29 @@ void Game::toggleHelpScreen(bool on, const std::string &label)
 
 // These say "Mac" but we use them on Linux, too.
 #if defined(BBGE_BUILD_UNIX)
-		std::string fname = dsq->user.localisePath("data/help_header_mac.txt");
+		std::string fname = localisePath("data/help_header_mac.txt");
 		appendFileToString(data, fname);
 #else
-		std::string fname = dsq->user.localisePath("data/help_header.txt");
+		std::string fname = localisePath("data/help_header.txt");
 		appendFileToString(data, fname);
 #endif
 		if (dsq->continuity.hasSong(SONG_BIND)) {
-			fname = dsq->user.localisePath("data/help_bindsong.txt");
+			fname = localisePath("data/help_bindsong.txt");
 			appendFileToString(data, fname);
 		}
 		if (dsq->continuity.hasSong(SONG_ENERGYFORM)) {
-			fname = dsq->user.localisePath("data/help_energyform.txt");
+			fname = localisePath("data/help_energyform.txt");
 			appendFileToString(data, fname);
 		}
-		fname = dsq->user.localisePath("data/help_start.txt");
+		fname = localisePath("data/help_start.txt");
 		appendFileToString(data, fname);
 		
 // These say "Mac" but we use them on Linux, too.
 #if defined(BBGE_BUILD_UNIX)
-		fname = dsq->user.localisePath("data/help_end_mac.txt");
+		fname = localisePath("data/help_end_mac.txt");
 		appendFileToString(data, fname);
 #else
-		fname = dsq->user.localisePath("data/help_end.txt");
+		fname = localisePath("data/help_end.txt");
 		appendFileToString(data, fname);
 #endif
 

Aquaria/ScriptInterface.cpp

@@ -988,6 +988,14 @@ luaFunc(obj_setTexture)
 	luaReturnNil();
 }
 
+luaFunc(obj_getTexture)
+{
+    RenderObject *r = robj(L);
+    if (r && r->texture)
+        luaReturnStr(r->texture->name.c_str());
+    luaReturnStr("");
+}
+
 luaFunc(obj_delete)
 {
 	RenderObject *r = robj(L);
@@ -1490,6 +1498,7 @@ luaFunc(quad_setHeight)
 	RO_FUNC(getter, prefix,  internalOffset	) \
 	RO_FUNC(getter, prefix,  getInternalOffset) \
 	RO_FUNC(getter, prefix,  getPosition	) \
+	RO_FUNC(getter, prefix,  getTexture		) \
 	RO_FUNC(getter, prefix,  x				) \
 	RO_FUNC(getter, prefix,  y				) \
 	RO_FUNC(getter, prefix,  setBlendType	) \

Aquaria/StatsAndAchievements.cpp

@@ -174,7 +174,7 @@ void StatsAndAchievements::RunFrame()
 		VFILE *io = NULL;
 
 		// Get generic achievement data...
-		std::string fname = dsq->user.localisePath("data/achievements.txt");
+		std::string fname = localisePath("data/achievements.txt");
 		io = vfopen(fname.c_str(), "r");
 		char line[1024];
 		for (size_t i = 0; i < max_achievements; i++)

Aquaria/StringBank.cpp

@@ -34,11 +34,11 @@ void StringBank::load()
 		_load(dsq->mod.getPath() + "stringbank.txt");
 
 	// Then, load localized ones. If some entries in these are missing, the default for each is taken.
-	std::string fname = dsq->user.localisePath("data/stringbank.txt");
+	std::string fname = localisePath("data/stringbank.txt");
 	_load(fname);
 
 	if (dsq->mod.isActive()) {
-		fname = dsq->user.localisePath(dsq->mod.getPath() + "stringbank.txt", dsq->mod.getPath());
+		fname = localisePath(dsq->mod.getPath() + "stringbank.txt", dsq->mod.getPath());
 		_load(fname);
 	}
 }

Aquaria/SubtitlePlayer.cpp

@@ -46,7 +46,7 @@ void SubtitlePlayer::go(const std::string &subs)
 	if (dsq->mod.isActive())
 	{
 		f = dsq->mod.getPath() + "audio/" + subs + ".txt";
-		f = dsq->user.localisePath(f, dsq->mod.getPath());
+		f = localisePath(f, dsq->mod.getPath());
 		f = core->adjustFilenameCase(f);
 		if (exists(f))
 			checkAfter = false;
@@ -55,7 +55,7 @@ void SubtitlePlayer::go(const std::string &subs)
 	if (checkAfter)
 	{
 		f = "scripts/vox/" + subs + ".txt";
-		f = dsq->user.localisePath(f);
+		f = localisePath(f);
 		f = core->adjustFilenameCase(f);
 		if (!exists(f))
 		{

Aquaria/UserSettings.cpp

@@ -28,31 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#include "../ExternalLibs/tinyxml.h"
 #endif
 
-#ifdef BBGE_BUILD_WINDOWS
-	#define WIN32_LEAN_AND_MEAN
-	#include <windows.h>
-#endif
-
-#ifdef BBGE_BUILD_UNIX
-	#include <sys/types.h>
-	#include <sys/stat.h>
-	#include <unistd.h>
-#endif
-
-#ifdef BBGE_BUILD_MACOSX
-	#include <Carbon/Carbon.h>
-	#include <CoreFoundation/CFLocale.h>
-	#include <CoreFoundation/CFString.h>
-
-// veeery clunky.
-static std::string _CFToStdString(CFStringRef cs)
-{
-	char buf[1024];
-	CFStringGetCString(cs, &buf[0], 2048, kCFStringEncodingUTF8);
-	return &buf[0];
-}
-
-#endif
 
 void UserSettings::save()
 {
@@ -74,13 +49,11 @@ void UserSettings::save()
 			}
 			xml_system.InsertEndChild(xml_debugLog);
 
-			if (!system.isSystemLocale) {
+			TiXmlElement xml_locale("Locale");
-				TiXmlElement xml_locale("Locale");
+			{
-				{
+				xml_locale.SetAttribute("name", system.locale);
-					xml_locale.SetAttribute("name", system.locale);
-				}
-				xml_system.InsertEndChild(xml_locale);
 			}
+			xml_system.InsertEndChild(xml_locale);
 		}
 		doc.InsertEndChild(xml_system);
 
@@ -560,11 +533,6 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
 			network.masterServer = serv;
 	}
 
-	if (system.locale.empty())
-		getSystemLocale();
-	else
-		debugLog("use user config locale: " + system.locale);
-
 	//clearInputCodeMap();
 
 	if (doApply)
@@ -606,93 +574,18 @@ void UserSettings::apply()
 
 	core->settings.prebufferSounds = audio.prebuffer;
 
-#endif
-}
-
-std::string UserSettings::localisePath(const std::string &path, const std::string &modpath)
-{
 	if (system.locale.empty())
-		return path;
-
-	const std::string fname = path.substr(modpath.length());
-
-	/* we first try with complete locale name, i.e "locales/en_US/" */
-	std::string localisedPath = modpath + "locales/" + system.locale + "/" + fname;
-
-	if (exists(localisedPath.c_str()))
-		return localisedPath;
-
-	/* ok didn't work, let's retry with only language part of locale name, i.e "locales/en/" */
-	const size_t found = system.locale.find('_');
-
-	/* hmm, seems like we didn't have a full locale name anyway, use original path */
-	if (found == string::npos)
-		return path;
-
-	localisedPath = modpath + "locales/" + system.locale.substr(0,found) + "/" + fname;
-
-	/* hooray we found a file! */
-	if (exists(localisedPath.c_str()))
-		return localisedPath;
-
-	/* seems like we don't have a localized version of the file available, use original path */
-	return path;
-}
-
-void UserSettings::getSystemLocale()
-{
-	system.isSystemLocale = true;
-
-#ifdef BBGE_BUILD_WINDOWS
-	LCID lcid = GetThreadLocale();
-
-	char buf[100];
-	char ctry[100];
-
-	if (GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, buf, sizeof buf) != 0)
 	{
-		system.locale = buf;
+		std::string loc = getSystemLocale();
-
+		debugLog("Using autodetected system locale: " + loc);
-		if (GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, ctry, sizeof ctry) != 0)
+		setUsedLocale(loc);
-		{
-			system.locale += "_";
-			system.locale += ctry;
-		}
 	}
-#elif BBGE_BUILD_MACOSX
-	CFLocaleRef locale = CFLocaleCopyCurrent();
-	CFStringRef buf;
-
-	if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleLanguageCode)) != NULL)
-	{
-		system.locale = _CFToStdString(buf);
-		CFRelease(buf);
-
-		if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleCountryCode)) != NULL)
-		{
-			system.locale += "_";
-			system.locale += _CFToStdString(buf);
-			CFRelease(buf);
-		}
-	}
-
-	CFRelease(locale);
-
-#else
-	const char *lang = (const char *)getenv("LANG");
-
-	if (lang && *lang)
-	{
-		system.locale = lang;
-
-		size_t found = system.locale.find('.');
-
-		if (found != string::npos)
-			system.locale.resize(found);
-	}
-#endif
-	if (system.locale.empty())
-		debugLog("could not establish system locale");
 	else
-		debugLog("use system locale: " + system.locale);
+	{
+		debugLog("Using user config locale: " + system.locale);
+		setUsedLocale(system.locale);
+	}
+
+#endif
 }
+

Aquaria/UserSettings.h

@@ -77,9 +77,8 @@ class UserSettings
 public:
 	struct System
 	{
-		System() { debugLogOn = 0; isSystemLocale = false; }
+		System() { debugLogOn = 0; }
 		int debugLogOn;
-		bool isSystemLocale;
 		std::string locale;
 	} system;
 
@@ -182,8 +181,4 @@ public:
 	void load(bool doApply=true, const std::string &overrideFile="");
 	void save();
 	void apply();
-	std::string localisePath(const std::string &path, const std::string &modpath="");
-
-private:
-	void getSystemLocale();
 };

BBGE/Core.h

@@ -39,6 +39,7 @@ BUILD_LINUX
 #include "Flags.h"
 //#include "Scripting.h"
 #include "Effects.h"
+#include "Localization.h"
 
 #include "DarkLayer.h"
 

BBGE/Localization.cpp

@@ -0,0 +1,120 @@
+#include "Localization.h"
+
+#ifdef BBGE_BUILD_WINDOWS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+#ifdef BBGE_BUILD_UNIX
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+#ifdef BBGE_BUILD_MACOSX
+#include <Carbon/Carbon.h>
+#include <CoreFoundation/CFLocale.h>
+#include <CoreFoundation/CFString.h>
+
+// veeery clunky.
+static std::string _CFToStdString(CFStringRef cs)
+{
+	char buf[1024];
+	CFStringGetCString(cs, &buf[0], 1024, kCFStringEncodingUTF8);
+	return &buf[0];
+}
+#endif
+
+static std::string s_locale;
+
+void setUsedLocale(const std::string& s)
+{
+	s_locale = s;
+}
+
+std::string localisePath(const std::string &path, const std::string &modpath /* = "" */)
+{
+	if (s_locale.empty())
+		return path;
+
+	const std::string fname = path.substr(modpath.length());
+
+	/* we first try with complete locale name, i.e "locales/en_US/" */
+	std::string localisedPath = modpath + "locales/" + s_locale + "/" + fname;
+
+	if (exists(localisedPath.c_str()))
+		return localisedPath;
+
+	/* ok didn't work, let's retry with only language part of locale name, i.e "locales/en/" */
+	const size_t found = s_locale.find('_');
+
+	/* hmm, seems like we didn't have a full locale name anyway, use original path */
+	if (found == std::string::npos)
+		return path;
+
+	localisedPath = modpath + "locales/" + s_locale.substr(0,found) + "/" + fname;
+
+	/* hooray we found a file! */
+	if (exists(localisedPath.c_str()))
+		return localisedPath;
+
+	/* seems like we don't have a localized version of the file available, use original path */
+	return path;
+}
+
+std::string getSystemLocale()
+{
+	std::string localeStr;
+
+#ifdef BBGE_BUILD_WINDOWS
+	LCID lcid = GetThreadLocale();
+
+	char buf[100];
+	char ctry[100];
+
+	if (GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, buf, sizeof buf) != 0)
+	{
+		localeStr = buf;
+
+		if (GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, ctry, sizeof ctry) != 0)
+		{
+			localeStr += "_";
+			localeStr += ctry;
+		}
+	}
+#elif BBGE_BUILD_MACOSX
+	CFLocaleRef locale = CFLocaleCopyCurrent();
+	CFStringRef buf;
+
+	if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleLanguageCode)) != NULL)
+	{
+		localeStr = _CFToStdString(buf);
+		CFRelease(buf);
+
+		if ((buf = (CFStringRef)CFLocaleGetValue(locale, kCFLocaleCountryCode)) != NULL)
+		{
+			localeStr += "_";
+			localeStr += _CFToStdString(buf);
+			CFRelease(buf);
+		}
+	}
+
+	CFRelease(locale);
+
+#else
+	const char *lang = (const char *)getenv("LANG");
+
+	if (lang && *lang)
+	{
+		localeStr = lang;
+
+		size_t found = localeStr.find('.');
+
+		if (found != string::npos)
+			localeStr.resize(found);
+	}
+#endif
+
+	return localeStr;
+}
+

BBGE/Localization.h

@@ -0,0 +1,10 @@
+#ifndef LOCALIZATION_H
+#define LOCALIZATION_H
+
+#include "Base.h"
+
+void setUsedLocale(const std::string& s);
+std::string localisePath(const std::string &path, const std::string &modpath = "");
+std::string getSystemLocale();
+
+#endif

BBGE/SoundManager.cpp

@@ -18,8 +18,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#include "SoundManager.h"
+
 #include "Core.h"
+#include "SoundManager.h"
 #include "Base.h"
 #include "PackRead.h"
 

BBGE/Texture.cpp

@@ -281,9 +281,6 @@ void Texture::load(std::string file)
 		return;
 	}
 
-	stringToLowerUserData(file);
-	file = core->adjustFilenameCase(file);
-
 	loadName = file;
 	repeating = false;
 
@@ -298,26 +295,28 @@ void Texture::load(std::string file)
 			pos = std::string::npos;
 	}
 
-	if (core->debugLogTextures)
+	/*if (core->debugLogTextures)
 	{
 		std::ostringstream os;
 		os << "pos [" << pos << "], file :" << file;
 		debugLog(os.str());
+	}*/
+
+	bool found = exists(file);
+
+	if(!found && exists(file + ".png"))
+	{
+		found = true;
+		file += ".png";
 	}
 
-    bool found = exists(file);
+	// .tga/.zga are never used as game graphics anywhere except save slot thumbnails.
-
+	// if so, their file names are passed exact, not with a missing extension
-    if(!found && exists(file + ".png"))
-    {
-        found = true;
-        file += ".png";
-    }
-
-    // .tga/.zga are never used as game graphics anywhere except save slot thumbnails.
-    // if so, their file names are passed exact, not with a missing extension
 
 	if (found)
 	{
+		file = localisePath(file);
+
 		/*
 		std::ostringstream os;
 		os << "Loading texture [" << file << "]";

CMakeLists.txt

@@ -386,6 +386,7 @@ SET(BBGE_SRCS
     ${BBGEDIR}/Interpolator.cpp
     ${BBGEDIR}/Joystick.cpp
     ${BBGEDIR}/LensFlare.cpp
+    ${BBGEDIR}/Localization.cpp
     ${BBGEDIR}/Math.cpp
     ${BBGEDIR}/MT.cpp
     ${BBGEDIR}/ParticleEffect.cpp

ExternalLibs/glfont2/glfont2.cpp

@@ -47,7 +47,7 @@ GLFont::~GLFont ()
 //*******************************************************************
 bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
 {
-	int num_chars, num_tex_bytes;
+	ByteBuffer::uint32 num_chars, num_tex_bytes;
 	char *tex_bytes;
 
 	//Destroy the old font if there was one, just to be safe
@@ -89,7 +89,7 @@ bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
 		return false;
 
 	//Read character array
-	for (int i = 0; i < num_chars; i++)
+	for (unsigned int i = 0; i < num_chars; i++)
 	{
 		bb >> header.chars[i].dx;
 		bb >> header.chars[i].dy;
@@ -102,8 +102,8 @@ bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
 	//Read texture pixel data
 	num_tex_bytes = header.tex_width * header.tex_height * 2;
 	tex_bytes = new char[num_tex_bytes];
-	//input.read(tex_bytes, num_tex_bytes);
+	// HACK: Aquaria uses override textures, so we can live with the truncation.
-	bb.read(tex_bytes, num_tex_bytes);
+	bb.read(tex_bytes, std::min(num_tex_bytes, bb.readable()));
 
 	//Build2DMipmaps(3, header.tex_width, header.tex_height, GL_UNSIGNED_BYTE, tex_bytes, 1);
 

files/locales/ru/data/stringbank.txt

@@ -174,4 +174,34 @@
 1029 Пещера Ли
 1030 Пещера короля медуз
 2000 Сохранить игру
-2001 Загрузить игру
+2001 Çàãðóçèòü èãðó
+2002 Ñëîò
+2003 Ïóñòî
+2004 ~Ïàóçà~
+2005 'S' - ïðîïóñòèòü
+2006 Ñòð.
+2007 Ðåöåïòû
+2008 error
+2009 No Description
+2010 Stopped Recording
+2011 Stopped Playback
+2013 health
+2014 Enter Flag to Set
+2015 Enter Value to Set Flag To
+2016 Entity data not found! Aborting...
+2017 Variables data not found! Aborting...
+2018 Particle Name:
+2019 Saved worldmap data to
+2020 Unable to save worldmap to
+2021 Unable to retrieve online mod list.|Check your connection and try again.
+2022 Server error!|Bad XML, please contact server admin.|URL:
+2023 Finished downloading mod
+2024 Download update?
+2025 Mod already exists. Re-download?
+2026 This mod was installed manually,|not messing with it.
+2027 |Browse installed mods
+2028 |Browse & enable/disable installed patches
+2029 |Browse mods online
+2030 |Return to title
+2031 ×òî
+2032 [Achievements]

game_scripts/scripts/entities/entities.txt

@@ -0,0 +1,431 @@
+0 Crotoid Crotoid 1
+86 Seal-King Seal-King
+87 Seal-Queen Seal-Queen
+88 Seal-Prince Seal-Prince
+90 HealthUpgrade0 HealthUpgrade/Whole
+91 HealthUpgrade1 HealthUpgrade/Whole
+92 HealthUpgrade2 HealthUpgrade/Whole
+93 HealthUpgrade3 HealthUpgrade/Whole
+94 HealthUpgrade4 HealthUpgrade/Whole
+110 SporeChildFlowerRed SporeChildFlower/Red1
+120 Ekkrit Ekkrit/Head
+121 Flea Flea
+122 GreenSeaDragon GreenSeaDragon/Head
+123 Blazer Blazer
+124 Seahorse SeaHorse/Seahorse-0001
+125 Moloch moloch
+126 Loper Loper
+127 Splitter1 Splitter1/Core
+128 Splitter2 Splitter2/Core
+129 Rotfish-blob Rotfish-blob
+130 Rotfish Rotfish
+131 Rotworm Rotworm/Head
+132 Gear Gear/Gear
+133 CrystalHolder LightCrystal/Holder
+134 LightCrystal LightCrystal/Crystal
+135 Shark Shark/Body
+136 Monkey Monkey/Head
+137 Simon Simon/Body
+138 TransTurtle TransTurtle/Head
+139 FormUpgradeEnergy1 EnergyOrb
+140 FormUpgradeEnergy2 FormUpgrades/EnergyIdol
+141 FormUpgradeBeast EnergyOrb
+142 EvilJelly EvilJelly
+143 KingJelly KingJelly/Core
+144 SunkenDad SunkenDad/Head
+145 SunkenMom SunkenMom/Head
+146 DeepUrchin DeepUrchin/Body
+147 AnglerFish AnglerFish/Body
+148 Plasmaworm Plasmaworm/Body
+149 PredatoryTunicate PredatoryTunicate/Body
+150 Octomun Octomun/Body
+151 ClockworkFish ClockworkFish/Head
+152 ClockworkCrab ClockworkCrab/Shell
+153 CrawPappy CrawPappy/Body
+156 LightCrystalCharged LightCrystal/Crystal
+157 SpikeyEggDown SpikeyEgg
+158 Scavenger Scavenger/Head
+159 CC_LostInCave CC/Body
+160 CC_Mother CC_Mother/Body
+161 CC_MissingMom CC/Body
+162 CC_GF CC_GF/Body
+163 SporeSeed Seed
+164 Vine Vine
+165 CC_WantGF CC/Body
+166 CC_Cat CC_Cat/Body
+167 CC_Kid CC_Kid/Body
+168 CC_GetRocked CC/Body
+169 13_MainArea 13/Face
+170 SpiderCrab SpiderCrab/Body
+171 SpikyBall SpikyBall/Body
+172 CC_StatueHead MissingImage
+173 MossHead MossHead/Head
+174 NatureFormFlowers Naija/Flowers
+175 NudiBranch0 NudiBranch/NudiBranch0
+176 NudiBranch1 NudiBranch/NudiBranch1
+177 NudiBranch2 NudiBranch/NudiBranch2
+178 NudiBranch3 NudiBranch/NudiBranch3
+180 Dandelion Dandelion/Head
+181 UberVine Naija/Ubervine-Stalk
+182 SporeChildFlowerPortal TubeFlower/Body1
+183 Zygote Zygote/Head
+184 MomEyes SunkenMom/MomEyes
+185 CreatorShadow creator-shadow
+186 CathedralDoor CathedralDoor/Body
+187 SunkenDoor SunkenDoor/Body
+188 LiHelmet Li/Helmet
+189 Parrot Parrot/Head
+190 CaveFish1 CaveFish 
+191 CaveFish2 CaveFish
+192 CaveFish3 CaveFish
+193 CaveFish4 CaveFish
+194 OriginalRaspberry OriginalRaspberry
+195 Skeeter Skeeter/Body
+196 Wisker Wisker/Wisker
+197 RedNautilus RedNautilus
+198 Toad Toad/Head
+199 SpikeyEggUp SpikeyEgg
+201 CC_EndDemo CC/Body
+202 BigMouth BigMouth/Body
+203 BigMouthParasite BigMouth/Parasite
+204 FlatFish FlatFish/Body
+205 MetaRay MetaRay/Body
+206 Clam Clam/Top
+207 Tabar Tabar/Body
+208 HorseShoe HorseShoe/Body
+209 PufferFish PufferFish/PufferSmall
+210 Tabar Tabar/Body
+211 Swordfish Swordfish/Body
+212 SpinyCrab SpinyCrab/Body
+213 DeepEel DeepEel/Tail
+214 AbyssSpikes Abyss-Spikes
+215 Wisp Wisp
+216 Triffle Triffle/Body
+217 BabyDeepShrimp BabyDeepShrimp
+218 ThermalVent thermalvent
+219 SlenderEel SlenderEel
+220 DeepJelly DeepJelly/Bulb
+221 Mermog Mermog/Body
+222 RotBaby-Form1 RotBaby/Form1
+223 RotBaby-Form2 RotBaby/Form2
+224 RotBaby-Form3 RotBaby/Form3-Body
+225 Orbiter Orbiter/Body
+226 Piranha Piranha
+227 UpsideDownJelly UpsideDownJelly/Body
+228 Kappa Kappa/Head
+229 Seahorse2 Seahorse/Seahorse-0002
+230 Seahorse3 Seahorse/Seahorse-0003
+231 Seahorse4 Seahorse/Seahorse-0004
+232 DarkJelly DarkJelly/Front
+233 SnailGear SnailGear/Shell
+234 Seahorse5 Seahorse/Seahorse-0005
+235 CC_SunkenCity CC/Body
+236 AbyssOctopus AbyssOctopus/Head
+237 Mutilus Mutilus/Mutilus
+238 Horror Horror/Body
+239 StressTest missingImage
+240 Abaddon Abaddon/Face
+241 Bevy Bevy/Body
+242 Huggy Huggy/Head
+243 Krill Krill/Krill
+244 KrillEggs Krill/KrillEggs
+245 Starmie1 Starmie/Body
+246 Chomper Chomper/Head
+247 Armapillar Armapillar/Body
+248 Duoeye Duoeye-head
+249 ekko ekko/Body
+250 SeaTurtleBig SeaTurtle/Head
+251 Rukh Rukh/Head
+252 Starmie2 Starmie2/Body
+253 JellyNew Jelly
+254 SeedFlower SeedFlower
+255 SeedUberVine SeedUberVine
+256 GroundShocker GroundShocker/Core
+257 GroundShockerShell GroundShocker/Shell
+258 Spookfish Spookfish/Body
+259 Mutileye Mutileye/Head
+260 GroundShockerAttackL GroundShocker/Shell
+261 GroundShockerAttackR GroundShocker/Shell
+262 SeaTurtleSmall SeaTurtle/Head
+263 JellyZap JellyZap/Head
+264 BiteyMouth BiteyMouth/Teeth
+265 SeaTurtleBaby BabyTurtle/Head
+266 IceChunkLarge IceChunk/Large
+267 IceChunkMedium IceChunk/Medium
+268 IceChunkSmall IceChunk/Small
+269 GrabbyArm GrabbyArm/Front
+270 IceCrab IceCrab/Body
+271 Walker Walker/Head
+272 CreepyFace CreepyFace/Face
+273 cc_father cc_father/body
+274 SeaTurtleBaby-Special1 babyturtle-special/shell
+275 SeaTurtleBaby-Special2 babyturtle-special/shell2
+276 SeaTurtleBaby-Special3 babyturtle-special/shell3
+277 ancient-plant ancient-plant/stem
+278 ancient-bulb ancient-plant/bulb
+75 CurrentSwitchOff CurrentSwitch
+76 CurrentSwitchOn CurrentSwitch
+81 SacrificeButton SacrificeButton-bg
+82 ForestGod ForestGod/bg
+83 SunWorm SunWorm/Head
+84 ForestGodSeed SporeChildSeed
+85 ForestGodCrab KingCrab-Head 1
+77 Altar Altar/Grate-Front
+78 RotCore RotCore/Body
+79 SacrificeVictim EnergyOrb
+70 MermanThin MermanThin/Head
+71 SporeFungus0001 SporeFungus0001
+72 Fan Fan
+73 Priest Priest/Head
+74 Li Li/Head
+80 HellBeast HellBeast/Head
+57 RockHead Fish-RockHead 1
+1 Raspberry wallshooter 0.75
+2 Squiddy squiddy 1.0
+3 Nautilus nautilus 0.7
+4 Moneye moneye-head 0.4
+5 Anemone Anemone 1
+60 Anemone2 Anemone-0002 1
+61 Anemone3 Anemone-0003 1
+62 Anemone4 Anemone-0004 1
+6 Blaster Blaster/Core 1
+7 Leach Leach 1
+8 JellySmall JellySmallShell 1
+9 MoneyeBreeder MoneyeBreeder 1
+10 KingCrab KingCrab-Head 1
+11 SeaSlug missingImage 1
+12 Trillious trillious-head 1
+13 Scooter Scooter 1
+14 Lumite missingImage 1
+15 Empty missingImage 1
+16 RoodShrimp RoodShrimp 1
+17 Shocker Shocker-Body 1
+18 Turret Turret-Body 1
+19 Jelly Jelly 1
+20 NewtBlaster NewtBlasterHead 1
+21 Maul maul 1
+22 SpikeBall spikeball 1
+23 AggroHopper AggroHopper-Head 0.5
+24 Froog Froog-Head 0.5
+25 LesserWurm LesserWurm-Head 1.0
+26 Squeezer Squeezer-Head 1.0
+30 OrbHolder OrbHolder 1
+31 EnergyOrb EnergyOrb 1
+32 EnergyDoor EnergyDoor 1
+33 EnergyBarrierFlicker EnergyBarrier 1
+34 MetalObject MetalObject 1
+35 EnergyBarrierSolid EnergyBarrier 1
+36 Tromulo Tromulo 1
+37 Eel eel-0001 1
+38 EnergyOrbCracked EnergyOrbCracked 1
+39 EnergyBarrierOff EnergyBarrier 1
+40 HydraWurm Wurm-Head 1
+41 Turtle Turtle-Body 1
+42 Nudi Nudi-Shell 1
+43 Shrimp Shrimp 1
+50 Rock0001 rock0001 1
+63 Rock0002 rock0002 1
+64 Rock0003 rock0003 1
+65 Rock0004 rock0004 1
+66 Rock0005 rock0005 1
+67 Rock0006 rock0006 1
+52 SongSpore SongSpore-Shell 1
+53 SongStalk SongStalk-Body 1
+54 Phonograph Phonograph 1
+55 JellyShock JellyShock 1
+56 HealthPlant HealthPlant 1
+102 ErulianGhost ErulianGhost-Body 1
+103 TempleStatue temple-statue-0001 1
+300 TurtleNoShell EnergyOrb 1
+301 NudiNoShell Nudi-Body 1
+302 ClayStatue Clay/Head
+303 Clay Clay/Clay
+304 CreatorForm1SunkenCity Creator/Form1/Head
+305 CC_Final CC/Head
+306 CC_EndOfGame CC/Head
+307 Drask-Final Drask/Head
+308 Krotite-Final Krotite/Head
+309 Erulian-Final Erulian/Head
+310 Druniad-Final Druniad/Head
+311 FinalDoor Final-Door
+312 FinalTongue Final-Tongue
+313 Moray Moray
+314 BigBlaster BigBlaster/Core
+315 DarkJellyFG DarkJelly/Front
+316 GearSlow Gear/Gear
+317 GearMed Gear/Gear
+318 GearFast Gear/Gear
+319 YoungLi YoungLi/Head
+320 NaijaChild NaijaChild/Head
+321 StrangeCreature StrangeCreature/Head
+322 SongLamp3 Particles/Glow
+323 SongLamp4 Particles/Glow
+324 SongLamp5 Particles/Glow
+325 SongLamp6 Particles/Glow
+326 SongLamp7 Particles/Glow
+327 SongLamp0 Particles/Glow
+328 SongLamp1 Particles/Glow
+329 SongLamp2 Particles/Glow
+330 MithalasUrn Breakable/Urn
+331 BrokenPiece Breakable/Urn-0001
+332 NaijaBabyGhost NaijaBabyGhost/naija-baby-ghost
+333 MiaGhost MiaGhost/Head
+334 NaijaChildGhost NaijaChildGhost/Head
+335 Mia Mia/Head
+336 ForestGodVine ForestGod/Vine
+337 ForestGodVineHead ForestGod/Vine-Head
+338 MutantNaija Naija/Mutant-Head
+339 DeepWhale DeepWhale/Eye
+340 LiCage LiCage/Glass-0001
+341 TitleTextLeft Title/TextLeft
+342 TitleTextCenter Title/TextCenter
+343 CursorSwarmer MissingImage
+344 KrotiteWorshipper Krotite/Head
+345 KrotiteErulianBattle01 Krotite/Head
+346 KrotiteOnTheWay Krotite/Head
+347 KrotiteVsKrotite Krotite/Head
+348 Guardian Guardian/Head
+349 ForestSprite ForestSprite/Head
+350 Fatso Test/Kurtz
+351 Druniad Druniad/Head
+352 Drask Drask/Head
+353 PriestNormal PriestNormal/Head
+354 DraskPriestBattle PriestNormal/Head
+355 PullPlantNormal Ingredients/plant-leaf
+356 Ompo Ompo/Body
+357 Architect Lumerean/Head
+358 cf6-shot missingimage
+359 SunDoor sun-door-0001
+360 EnergyGodSpirit particles/lines
+361 Minnow title/minnow
+362 camopus camopus/head
+363 singbulb singbulb/base-0001
+364 seawolf seawolf/head
+365 grouper grouper/body
+366 poisonberry wallshooter
+367 bloodcell-red cell/red-cell
+368 bloodcell-white cell/white-cell
+369 crawlvirus crawlvirus/body
+370 roundvirus roundvirus/body
+371 floating-city intro/floating-city
+372 eric_13 missingImage
+373 eric_energyboss missingImage
+374 eric_mithala missingImage
+375 eric_sunkenmom missingImage
+376 eric_mutantnaija missingImage
+377 eric_forestgod missingImage
+378 eric_erulian missingImage
+379 lucien lucien/lucien-head
+380 airship airship/airship-body
+381 lucien-baby lucien-baby/head
+382 gateway gateway/body
+383 final-mutant final-mutant-0001
+384 dark-li-shot creator/darklishot/darkli-ball
+385 suncontainer breakable/suncontainer
+386 falsebg falsebg/bg
+387 upgrade-wok gui/wok
+388 beluga beluga/body
+389 beluga-bubble bubble
+390 merchild merchild/head
+391 merwoman merwoman/head
+392 merman merman/head
+393 luciengf luciengf/head
+394 otter otter/body
+395 fishcaveglow particles/spiralglow
+396 timerock missingImage
+397 arnassi-spirit missingImage
+200 SongDoor1 SongDoor-Body 1
+403 CrabBoss CrabBoss-body 1
+404 EnergyBoss EnergyBoss/Body 1
+405 EnergyGod EnergyGod-Torso 1
+406 EnergyBossClimb EnergyBoss-Torso 1
+407 NautilusPrime NautilusPrime-Body 1
+408 Mergog Mergog/Mergog 1
+409 CreatorForm1 Creator/Form1/Mask
+410 CreatorForm2 Creator/Form1/Head
+411 CreatorForm3 Creator/Form3/Head
+412 CreatorForm4 Creator/Form4/Body
+413 CreatorForm5 Creator/Form5/Head-Down
+414 CreatorForm6 Creator/Form6/Head
+415 VineDoor VineDoor
+500 CollectibleSongCave Collectibles/SongCave 1
+501 CollectibleNautilusPrime Collectibles/NautilusPrime 1
+502 CollectibleNaijaCave Collectibles/NaijaCave 1
+503 CollectibleEnergyBoss Collectibles/EnergyBoss 1
+504 CollectibleEnergyTemple Collectibles/EnergyTemple 1
+505 CollectibleCrabCostume Collectibles/CrabCostume 1
+506 CollectibleDumboEgg Collectibles/Egg-Dumbo 1
+507 CollectibleBlasterEgg Collectibles/Egg-Blaster 1
+508 CollectiblePiranhaEgg Collectibles/Egg-Piranha 1
+509 CollectibleChest Collectibles/treasure-chest 1
+510 CollectibleBanner Collectibles/mithalas-banner 1
+511 CollectibleMithalaDoll Collectibles/mithala-doll 1
+512 CollectibleWalkerBaby Collectibles/walker-baby 1
+513 CollectibleSeedBag Collectibles/seed-bag 1
+514 CollectibleArnassiStatue Collectibles/arnassi-statue 1
+515 CollectibleGear Collectibles/golden-gear 1
+516 CollectibleSunKey Collectibles/sun-key 1
+517 CollectibleJellyCostume collectibles/jelly-costume 1
+518 CollectibleAnemoneSeed collectibles/anemone-seed 1
+519 CollectibleBioSeed collectibles/bio-seed 1
+520 CollectibleUrchinCostume collectibles/urchin-costume 1
+521 CollectibleMithalanCostume collectibles/mithalan-costume 1
+522 CollectibleTeenCostume collectibles/teen-costume 1
+523 CollectibleTurtleEgg collectibles/turtle-egg 1
+524 CollectibleSkull collectibles/skull 1
+525 CollectibleTridentHead collectibles/trident-head 1
+526 CollectibleSporeSeed collectibles/sporeseed 1
+527 CollectibleUpsideDownSeed collectibles/upsidedownseed 1
+528 CollectibleEnergyStatue collectibles/energystatue 1
+529 CollectibleJellyPlant collectibles/jellyplant 1
+530 CollectibleMithalasPot collectibles/mithalaspot 1
+531 CollectibleSeahorseCostume collectibles/seahorse-costume 1
+532 CollectibleStoneHead collectibles/stonehead 1
+533 CollectibleStarfish collectibles/goldstar 1
+534 CollectibleBlackPearl collectibles/blackpearl 1
+535 CollectibleBabyCrib collectibles/babycrib 1
+536 CollectibleMutantCostume collectibles/mutant-costume 1
+600 SporeChild SporeChildSeed 1
+700 SongLeaf songleaf
+701 EnergyLamp breakable/energylamp
+702 Oarfish oarfish
+703 Nauplius nauplius
+704 CastleCrab castlecrab/body
+705 HardBeetle hardbeetle
+706 DeepCrawley deepcrawley
+707 PlasmawormBG plasmaworm/body-bg
+708 Hatchetfish hatchetfish/body
+709 IceJelly icejelly/head
+710 Spooter spooter
+711 MamaTurtle mamaturtle/head
+712 IceShrimp iceshrimp/body
+713 Mantis mantis/body
+714 Coward coward/body
+715 Lionfish lionfish/body
+716 LeopardShark leopardshark/body
+717 TigerShark tigershark/body
+718 Mermoth mermoth/body
+719 cellgenerator red-cell
+720 roundvirus-bg roundvirus-bg
+721 pistolshrimp pistolshrimp/body
+722 electriceel eel-0002
+723 whelk whelk
+724 whelknoshell whelk
+725 aggroeggs aggro-eggs
+726 aggrobaby aggrobaby
+727 rotcrab rotcrab/head
+728 sporeplant songspore-plant
+729 bioplant abyss-plant-0001
+730 statuehead creatorstatue-0004
+731 weird-derek weirdfish/derek-body
+732 weird-alec weirdfish/alec-body
+733 sunkencrate Breakable/crate
+734 Rock0007 rock0007 1
+1000 SeaHorse6 Seahorse/Seahorse-0006
+1001 SeaHorseBaby Seahorse/seahorse-baby
+1002 GlobeCrab GlobeCrab/Body
+1003 BigMaul bigmaul-body
+1004 SlipperLobster SlipperLobster/Body
+1005 SlipperGenerator SlipperLobster/Body
+1006 drask-statue drask/statue-head
+1007 queen-statue queen-statue/head

game_scripts/scripts/entities/entitygroups.txt

@@ -0,0 +1,417 @@
+GROUP:OpenWaters
+Nautilus
+RedNautilus
+Tromulo
+Seahorse
+Seahorse2
+Seahorse3
+Seahorse4
+Seahorse5
+SeaHorseBaby
+TransTurtle
+Phonograph
+JellySmall
+Jelly
+JellyShock
+Nauplius
+Squiddy
+RockHead
+Raspberry
+Moneye
+MoneyeBreeder
+Anemone
+Anemone2
+Anemone3
+Anemone4
+Leach
+KingCrab
+GlobeCrab
+CastleCrab
+Trillious
+Scooter
+HardBeetle
+AggroHopper
+aggrobaby
+aggroeggs
+Eel
+Oarfish
+HydraWurm
+Turtle
+Nudi
+TurtleNoShell
+NudiNoShell
+whelk
+TurtleNoShell
+Shrimp
+SongSpore
+SongStalk
+SongLeaf
+sporeplant
+HealthPlant
+Ekkrit
+Crotoid
+13_MainArea
+OriginalRaspberry
+Moloch
+Tabar
+Swordfish
+Kappa
+Bevy
+Huggy
+Krill
+KrillEggs
+Chomper
+Duoeye
+Armapillar
+StressTest
+Minnow
+Grouper
+poisonberry
+
+GROUP:SongCave
+ErulianGhost
+SongDoor1
+
+GROUP:EnergyTemple
+Blaster
+MoneyeBreeder
+Shocker
+Turret
+NewtBlaster
+Froog
+EnergyLamp
+OrbHolder
+EnergyOrb
+EnergyDoor
+EnergyBarrierFlicker
+EnergyBarrierSolid
+EnergyOrbCracked
+EnergyBarrierOff
+TempleStatue
+BigBlaster
+VineDoor
+
+GROUP:Mithalas
+Splitter1
+Splitter2
+Rotworm
+rotcrab
+Blazer
+Flea
+RotCore
+SporeFungus0001
+Priest
+Loper
+SacrificeButton
+Seal-King
+Seal-Queen
+Seal-Prince
+Altar
+MermanThin
+CathedralDoor
+Toad
+RotBaby-Form1
+DarkJelly
+Seahorse5
+Moray
+DarkJellyFG
+MithalasUrn
+drask-statue
+queen-statue
+
+GROUP:Forest
+GreenSeaDragon
+Simon
+CrawPappy
+SpikyBall
+SpiderCrab
+MossHead
+NudiBranch0
+NudiBranch1
+NudiBranch2
+NudiBranch3
+Dandelion
+electriceel
+pistolshrimp
+Wisker
+Squeezer
+BigMaul
+Mermog
+Mermoth
+Maul
+SeaWolf
+Coward
+Piranha
+UpsideDownJelly
+Orbiter
+Walker
+ForestSprite
+SporeChildFlowerRed
+SporeChildFlowerPortal
+
+GROUP:Veil
+Shark
+LeopardShark
+TigerShark
+Monkey
+Parrot
+BigMouth
+BigMouthParasite
+HorseShoe
+PufferFish
+FlatFish
+Lionfish
+MetaRay
+Camopus
+Clam
+Rukh
+Starmie1
+Starmie2
+SeaTurtleBig
+SeaTurtleSmall
+SeaTurtleBaby
+MamaTurtle
+SeaTurtleBaby-Special1
+SeaTurtleBaby-Special2
+SeaTurtleBaby-Special3
+ancient-plant
+ancient-bulb
+
+GROUP:SunTemple
+CrystalHolder
+LightCrystal
+LightCrystalCharged
+ClockworkFish
+ClockworkCrab
+Gear
+SpikeyEggDown
+SpikeyEggUp
+Skeeter
+SnailGear
+SlipperLobster
+SlipperGenerator
+GearSlow
+GearMed
+GearFast
+SunDoor
+
+GROUP:Abyss
+Rock0007
+EvilJelly
+DeepUrchin
+AnglerFish
+Plasmaworm
+PlasmawormBG
+PredatoryTunicate
+DeepCrawley
+SpinyCrab
+DeepEel
+AbyssSpikes
+Wisp
+Hatchetfish
+Triffle
+BabyDeepShrimp
+ThermalVent
+SlenderEel
+DeepJelly
+DeepWhale
+
+GROUP:IceCave
+IceChunkLarge
+IceChunkMedium
+IceChunkSmall
+Ekko
+IceCrab
+SeaHorse6
+IceJelly
+Spooter
+IceShrimp
+Mantis
+
+GROUP:SunkenCity
+Scavenger
+CC_LostInCave
+CC_Mother
+CC_MissingMom
+CC_GF
+CC_Kid
+CC_Cat
+SunkenDoor
+CC_EndDemo
+CC_SunkenCity
+sunkencrate
+Spookfish
+ClayStatue
+Clay
+cc_father
+
+GROUP:FinalDungeon
+AbyssOctopus
+Mutilus
+Horror
+Abaddon
+GroundShocker
+Mutileye
+JellyZap
+BiteyMouth
+Drask-Final
+Erulian-Final
+Krotite-Final
+Druniad-Final
+FinalDoor
+FinalTongue
+GrabbyArm
+MutantNaija
+LiCage
+Guardian
+bloodcell-red
+bloodcell-white
+cellgenerator
+crawlvirus
+roundvirus
+roundvirus-bg
+
+GROUP:Bosses
+EnergyBoss
+HellBeast
+SunWorm
+ForestGod
+SunkenDad
+SunkenMom
+Zygote
+MomEyes
+NautilusPrime
+CrabBoss
+KingJelly
+Octomun
+Mergog
+CreatorForm1
+CreatorForm2
+CreatorForm3
+CreatorForm4
+CreatorForm5
+CreatorForm6
+CC_EndOfGame
+
+GROUP:Secrets
+YoungLi
+Mia
+MiaGhost
+NaijaBabyGhost
+NaijaChild
+NaijaChildGhost
+StrangeCreature
+SongLamp0
+SongLamp1
+SongLamp2
+SongLamp3
+SongLamp4
+SongLamp5
+SongLamp6
+SongLamp7
+weird-derek
+weird-alec
+
+GROUP:Items
+HealthUpgrade0
+HealthUpgrade1
+HealthUpgrade2
+HealthUpgrade3
+HealthUpgrade4
+FormUpgradeEnergy1
+FormUpgradeEnergy2
+FormUpgradeBeast
+CollectibleSongCave
+CollectibleNautilusPrime
+CollectibleNaijaCave
+CollectibleEnergyBoss
+CollectibleEnergyTemple
+CollectibleCrabCostume
+CollectibleChest
+CollectibleBanner
+CollectibleMithalaDoll
+CollectibleWalkerBaby
+CollectibleSeedBag
+CollectibleArnassiStatue
+CollectibleGear
+CollectibleSunKey
+CollectibleSkull
+CollectibleTridentHead
+CollectibleSporeSeed
+CollectibleUpsideDownSeed
+CollectibleEnergyStatue
+CollectibleJellyPlant
+CollectibleMithalasPot
+CollectibleSeahorseCostume
+CollectibleStoneHead
+CollectibleStarfish
+CollectibleBlackPearl
+CollectibleMutantCostume
+LiHelmet
+CaveFish1
+CaveFish2
+CaveFish3
+CaveFish4
+CollectibleDumboEgg
+CollectibleBlasterEgg
+CollectiblePiranhaEgg
+CollectibleJellyCostume
+CollectibleAnemoneSeed
+CollectibleBioSeed
+CollectibleUrchinCostume
+CollectibleMithalanCostume
+CollectibleTeenCostume
+CollectibleTurtleEgg
+
+GROUP:Unsorted
+Fatso
+ForestGodVine
+ForestGodVineHead
+TitleTextLeft
+TitleTextCenter
+CursorSwarmer
+KrotiteWorshipper
+KrotiteErulianBattle01
+KrotiteOnTheWay
+KrotiteVsKrotite
+Druniad
+Drask
+PriestNormal
+DraskPriestBattle
+PullPlantNormal
+Ompo
+Architect
+EnergyGodSpirit
+SingBulb
+floating-city
+eric_13
+eric_energyboss
+eric_mithala
+eric_sunkenmom
+eric_mutantnaija
+eric_forestgod
+eric_erulian
+lucien
+airship
+gateway
+final-mutant
+dark-li-shot
+suncontainer
+falsebg
+upgrade-wok
+beluga
+merchild
+merwoman
+merman
+luciengf
+Rock0001
+Rock0002
+Rock0003
+Rock0004
+Rock0005
+Rock0006
+statuehead
+otter
+fishcaveglow
+timerock
+arnassi-spirit

game_scripts/scripts/entities/icechunkcommon.lua

@@ -55,7 +55,7 @@ function v.commonInit(me, size)
 	512,							-- sprite height
 	1,								-- particle "explosion" type, maps to particleEffects.txt -1 = none
 	1,								-- 0/1 hit other entities off/on (uses collideRadius)
-	4000,							-- updateCull -1: disabled, default: 4000
+	4000							-- updateCull -1: disabled, default: 4000
 	)
 	
 	loadSound("IceChunkBreak")

win/vc90/Aquaria.vcproj

@@ -131,6 +131,7 @@
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="false"
 				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"

win/vc90/BBGE.vcproj

@@ -123,6 +123,7 @@
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="false"
 				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -331,6 +332,14 @@
 				RelativePath="..\..\BBGE\LensFlare.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\BBGE\Localization.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\BBGE\Localization.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\BBGE\Math.cpp"
 				>

win/vc90/external.vcproj

@@ -123,6 +123,7 @@
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="false"
 				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"