diff --git a/ryzom/common/data_common/r2/r2_features_default.lua b/ryzom/common/data_common/r2/r2_features_default.lua index e1de396d2..d6cbd7bda 100644 --- a/ryzom/common/data_common/r2/r2_features_default.lua +++ b/ryzom/common/data_common/r2/r2_features_default.lua @@ -859,10 +859,10 @@ local registerFeature = function () Enum= { "uiR2EDWalk", "uiR2EDRun"}, Visible=true }, - {Name="Level", Type="Number", WidgetStyle="EnumDropDown", Category="uiR2EDRollout_NpcCustom", - Enum= { "uiR2EDLowLevel", "uiR2EDAverageLevel", "uiR2EDHighLevel", "uiR2EDVeryHighLevel"}, SecondRequestFunc=function(value) r2.updateLevel(value, true) end, - Visible=function(this) return this:isGroupedAndLeader() or not this:isGrouped() and not this:isBotObject() end - }, + --{Name="Level", Type="Number", WidgetStyle="EnumDropDown", Category="uiR2EDRollout_NpcCustom", + -- Enum= { "uiR2EDLowLevel", "uiR2EDAverageLevel", "uiR2EDHighLevel", "uiR2EDVeryHighLevel"}, SecondRequestFunc=function(value) r2.updateLevel(value, true) end, + -- Visible=function(this) return this:isGroupedAndLeader() or not this:isGrouped() and not this:isBotObject() end + --}, }, -- from "BaseClass" getAvailableCommands = function(this, dest) diff --git a/ryzom/common/src/game_share/object.cpp b/ryzom/common/src/game_share/object.cpp index bb92c4936..bed87409e 100644 --- a/ryzom/common/src/game_share/object.cpp +++ b/ryzom/common/src/game_share/object.cpp @@ -2618,7 +2618,7 @@ CNpcSerializer::CNpcSerializer() static const char* optionalProp[] = { "GabaritHeight", "GabaritTorsoWidth","GabaritArmsWidth", "GabaritLegsWidth", "GabaritBreastSize", "HairType", "HairColor", "Tattoo", "EyesColor", "MorphTarget1", "MorphTarget2", "MorphTarget3", "MorphTarget4", "MorphTarget5", "MorphTarget6", "MorphTarget7", "MorphTarget8", "Sex", "JacketModel", "TrouserModel", "FeetModel", "HandsModel", "ArmModel", - "WeaponRightHand", "WeaponLeftHand", "JacketColor", "ArmColor", "HandsColor", "TrouserColor", "FeetColor", "Function","Level", + "WeaponRightHand", "WeaponLeftHand", "JacketColor", "ArmColor", "HandsColor", "TrouserColor", "FeetColor", "Function", "Profile", "Speed", "Aggro", "PlayerAttackable", "BotAttackable" }; _ClassName = "Npc"; @@ -2654,7 +2654,7 @@ CNpcCustomSerializer::CNpcCustomSerializer() "MorphTarget6", "MorphTarget7", "MorphTarget8", "JacketModel", "TrouserModel", "FeetModel", "HandsModel", "ArmModel", "JacketColor", "ArmColor", "HandsColor", "TrouserColor", "FeetColor" }; static const char* optionalProp[] = { - "Name", "Profile", "Speed", "Aggro", "PlayerAttackable", "BotAttackable", "Function", "Level", "WeaponRightHand", "WeaponLeftHand", "Sex" }; + "Name", "Profile", "Speed", "Aggro", "PlayerAttackable", "BotAttackable", "Function", "WeaponRightHand", "WeaponLeftHand", "Sex" }; _ClassName = "NpcCustom"; _Type = ObjectTableNpcCustom;