Merge remote-tracking branch 'origin/feature/split-action-bar-1-and-2' into main/yubo-dev

ryzom/client/src/interface_v3/action_handler_phrase.cpp

@@ -1602,7 +1602,8 @@ public:
 			{
 				CSPhraseManager		*pPM= CSPhraseManager::getInstance();
 				sint	val= (sint32)value.getInteger();
-				clamp(val, 0, MEM_SET_TYPES::NumMemories-1);
+				// first half of memorized stanza sets
+				clamp(val, 0, MEM_SET_TYPES::NumMemories / 2 - 1);
 				pPM->selectMemoryLineDB(val);
 			}
 		}
@@ -1626,8 +1627,11 @@ public:
 			else
 			{
 				CSPhraseManager		*pPM= CSPhraseManager::getInstance();
-				sint	val= (sint32)value.getInteger();
-				clamp(val, 0, MEM_SET_TYPES::NumMemories-1);
+				// second half of memorized stanza sets
+				sint	minValue = MEM_SET_TYPES::NumMemories / 2;
+				sint	maxValue = MEM_SET_TYPES::NumMemories - 1;
+				sint	val = (sint32)value.getInteger() + minValue;
+				clamp(val, minValue, maxValue);
 				pPM->selectMemoryLineDBalt(val);
 			}
 		}

ryzom/common/src/game_share/memorization_set_types.h

@@ -27,7 +27,7 @@ namespace MEM_SET_TYPES
 	// New System. Only 10 memories are allowed
 	enum
 	{
-		NumMemories= 10,
+		NumMemories= 20,
 	};
 
 	// Deprecated