Merge branch 'new_features'

ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp

@@ -412,7 +412,6 @@ void CFameManager::savePlayerFame(const NLMISC::CEntityId &playerId, EGSPD::CFam
 				if( entry == NULL )
 					entry = fameContainer.addToEntries( id );
 				EGS_PD_AST(entry);
-				nlinfo("%d : %i", MAX_FACTION, (sint32) it->second->Fames[i]);
 				entry->setFame( it->second->Fames[i] );
 				entry->setLastFameChangeTrend( fow->LastFameChangeTrends[i] );
 			}

ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp

@@ -2069,6 +2069,15 @@ NLMISC_COMMAND(teleportMe, "teleport", "<uid> [x,y,z,h|player name|bot name] tel
 		return true;
 	}
 
+	CMirrorPropValue<TYPE_VISUAL_FX> visualFx(TheDataset, c->getEntityRowId(), DSPropertyVISUAL_FX);
+	CVisualFX fx;
+	fx.unpack(visualFx.getValue());
+	fx.Aura = MAGICFX::NoAura;
+	sint64 prop;
+	fx.pack(prop);
+	visualFx = (sint16)prop;
+
+
 	c->teleportCharacter(x,y,z,allowPetTp,true,h,0xFF,cell);
 
 	if (cont)
@@ -2084,6 +2093,27 @@ NLMISC_COMMAND(teleportMe, "teleport", "<uid> [x,y,z,h|player name|bot name] tel
 	return true;
 }
 
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(setAuraFx, "setAuraFx", "<uid> aura")
+{
+	if (args.size() != 2)
+		return false;
+
+	GET_ACTIVE_CHARACTER
+
+	CMirrorPropValue<TYPE_VISUAL_FX> visualFx(TheDataset, c->getEntityRowId(), DSPropertyVISUAL_FX);
+	CVisualFX fx;
+	fx.unpack(visualFx.getValue());
+
+	if (args[1] == "marauder")
+		fx.Aura = MAGICFX::TeleportMarauder;
+
+	sint64 prop;
+	fx.pack(prop);
+	visualFx = (sint16)prop;
+	return true;
+}
+
 //-----------------------------------------------
 // Check Action Flags
 //-----------------------------------------------