From 806cb449a17eb4826ba2da3f4a1f8e5240b926fe Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Tue, 2 Feb 2021 22:48:16 +0100
Subject: [PATCH] Some fixes

---
 .../guild_manager/fame_manager.cpp                   |  4 ++--
 .../character_inventory_manipulation.cpp             | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp b/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp
index b4a1a2a47..dc7971e6c 100644
--- a/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp
+++ b/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp
@@ -412,7 +412,7 @@ void CFameManager::savePlayerFame(const NLMISC::CEntityId &playerId, EGSPD::CFam
 				if( entry == NULL )
 					entry = fameContainer.addToEntries( id );
 				EGS_PD_AST(entry);
-				nlinfo("%d : %d", it->second->Fames[i]);
+				nlinfo("%d : %i", MAX_FACTION, (sint32) it->second->Fames[i]);
 				entry->setFame( it->second->Fames[i] );
 				entry->setLastFameChangeTrend( fow->LastFameChangeTrends[i] );
 			}
@@ -1291,7 +1291,7 @@ sint32 CFameManager::getMaxFameByClan(std::pair<PVP_CLAN::TPVPClan, PVP_CLAN::TP
 
 	if (organization == 5) // marauder
 	{
-		return -30*kFameMultipler;
+		return -40*kFameMultipler;
 	}
 
 	// Local variables for the lookup values.
diff --git a/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
index ff4967d13..48c7f4f89 100644
--- a/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
+++ b/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
@@ -3258,10 +3258,10 @@ void CCharacter::useItem(uint32 slot)
 					if (factionIndex != CStaticFames::INVALID_FACTION_INDEX)
 					{
 						const sint32 fame = CFameInterface::getInstance().getFameIndexed(getId(), factionIndex);
-						if (fame >= 33*6000) // 198000
+						if (fame >= 33*kFameMultipler) // 198000
 						{
 							destroy = false;
-							if (fame < 60*6000 && item->getStaticForm()->TpEcosystem == 7) // 360000
+							if (fame < 60*kFameMultipler && item->getStaticForm()->TpEcosystem == 7) // 360000
 								destroy = true;
 
 							if (!destroy)
@@ -3315,8 +3315,7 @@ void CCharacter::useItem(uint32 slot)
 				fx.unpack(visualFx.getValue());
 
 				if (allegeance.first != PVP_CLAN::None && allegeance.first != PVP_CLAN::Neutral
-						&& CFameInterface::getInstance().getFameIndexed(_Id, PVP_CLAN::getFactionIndex(allegeance.first))
-						>= 600000)
+						&& CFameInterface::getInstance().getFameIndexed(_Id, PVP_CLAN::getFactionIndex(allegeance.first)) >= 100*kFameMultipler)
 				{
 					if (allegeance.first == PVP_CLAN::Kami)
 					{
@@ -3331,10 +3330,9 @@ void CCharacter::useItem(uint32 slot)
 						fx.Aura = MAGICFX::NoAura;
 					}
 				}
-				else if (getOrganization() == 5 && CFameInterface::getInstance().getFameIndexed(_Id, PVP_CLAN::getFactionIndex(PVP_CLAN::Marauder)))
-						>= 600000)
+				else if (getOrganization() == 5 && CFameInterface::getInstance().getFameIndexed(_Id, PVP_CLAN::getFactionIndex(PVP_CLAN::Marauder))>= 100*kFameMultipler)
 				{
-					fx.Aura = MAGICFX::MarauderKami;
+					fx.Aura = MAGICFX::TeleportMarauder;
 				}
 				else
 				{