Merge branch 'master' into develop

README.md

@@ -1,13 +1,8 @@
 ![Linux-CI_fmod_steam](https://github.com/TurningWheel/Barony/workflows/Linux-CI_fmod_steam/badge.svg) ![Linux-CI_fmod_steam_eos](https://github.com/TurningWheel/Barony/workflows/Linux-CI_fmod_steam_eos/badge.svg)
 
-# Update - 4th Feb 2021
+# Update - 3rd October 2023
 
-The current 'master' branch contains in-development features for our latest update. From here we're branching to 'develop' and continuing on work for splitscreen/gamepad/new UI.
-
-If you'd like to compile the code for your own modding or casual uses, we recommend forking from the current stable V3.3.7 build on Steam/Epic/GOG - check the Releases section on Github for the commit. 
-[https://github.com/TurningWheel/Barony/releases/tag/v3.3.7](https://github.com/TurningWheel/Barony/releases/tag/v3.3.7).
-
-For bugfixes + PRs, open them against 'master'. To build the code from 'master' you'll need some additional assets to get the game running, 'tmp-master-assets.zip' found at [https://github.com/TurningWheel/Barony/releases/tag/V3.3.7-dev](https://github.com/TurningWheel/Barony/releases/tag/V3.3.7-dev) and place them in the root Barony directory.
+The current 'develop' branch contains in-development features for our latest update. For bugfixes + PRs, open them against 'master'.
 
 # Compilation Instructions
 

lang/en.txt

@@ -4202,7 +4202,7 @@ any gyrobot findings.#
 3824 DEPRECATED#
 3825 DEPRECATED#
 3826 DEPRECATED#
-3827 DEPRECATED#
+3827 Incubus#
 3828 DEPRECATED#
 3829 DEPRECATED#
 3830 DEPRECATED#
@@ -5908,7 +5908,8 @@ Mod#
 Workshop#
 5881 Open
 Workshop#
-5882 Browse community created mods and 'subscribe' to\ndownload mods for use.
+5882 Browse community created mods and 'subscribe' to
+download mods for use.
 
 Subscribing while Barony is running may require
 closing the game in order for Steam to begin downloading.
@@ -6204,5 +6205,6 @@ intro - God Rest Ye Merry Gentlemen by NaturesEye#
 6049 View Wheel#
 6050 SPECTATE#
 6051 SPAWN AS GHOST#
+6052 Your party has been wiped out...#
 
 6100 end#

src/actbeartrap.cpp

@@ -629,12 +629,12 @@ void bombDoEffect(Entity* my, Entity* triggered, real_t entityDistance, bool spa
 				if ( !strcmp(stat->name, "") )
 				{
 					updateEnemyBar(parent, triggered, getMonsterLocalizedName(stat->type).c_str(), stat->HP, stat->MAXHP,
-						false, DamageGib::DMG_TODO);
+						false, DamageGib::DMG_DEFAULT);
 				}
 				else
 				{
 					updateEnemyBar(parent, triggered, stat->name, stat->HP, stat->MAXHP,
-						false, DamageGib::DMG_TODO);
+						false, DamageGib::DMG_DEFAULT);
 				}
 				Entity* gib = spawnGib(triggered);
 				serverSpawnGibForClient(gib);

src/actplayer.cpp

@@ -7539,6 +7539,46 @@ void actPlayer(Entity* my)
 				{
 					hit.entity->doorHealth = 0;
 				}
+				//else if ( hit.entity->behavior == &actDoorFrame &&
+				//	hit.entity->flags[INVISIBLE] )
+				//{
+				//	// code that almost fixes door frame collision
+				//	if ( hit.entity->yaw >= -0.1 && hit.entity->yaw <= 0.1 )
+				//	{
+				//		// east/west doorway
+				//		if ( my->y < floor(hit.entity->y / 16) * 16 + 8 )
+				//		{
+				//			// slide south
+				//			PLAYER_VELX = 0;
+				//			PLAYER_VELY = .25;
+				//		}
+				//		else
+				//		{
+				//			// slide north
+				//			PLAYER_VELX = 0;
+				//			PLAYER_VELY = -.25;
+				//		}
+				//	}
+				//	else
+				//	{
+				//		// north/south doorway
+				//		if ( my->x < floor(hit.entity->x / 16) * 16 + 8 )
+				//		{
+				//			// slide east
+				//			PLAYER_VELX = .25;
+				//			PLAYER_VELY = 0;
+				//		}
+				//		else
+				//		{
+				//			// slide west
+				//			PLAYER_VELX = -.25;
+				//			PLAYER_VELY = 0;
+				//		}
+				//	}
+				//	my->x += PLAYER_VELX;
+				//	my->y += PLAYER_VELY;
+				//	dist = sqrt(PLAYER_VELX * PLAYER_VELX + PLAYER_VELY * PLAYER_VELY);
+				//}
 			}
 		}
 		else

src/actthrown.cpp

@@ -1167,12 +1167,12 @@ void actThrown(Entity* my)
 					if ( !strcmp(hitstats->name, "") )
 					{
 						updateEnemyBar(parent, hit.entity, getMonsterLocalizedName(hitstats->type).c_str(), hitstats->HP, hitstats->MAXHP,
-							false, DamageGib::DMG_TODO);
+							false, DamageGib::DMG_DEFAULT);
 					}
 					else
 					{
 						updateEnemyBar(parent, hit.entity, hitstats->name, hitstats->HP, hitstats->MAXHP,
-							false, DamageGib::DMG_TODO);
+							false, DamageGib::DMG_DEFAULT);
 					}
 				}
 

src/engine/audio/defines.cpp

@@ -53,8 +53,8 @@ FMOD::Sound* caveslairmusic = nullptr;
 FMOD::Sound* bramscastlemusic = nullptr;
 FMOD::Sound* hamletmusic = nullptr;
 FMOD::Sound* tutorialmusic = nullptr;
-FMOD::Sound* introstorymusic = nullptr;
 FMOD::Sound* gameovermusic = nullptr;
+FMOD::Sound* introstorymusic = nullptr;
 bool levelmusicplaying = false;
 
 FMOD::Channel* music_channel = nullptr;

src/engine/audio/sound.cpp

@@ -537,8 +537,8 @@ OPENAL_BUFFER* caveslairmusic = NULL;
 OPENAL_BUFFER* bramscastlemusic = NULL;
 OPENAL_BUFFER* hamletmusic = NULL;
 OPENAL_BUFFER* tutorialmusic = nullptr;
-OPENAL_BUFFER* introstorymusic = nullptr;
 OPENAL_BUFFER* gameovermusic = nullptr;
+OPENAL_BUFFER* introstorymusic = nullptr;
 bool levelmusicplaying = false;
 
 OPENAL_SOUND* music_channel = nullptr;
@@ -1160,6 +1160,7 @@ bool physfsSearchMusicToUpdate()
 	themeMusic.push_back("music/hamlet.ogg");
 	themeMusic.push_back("music/tutorial.ogg");
 	themeMusic.push_back("sound/Death.ogg");
+	themeMusic.push_back("sound/ui/StoryMusicV3.ogg");
 
 	for ( std::vector<std::string>::iterator it = themeMusic.begin(); it != themeMusic.end(); ++it )
 	{
@@ -1281,6 +1282,7 @@ void physfsReloadMusic(bool &introMusicChanged, bool reloadAll) //TODO: This sho
 	themeMusic.push_back("music/hamlet.ogg");
 	themeMusic.push_back("music/tutorial.ogg");
 	themeMusic.push_back("sound/Death.ogg");
+	themeMusic.push_back("sound/ui/StoryMusicV3.ogg");
 
 	int index = 0;
 #ifdef USE_OPENAL
@@ -1583,6 +1585,20 @@ void physfsReloadMusic(bool &introMusicChanged, bool reloadAll) //TODO: This sho
 							fmod_result = fmod_system->createStream(musicDir.c_str(), FMOD_DEFAULT, nullptr, &gameovermusic);
 						}
 						break;
+					case 20:
+						if ( introstorymusic )
+						{
+							introstorymusic->release();
+						}
+						if ( musicPreload )
+						{
+							fmod_result = fmod_system->createSound(musicDir.c_str(), FMOD_DEFAULT, nullptr, &introstorymusic);
+						}
+						else
+						{
+							fmod_result = fmod_system->createStream(musicDir.c_str(), FMOD_DEFAULT, nullptr, &introstorymusic);
+						}
+						break;
 					default:
 						break;
 				}

src/eos.cpp

@@ -1240,7 +1240,9 @@ bool EOSFuncs::initPlatform(bool enableLogging)
 	PlatformOptions.RTCOptions = nullptr;
 
 	PlatformOptions.IntegratedPlatformOptionsContainerHandle = nullptr; // must be null initialized
+#ifndef LINUX
 	PlatformOptions.SystemSpecificOptions = nullptr; // must be null initialized
+#endif
 
 	PlatformHandle = EOS_Platform_Create(&PlatformOptions);
 	PlatformOptions.bIsServer = EOS_TRUE;

src/files.cpp

@@ -3177,7 +3177,20 @@ void generatePolyModels(int start, int end, bool forceCacheRebuild)
 		if ( useModelCache && !forceCacheRebuild )
 		{
 #ifndef NINTENDO
-			std::string cache_path = std::string(outputdir) + "/models.cache";
+            std::string cache_path;
+            if (isCurrentHoliday()) {
+                const auto holiday = getCurrentHoliday();
+                switch (holiday) {
+                case HolidayTheme::THEME_NONE:
+                    cache_path = std::string(outputdir) + "/models.cache";
+                    break;
+                default:
+                    cache_path = "models.cache";
+                    break;         
+                }
+            } else {
+                cache_path = std::string(outputdir) + "/models.cache";
+            }
 #else
 			std::string cache_path = "models.cache";
 #endif

src/init_game.cpp

@@ -558,8 +558,8 @@ void deinitGame()
 		bramscastlemusic->release();
 		hamletmusic->release();
 		tutorialmusic->release();
-		introstorymusic->release();
 		gameovermusic->release();
+		introstorymusic->release();
 
 		for ( int c = 0; c < NUMMINESMUSIC; c++ )
 		{

src/input.cpp

@@ -490,10 +490,10 @@ std::string Input::getGlyphPathForInput(const char* input, bool pressed, Control
             {"StickRightY+", {"Stick_Switch_R_Down_00.png", "Stick_Switch_R_Down_Pressed_00.png"}},
             {"LeftTrigger", {"G_Switch_ZL00.png", "G_Switch_ZL_Press00.png"}},
             {"RightTrigger", {"G_Switch_ZR00.png", "G_Switch_ZR_Press00.png"}},
-            {"DpadX-", {"G_Direct_Left_Press00.png", "G_Direct_00.png"}},
-            {"DpadX+", {"G_Direct_Right_Press00.png", "G_Direct_00.png"}},
-            {"DpadY-", {"G_Direct_Up_Press00.png", "G_Direct_00.png"}},
-            {"DpadY+", {"G_Direct_Down_Press00.png", "G_Direct_00.png"}},
+            {"DpadX-", {"G_Switch_Direct_Left_Press00.png", "G_Switch_Direct_00.png"}},
+            {"DpadX+", {"G_Switch_Direct_Right_Press00.png", "G_Switch_Direct_00.png"}},
+            {"DpadY-", {"G_Switch_Direct_Up_Press00.png", "G_Switch_Direct_00.png"}},
+            {"DpadY+", {"G_Switch_Direct_Down_Press00.png", "G_Switch_Direct_00.png"}},
         };
 
         // look for glyph in table