From 18e85895bd4dcd8c96f31454adfad75e7a926a4d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Nuno=20Gon=C3=A7alves=20=28Ulukyn=29?= <nuno@troispetits.net>
Date: Wed, 30 Aug 2023 17:17:05 +0100
Subject: [PATCH] Fix rumors and remove infos

---
 ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml |  6 +++---
 ryzom/client/data/gamedev/interfaces_v3/interaction.xml       |  2 +-
 ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml     |  4 ++--
 ryzom/client/src/game_context_menu.cpp                        | 11 ++++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml b/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
index 834714f31..49e0d6009 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
@@ -74,8 +74,6 @@
 
 	<!-- interaction -->
 	<action id="talk"					name="uimGcmTalk"				handler="context_talk"						params=""	icon="r2_mini_activity_empty_chat.tga" />
-	<action id="news"					name="uimGcmChat"				handler="lua"					params="game:TalkWithNpc(0)"	icon="radar_mission3_16.tga" />
-	<action id="news_aggressive"		name="uimGcmBullying"			handler="lua"					params="game:TalkWithNpc(1)"	icon="bullying.tga" />
 	<action id="attack"					name="uimGcmAttack"				handler="context_attack"				params=""	icon="ico_blade.tga" />
 
 
@@ -89,7 +87,9 @@
 	<action id="disengage"				name="uimGcmDisengage"			handler="context_disengage"				params=""	icon="ico_disarm.tga" />
 
 	<separator/>
-	<action id="info"					name="uimGcmInfo"				handler="open_title_help"				params="from=target" icon="spe_status.tga" />
+	<!-- <action id="info"					name="uimGcmInfo"				handler="open_title_help"				params="from=target" icon="spe_status.tga" /> -->
+	<action id="news"					name="uimGcmChat"				handler="lua"					params="game:TalkWithNpc(0)"	icon="radar_mission3_16.tga" />
+	<action id="news_aggressive"		name="uimGcmBullying"			handler="lua"					params="game:TalkWithNpc(1)"	icon="bullying.tga" />
 	<separator/>
 
 	<!-- friendly -->
diff --git a/ryzom/client/data/gamedev/interfaces_v3/interaction.xml b/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
index ab219f874..98a5ba4b0 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
@@ -16,7 +16,7 @@
   <variable entry="UI:VARIABLES:USER:TRACK_TARGET_PVP_CHANGE_MODE"
             type="sint32"
             value="0" />
-  <variable entry="UI:SAVE:ENABLE_RUMORS"
+  <variable entry="UI:SAVE:DISABLE_RUMORS"
             type="bool"
             value="0" />
   <!-- The Target selected -->
diff --git a/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
index 418faade2..e7256c2b3 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
@@ -204,7 +204,7 @@
 </template>
 
 <!-- //////////// TEMPLATE : webig_inv_item /////////// -->
-	<template name="webig_inv_item" line_maxw="40" ql0="" ql1="" ql2=""  q0="" q1="" q2="" q3="" q4="" q5="" q6="" q7="" o0="" o1="" o2="" o3="" o4="" o5="" o6="" o7="" render_layer1="1" render_layer2="2" render_layer3="3" render_layer4="4" w="43" keep="true" img1="token_basic.tga" img2="" img3="" img4="" tooltip="" quality="" quantity="" overlay="" text="" text2="" color="255 255 255 255" gc1="true" gc2="true" color2="255 255 255 255" slotbg="w_slot_item.tga" slotbg_gc="true" bg="blank2.tga" tx_normal="blank.tga" tx_pushed="blank.tga" tx_over="blank.tga" ctrl_color="0 0 0 0" col_over="255 255 255 50" col_pushed="255 255 255 0" params_over="" params_l="" params_r="" x="0" y="0">
+	<template name="webig_inv_item" line_maxw="40" ql0="" ql1="" ql2="" ql3="" q0="" q1="" q2="" q3="" q4="" q5="" q6="" q7="" o0="" o1="" o2="" o3="" o4="" o5="" o6="" o7="" render_layer1="1" render_layer2="2" render_layer3="3" render_layer4="4" w="43" keep="true" img1="token_basic.tga" img2="" img3="" img4="" tooltip="" quality="" quantity="" overlay="" text="" text2="" color="255 255 255 255" gc1="true" gc2="true" color2="255 255 255 255" slotbg="w_slot_item.tga" slotbg_gc="true" bg="blank2.tga" tx_normal="blank.tga" tx_pushed="blank.tga" tx_over="blank.tga" ctrl_color="0 0 0 0" col_over="255 255 255 50" col_pushed="255 255 255 0" params_over="" params_l="" params_r="" x="0" y="0">
 		<group id="#id" posref="MM MM" w="#w" h="43" x="#x" y="#y" sizeref="" render_layer="#render_layer1">
 			<view type="bitmap" id="back" posref="ML ML" x="3" y="0" h="42" w="42" scale="true" render_layer="#render_layer1" texture="#slotbg" color="255 255 255 255" global_color="#slotbg_gc" />
 			<view type="bitmap" id="bg" posparent="back" posref="MM MM" x="" y="0" w="40" h="40" render_layer="#render_layer2" scale="false" texture="#bg"  global_color="false" />
@@ -215,7 +215,7 @@
 			<instance id="over" template="typo_ryzom" posref="TL TL" render_layer="6" x="4" y="-2" t0="#o0" t1="#o1" t2="#o2" t3="#o3" t4="#o4" t5="#o5" t6="#o6" t7="#o7" />
 
 			<instance id="quantity" template="typo_ryzom" posref="BL BL" typo="numbers" render_layer="5" posparent="" x="5" y="1" t0="#q0" t1="#q1" t2="#q2" t3="#q3" t4="#q4" t5="#q5" t6="#q6" t7="#q7" />
-			<instance id="quality" template="typo_ryzom" posref="BL BL" typo="numbers" render_layer="5" posparent="back" x="24" y="1" t0="#ql0" t1="#ql1" t2="#ql2" gc="true"/>
+			<instance id="quality" template="typo_ryzom" posref="BL BL" typo="numbers" render_layer="5" posparent="back" x="24" y="1" t0="#ql0" t1="#ql1" t2="#ql2" t3="#ql3" gc="true"/>
 			<view type="bitmap" id="numbers_back" posparent="" posref="BL BL" render_layer="4" x="3" y="0" h="10" w="42" scale="true" texture="blank.tga" color="0 0 0 150" global_color="false" />
 
 			<view type="text" id="text1" multi_line="true" line_maxw="#line_maxw" multi_line_maxw_only="true" posref="TR TL" posparent="back" x="3" y="1" fontsize="8" hardtext_format="#text" color="#color1" shadow="true" global_color="#gc1" />
diff --git a/ryzom/client/src/game_context_menu.cpp b/ryzom/client/src/game_context_menu.cpp
index 363abdd80..5c64b1964 100644
--- a/ryzom/client/src/game_context_menu.cpp
+++ b/ryzom/client/src/game_context_menu.cpp
@@ -460,14 +460,14 @@ void		CGameContextMenu::update()
 			fameValue = pLeafFame->getValue8();
 	}
 
-
-	bool enable_rumors = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENABLE_RUMORS")->getValueBool();
+	bool disable_rumors = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:DISABLE_RUMORS")->getValueBool();
+	bool newbie = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:USER:IS_NEWBIE")->getValueBool();
 
 	if (_TextNews)
-		_TextNews->setActive(enable_rumors && !UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue >= -30);
+		_TextNews->setActive(!disable_rumors && !newbie && !UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue >= -30);
 
 	if (_TextNewsAgressive)
-		_TextNewsAgressive->setActive(enable_rumors && !UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue < -30);
+		_TextNewsAgressive->setActive(!disable_rumors && !newbie && !UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue < -30);
 
 
 	if (_TextDuel && _TextUnDuel)
@@ -521,7 +521,8 @@ void		CGameContextMenu::update()
 
 	// Disable player properties
 	if(_TextInfo)
-		_TextInfo->setActive(selection && (!selection->isForageSource()));
+		//_TextInfo->setActive(selection && (!selection->isForageSource()));
+		_TextInfo->setActive(false);
 
 	// Follow
 	if(_TextFollow)
-- 
2.11.4.GIT