Merge branch 'storyline/s2e0' into yubo

5 years ago · c950373782
parent b869cd07d6 b1d18ddb53
commit c950373782
2 changed files with 3 additions and 0 deletions
--- a/code/ryzom/common/src/game_share/brick_families.cpp
+++ b/code/ryzom/common/src/game_share/brick_families.cpp
@ -558,6 +558,7 @@ namespace BRICK_FAMILIES
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMB)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMC)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSCMD)
+		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMC)

 		NL_STRING_CONVERSION_TABLE_ENTRY(BSXCA)

--- a/code/ryzom/common/src/game_share/brick_families.h
+++ b/code/ryzom/common/src/game_share/brick_families.h
@ -676,6 +676,8 @@ namespace BRICK_FAMILIES
 				BSCMD, // heal Focus
 			EndPowerParameter = BSCMD,

+			BSGMC, // jewels s2e0
+
 			BeginMagicPowerCredit,
 				BSXCA = BeginMagicPowerCredit, // recast time
 			EndMagicPowerCredit = BSXCA,