Merge branch 'storyline/s2e0' into yubo

code/ryzom/common/src/game_share/brick_families.cpp

@@ -558,6 +558,7 @@ namespace BRICK_FAMILIES
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMC)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMD)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMC)
+		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMCB)
 
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSXCA)
 

code/ryzom/common/src/game_share/brick_families.h

@@ -675,7 +675,8 @@ namespace BRICK_FAMILIES
 				BSCMD, // heal Focus
 			EndPowerParameter = BSCMD,
 
-			BSGMC, // jewels s2e0
+			BSGMC, // allegories
+				BSGMCB, // boost allegories
 
 			BeginMagicPowerCredit,
 				BSXCA = BeginMagicPowerCredit, // recast time

code/ryzom/common/src/game_share/fame.cpp

@@ -633,7 +633,7 @@ sint32	CStaticFames::getStaticFameIndexed(uint factionIndex1, uint factionIndex2
 
 	if (factionIndex1 >= _FameTableSize || factionIndex2 >= _FameTableSize)
 	{
-		nlwarning("FAME: CStaticFames::getStaticFame invalid faction, return 0");
+		//nlwarning("FAME: CStaticFames::getStaticFame invalid faction, return 0");
 		return 0;
 	}