Merge branch 'storyline/s2e0' into atys

code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -1086,6 +1086,7 @@ void CDBCtrlSheet::clearIconBuffs()
 {
 	_EnchantIcons.clear();
 	_BuffIcons.clear();
+	_BoostIcons.clear();
 }
 
 // ***************************************************************************
@@ -1118,8 +1119,15 @@ void CDBCtrlSheet::infoReceived()
 			if (brick)
 			{
 				if (!brick->isRoot() && !brick->isCredit() && !brick->isParameter())
+				if (brick->BrickFamily == BRICK_FAMILIES::BSGMCB) // Boost of Allegories, use it as boost icon
 				{
 					if (!haveRoot)
+					_BoostIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIcon()), brick->IconColor));
+					rVR.getTextureSizeFromId(_BoostIcons.back().TextureId, _BoostIcons.back().IconW, _BoostIcons.back().IconH);
+				}
+				else if (!brick->isRoot() && !brick->isCredit() && !brick->isParameter())
+				{
+					if (!haveRoot && !brick->getIconBack().empty())
 					{
 						_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIconBack()), brick->IconBackColor));
 						rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);
@@ -2445,8 +2453,16 @@ void CDBCtrlSheet::drawSheet (sint32 x, sint32 y, bool draging, bool showSelecti
 						yIcon -= hIcon;
 						rVR.drawRotFlipBitmap(_RenderLayer + 1, xIcon, yIcon, wIcon, hIcon, 0, false, _EnchantIcons[0].TextureId, fastMulRGB(curSheetColor, _EnchantIcons[0].Color));
 						rVR.drawRotFlipBitmap(_RenderLayer + 1, xIcon, yIcon, wIcon, hIcon, 0, false, _EnchantIcons[i].TextureId, fastMulRGB(curSheetColor, _EnchantIcons[i].Color));
+
+
+						if ((i - 1) < _BoostIcons.size()) {
+							nlinfo("Boost icon  = %s", rVR.getTextureNameFromId(_BoostIcons[i-1].TextureId).c_str());
+							rVR.drawRotFlipBitmap(_RenderLayer + 2, xIcon+wIcon-_BoostIcons[i-1].IconW, yIcon, _BoostIcons[i-1].IconW, _BoostIcons[i-1].IconH, 0, false, _BoostIcons[i-1].TextureId, fastMulRGB(curSheetColor, _BoostIcons[i-1].Color));
 						}
 					}
+				}
+
+
 
 				// Draw Quality. -1 for lookandfeel. Draw it with global color
 				if (_DispQuality != -1)
@@ -3804,6 +3820,7 @@ void CDBCtrlSheet::resetAllTexIDs()
 	_ItemInfoChanged = true;
 	_EnchantIcons.clear();
 	_BuffIcons.clear();
+	_BoostIcons.clear();
 }
 
 

code/ryzom/client/src/interface_v3/dbctrl_sheet.h

@@ -682,6 +682,7 @@ protected:
 	};
 	std::vector<SBuffIcon> _BuffIcons;
 	std::vector<SBuffIcon> _EnchantIcons;
+	std::vector<SBuffIcon> _BoostIcons;
 
 	// Level Brick or Quality
 	union

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;
 	}