lobby faction select

Author: afwbkbc

GLSMAC_data/default/ui/parts/mainmenu/steps/multiplayer_lobby/players.gls.js

@@ -6,6 +6,19 @@ return (i) => {
 		height: 358,
 	}, (body) => {
 
+		const factions = i.glsmac.game.get_fm().list();
+		let faction_choices = [
+			['random', 'Random', {
+				color: 'white',
+			}],
+		];
+		for (faction of factions) {
+			#print('F', faction);
+			faction_choices :+[faction.id, faction.name, {
+				color: faction.text_color,
+			}];
+		}
+
 		let rows = {};
 
 		const add_row = (player) => {
@@ -26,11 +39,7 @@ return (i) => {
 					}),
 					faction: row.select({
 						class: 'lobby-player-faction',
-						items: [
-							['random', 'Random'],
-							['fac1', 'Fac1'],
-							['fac2', 'Fac2'],
-						],
+						items: faction_choices,
 						value: 'random', // TODO
 					}),
 					difficulty: row.select({

src/game/backend/Game.cpp

@@ -844,6 +844,16 @@ WRAPIMPL_BEGIN( Game )
 				return VALUE( gse::value::Undefined );
 			} )
 		},
+		{
+			"get_fm",
+			NATIVE_CALL( this ) {
+				N_EXPECT_ARGS( 0 );
+				return m_state
+					? m_state->GetFM()->Wrap( GSE_CALL, true )
+					: VALUE( gse::value::Undefined )
+					;
+			} )
+		},
 	};
 	if ( m_tm ) {
 		properties.insert(

src/game/backend/Player.cpp

@@ -105,10 +105,20 @@ WRAPIMPL_BEGIN( Player )
 				"id",
 				VALUE( gse::value::Int, , m_slotnum )
 			},
+			{
+				"type",
+				VALUE( gse::value::String, , "human" )
+			},
 			{
 				"name",
 				VALUE( gse::value::String, , m_name )
 			},
+			{
+				"faction",
+				m_faction
+					? m_faction->Wrap( GSE_CALL, gc_space )
+					: VALUE( gse::value::Undefined )
+			},
 			{
 				"is_master",
 				VALUE( gse::value::Bool, , m_role == PR_SINGLE || m_role == PR_HOST )
@@ -118,20 +128,20 @@ WRAPIMPL_END_PTR()
 
 const types::Buffer Player::Serialize() const {
 	types::Buffer buf;
-	
+
 	buf.WriteString( m_name );
 	buf.WriteInt( m_role );
 	buf.WriteBool( m_faction != nullptr );
 	if ( m_faction ) {
 		buf.WriteString( m_faction->Serialize().ToString() );
 	}
 	buf.WriteString( m_difficulty_level );
-	
+
 	return buf;
 }
 
 void Player::Unserialize( types::Buffer buf ) {
-	
+
 	m_name = buf.ReadString();
 	m_role = (role_t)buf.ReadInt();
 	m_faction = {};
@@ -140,7 +150,7 @@ void Player::Unserialize( types::Buffer buf ) {
 		m_faction->Unserialize( buf.ReadString() );
 	}
 	m_difficulty_level = buf.ReadString();
-	
+
 }
 
 }

src/game/backend/faction/Faction.cpp

@@ -6,6 +6,7 @@
 #include "engine/Engine.h"
 #include "loader/texture/TextureLoader.h"
 #include "resource/ResourceManager.h"
+#include "util/String.h"
 
 namespace game {
 namespace backend {
@@ -69,23 +70,27 @@ void Faction::Unserialize( types::Buffer buf ) {
 
 WRAPIMPL_BEGIN( Faction )
 	WRAPIMPL_PROPS
-		{
-			"id",
-			VALUE( gse::value::String,, m_id )
-		},
-		{
-			"name",
-			VALUE( gse::value::String,, m_name )
-		},
-		{
-			"is_naval",
-			VALUE( gse::value::Bool,, m_flags & Faction::FF_NAVAL )
-		},
-		{
-			"is_progenitor",
-			VALUE( gse::value::Bool,, m_flags & Faction::FF_PROGENITOR )
-		},
-	};
+			{
+				"id",
+				VALUE( gse::value::String, , m_id )
+			},
+			{
+				"name",
+				VALUE( gse::value::String, , m_name )
+			},
+			{
+				"text_color",
+				m_colors.text.Wrap( GSE_CALL ),
+			},
+			{
+				"is_naval",
+				VALUE( gse::value::Bool, , m_flags & Faction::FF_NAVAL )
+			},
+			{
+				"is_progenitor",
+				VALUE( gse::value::Bool, , m_flags & Faction::FF_PROGENITOR )
+			},
+		};
 WRAPIMPL_END_PTR()
 
 UNWRAPIMPL_PTR( Faction )

src/game/backend/faction/FactionManager.cpp

@@ -209,6 +209,18 @@ WRAPIMPL_BEGIN( FactionManager )
 				return VALUE( gse::value::Undefined );
 			} )
 		},
+		{
+			"list",
+			NATIVE_CALL( this ) {
+				N_EXPECT_ARGS( 0 );
+				gse::value::array_elements_t arr = {};
+				for ( const auto& f : m_factions_order ) {
+					ASSERT( m_factions.find( f.second ) != m_factions.end(), "faction id not found: " + f.second );
+					arr.push_back( m_factions.at( f.second ).faction->Wrap( GSE_CALL ) );
+				}
+				return VALUE( gse::value::Array,, arr );
+			} )
+		},
 	};
 WRAPIMPL_END_PTR()
 

src/game/backend/slot/Slot.cpp

@@ -165,27 +165,9 @@ void Slot::Unserialize( types::Buffer buf ) {
 WRAPIMPL_BEGIN( Slot )
 	ASSERT( m_slot_state == SS_PLAYER, "only player slots can be wrapped for now" );
 	auto* player = m_player_data.player;
-	WRAPIMPL_PROPS
-			{
-				"id",
-				VALUE( gse::value::Int, , m_index )
-			},
-			{
-				"type",
-				VALUE( gse::value::String, , "human" )
-			},
-			{
-				"name",
-				VALUE( gse::value::String, , player->GetPlayerName() )
-			},
-			{
-				"faction",
-				player->GetFaction()
-					? player->GetFaction()->Wrap( GSE_CALL, gc_space )
-					: VALUE( gse::value::Undefined )
-			},
-		};
-WRAPIMPL_END_PTR()
+	ASSERT( player, "can't wrap slot without player" );
+	return player->Wrap( GSE_CALL );
+}
 
 UNWRAPIMPL_PTR( Slot )
 

src/gse/Value.h

@@ -216,6 +216,7 @@ class Value : public gc::Object {
 
 	enum type_t : uint8_t {
 		T_NULLPTR, // special type only for serialization/deserialization
+		T_NOTHING, // special type meaning 'no type'
 		T_UNDEFINED,
 		T_NULL,
 		T_BOOL,

src/ui/dom/ChoiceList.cpp

@@ -144,8 +144,8 @@ void ChoiceList::SetItems( GSE_CALLABLE, const gse::value::array_elements_t& ite
 			GSE_ERROR( gse::EC.TYPE_ERROR, "Choicelist items are expected to be value-label pairs, got " + item->GetTypeString() + ": " + item->ToString() );
 		}
 		const auto& kv = ( (gse::value::Array*)item )->value;
-		if ( kv.size() != 2 || kv.at( 0 )->type != gse::Value::T_STRING || kv.at( 1 )->type != gse::Value::T_STRING ) {
-			GSE_ERROR( gse::EC.TYPE_ERROR, "Choicelist items are expected to be pairs of two strings (value and label), got: " + item->ToString() );
+		if ( kv.size() < 2 || kv.size() > 3 || kv.at( 0 )->type != gse::Value::T_STRING || kv.at( 1 )->type != gse::Value::T_STRING ) {
+			GSE_ERROR( gse::EC.TYPE_ERROR, "Choicelist items are expected to be pairs of two strings (value and label) (and optional style object), got: " + item->ToString() );
 		}
 		const auto& k = ( (gse::value::String*)kv.at( 0 ) )->value;
 		const auto& v = ( (gse::value::String*)kv.at( 1 ) )->value;
@@ -162,6 +162,16 @@ void ChoiceList::SetItems( GSE_CALLABLE, const gse::value::array_elements_t& ite
 			}
 		);
 		AddChild( GSE_CALL, element, true );
+		if ( kv.size() >= 3 ) {
+			const auto &c = kv.at(2);
+			if ( c->type != gse::Value::T_OBJECT || ( !((gse::value::Object*)c)->object_class.empty() ) ) {
+				GSE_ERROR( gse::EC.TYPE_ERROR, "Choicelist items are expected to have style object as third element, got: " + c->ToString() );
+			}
+			const auto* style = (gse::value::Object*)c;
+			for ( const auto& it : style->value ) {
+				element->WrapSet( it.first, it.second, GSE_CALL );
+			}
+		}
 		const auto& choice = m_choices.insert(
 			{ k, {
 				k,

src/ui/dom/Object.cpp

@@ -383,10 +383,12 @@ void Object::OnPropertyChange( GSE_CALLABLE, const std::string& key, gse::Value*
 	ASSERT( !m_is_destroyed, "object is destroyed" );
 	const auto& def = m_property_defs.find( key );
 	ASSERT( def != m_property_defs.end(), "property def not found" );
-	const auto t1 = value->type;
-	const auto t2 = def->second.type;
-	if ( t1 != t2 ) {
-		GSE_ERROR( gse::EC.UI_ERROR, "Property '" + key + "' is expected to be " + gse::Value::GetTypeStringStatic( def->second.type ) + ", got " + value->GetTypeString() + ": " + value->ToString() );
+	const auto t1 = def->second.type;
+	if ( t1 != gse::Value::T_NOTHING ) {
+		const auto t2 = value->type;
+		if ( t1 != t2 ) {
+			GSE_ERROR( gse::EC.UI_ERROR, "Property '" + key + "' is expected to be " + gse::Value::GetTypeStringStatic( def->second.type ) + ", got " + value->GetTypeString() + ": " + value->ToString() );
+		}
 	}
 	for ( const auto& obj : m_wrapobjs ) {
 		obj->Assign( key, value );

src/ui/dom/Text.cpp

@@ -54,10 +54,18 @@ Text::Text( DOM_ARGS )
 	);
 
 	Property(
-		GSE_CALL, "color", gse::Value::T_STRING, nullptr, PF_NONE,
+		GSE_CALL, "color", gse::Value::T_NOTHING, nullptr, PF_NONE,
 		[ this ]( GSE_CALLABLE, gse::Value* const v ) {
 			types::Color color = {};
-			ParseColor( GSE_CALL, ( (gse::value::String*)v )->value, color );
+			if ( v->type == gse::Value::T_STRING ) {
+				ParseColor( GSE_CALL, ( (gse::value::String*)v )->value, color );
+			}
+			else if ( v->type == gse::Value::T_OBJECT && ( (gse::value::Object*)v )->object_class == "Color" ) {
+				color = types::Color::Unwrap( v );
+			}
+			else {
+				GSE_ERROR( gse::EC.UI_ERROR, "Property 'color' is expected to be String or Color, got " + v->GetTypeString() + ": " + v->ToString() );
+			}
 			m_actor->SetColor( color );
 		},
 		[ this ]( GSE_CALLABLE ) {