rename-ln-labels

blender/arm/logicnode/camera/LN_get_camera_active.py

@@ -5,7 +5,7 @@ class ActiveCameraNode(ArmLogicTreeNode):
 
     @seeNode Set Active Camera"""
     bl_idname = 'LNActiveCameraNode'
-    bl_label = 'Get Active Camera'
+    bl_label = 'Get Camera Active'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/camera/LN_set_camera_active.py

@@ -5,7 +5,7 @@ class SetCameraNode(ArmLogicTreeNode):
 
     @seeNode Get Active Camera"""
     bl_idname = 'LNSetCameraNode'
-    bl_label = 'Set Active Camera'
+    bl_label = 'Set Camera Active'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/deprecated/LN_on_surface.py

@@ -1,10 +1,12 @@
 from arm.logicnode.arm_nodes import *
 
-class SurfaceNode(ArmLogicTreeNode):
-    """Runs the output when the defined action over the screen is done."""
-    bl_idname = 'LNMergedSurfaceNode'
-    bl_label = 'Surface'
-    arm_version = 1
+class OnSurfaceNode(ArmLogicTreeNode):
+    """Deprecated. Is recommended to use Surface node instead."""
+    bl_idname = 'LNOnSurfaceNode'
+    bl_label = 'On Surface'
+    bl_description = "Please use the \"Surface\" node instead"
+    bl_icon = 'ERROR'
+    arm_version = 2
     property0: EnumProperty(
         items = [('Touched', 'Touched', 'Touched'),
                  ('Started', 'Started', 'Started'),
@@ -13,11 +15,10 @@ class SurfaceNode(ArmLogicTreeNode):
         name='', default='Touched')
 
     def init(self, context):
-        super(SurfaceNode, self).init(context)
+        super(OnSurfaceNode, self).init(context)
         self.add_output('ArmNodeSocketAction', 'Out')
-        self.add_output('NodeSocketBool', 'State')
 
     def draw_buttons(self, context, layout):
         layout.prop(self, 'property0')
 
-add_node(SurfaceNode, category=PKG_AS_CATEGORY, section='surface')
+add_node(OnSurfaceNode, category=PKG_AS_CATEGORY, section='surface', is_obsolete=True)

blender/arm/logicnode/deprecated/LN_on_virtual_button.py

@@ -1,10 +1,12 @@
 from arm.logicnode.arm_nodes import *
 
-class VirtualButtonNode(ArmLogicTreeNode):
-    """Runs the output when the action over the virtual button is done."""
-    bl_idname = 'LNMergedVirtualButtonNode'
-    bl_label = 'Virtual Button'
-    arm_version = 1
+class OnVirtualButtonNode(ArmLogicTreeNode):
+    """Deprecated. Is recommended to use 'Virtual Button' node instead."""
+    bl_idname = 'LNOnVirtualButtonNode'
+    bl_label = 'On Virtual Button'
+    bl_description = "Please use the \"Virtual Button\" node instead"
+    bl_icon = 'ERROR'
+    arm_version = 2
     property0: EnumProperty(
         items = [('Down', 'Down', 'Down'),
                  ('Started', 'Started', 'Started'),
@@ -13,12 +15,11 @@ class VirtualButtonNode(ArmLogicTreeNode):
     property1: StringProperty(name='', default='button')
 
     def init(self, context):
-        super(VirtualButtonNode, self).init(context)
+        super(OnVirtualButtonNode, self).init(context)
         self.add_output('ArmNodeSocketAction', 'Out')
-        self.add_output('NodeSocketBool', 'State')
 
     def draw_buttons(self, context, layout):
         layout.prop(self, 'property0')
         layout.prop(self, 'property1')
 
-add_node(VirtualButtonNode, category=PKG_AS_CATEGORY, section='virtual')
+add_node(OnVirtualButtonNode, category=PKG_AS_CATEGORY, section='virtual', is_obsolete=True)

blender/arm/logicnode/deprecated/LN_scale_object.py

@@ -4,7 +4,9 @@ class ScaleObjectNode(ArmLogicTreeNode):
     """Deprecated. 'Use Set Object Scale' instead."""
     bl_idname = 'LNScaleObjectNode'
     bl_label = 'Scale Object'
-    arm_version = 1
+    bl_description = "Please use the \"Set Object Scale\" node instead"
+    bl_icon = 'ERROR'
+    arm_version = 2
 
     def init(self, context):
         super(ScaleObjectNode, self).init(context)
@@ -13,4 +15,4 @@ class ScaleObjectNode(ArmLogicTreeNode):
         self.add_input('NodeSocketVector', 'Scale')
         self.add_output('ArmNodeSocketAction', 'Out')
 
-add_node(ScaleObjectNode, category=PKG_AS_CATEGORY, section='scale')
+add_node(ScaleObjectNode, category=PKG_AS_CATEGORY, section='scale', is_obsolete=True)

blender/arm/logicnode/deprecated/LN_surface_coords.py

@@ -4,11 +4,13 @@ class SurfaceCoordsNode(ArmLogicTreeNode):
     """Deprecated. Is recommended to use 'Get Touch Location' and 'Get Touch Movement' node instead."""
     bl_idname = 'LNSurfaceCoordsNode'
     bl_label = 'Surface Coords'
-    arm_version = 1
+    bl_description = "Please use the \"Get Touch Movement\" and \"Get Touch Location\" nodes instead"
+    bl_icon = 'ERROR'
+    arm_version = 2
 
     def init(self, context):
         super(SurfaceCoordsNode, self).init(context)
         self.add_output('NodeSocketVector', 'Coords')
         self.add_output('NodeSocketVector', 'Movement')
 
-add_node(SurfaceCoordsNode, category=PKG_AS_CATEGORY, section='surface')
+add_node(SurfaceCoordsNode, category=PKG_AS_CATEGORY, section='surface', is_obsolete=True)

blender/arm/logicnode/input/LN_on_gamepad.py

@@ -11,7 +11,7 @@ class GamepadNode(ArmLogicTreeNode):
     @option Button: the gamepad button that should activate the output.
     """
     bl_idname = 'LNMergedGamepadNode'
-    bl_label = 'Gamepad'
+    bl_label = 'On Gamepad'
     arm_version = 1
 
     property0: EnumProperty(

blender/arm/logicnode/input/LN_on_keyboard.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class KeyboardNode(ArmLogicTreeNode):
     """Activates the output when there is a keyboard event."""
     bl_idname = 'LNMergedKeyboardNode'
-    bl_label = 'Keyboard'
+    bl_label = 'On Keyboard'
     arm_version = 1
 
     property0: EnumProperty(

blender/arm/logicnode/input/LN_on_mouse.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class MouseNode(ArmLogicTreeNode):
     """Activates the output when there is a mouse button event."""
     bl_idname = 'LNMergedMouseNode'
-    bl_label = 'Mouse'
+    bl_label = 'On Mouse'
     arm_version = 1
     property0: EnumProperty(
         items = [('Down', 'Down', 'Down'),

blender/arm/logicnode/input/LN_on_surface.py

@@ -1,8 +1,8 @@
 from arm.logicnode.arm_nodes import *
 
-class OnSurfaceNode(ArmLogicTreeNode):
-    """Deprecated. Is recommended to use Surface node instead."""
-    bl_idname = 'LNOnSurfaceNode'
+class SurfaceNode(ArmLogicTreeNode):
+    """Runs the output when the defined action over the screen is done."""
+    bl_idname = 'LNMergedSurfaceNode'
     bl_label = 'On Surface'
     arm_version = 1
     property0: EnumProperty(
@@ -13,10 +13,11 @@ class OnSurfaceNode(ArmLogicTreeNode):
         name='', default='Touched')
 
     def init(self, context):
-        super(OnSurfaceNode, self).init(context)
+        super(SurfaceNode, self).init(context)
         self.add_output('ArmNodeSocketAction', 'Out')
+        self.add_output('NodeSocketBool', 'State')
 
     def draw_buttons(self, context, layout):
         layout.prop(self, 'property0')
 
-add_node(OnSurfaceNode, category=PKG_AS_CATEGORY, section='surface')
+add_node(SurfaceNode, category=PKG_AS_CATEGORY, section='surface')

blender/arm/logicnode/input/LN_on_virtual_button.py

@@ -1,8 +1,8 @@
 from arm.logicnode.arm_nodes import *
 
-class OnVirtualButtonNode(ArmLogicTreeNode):
-    """Deprecated. Is recommended to use 'Virtual Button' node instead."""
-    bl_idname = 'LNOnVirtualButtonNode'
+class VirtualButtonNode(ArmLogicTreeNode):
+    """Runs the output when the action over the virtual button is done."""
+    bl_idname = 'LNMergedVirtualButtonNode'
     bl_label = 'On Virtual Button'
     arm_version = 1
     property0: EnumProperty(
@@ -13,11 +13,12 @@ class OnVirtualButtonNode(ArmLogicTreeNode):
     property1: StringProperty(name='', default='button')
 
     def init(self, context):
-        super(OnVirtualButtonNode, self).init(context)
+        super(VirtualButtonNode, self).init(context)
         self.add_output('ArmNodeSocketAction', 'Out')
+        self.add_output('NodeSocketBool', 'State')
 
     def draw_buttons(self, context, layout):
         layout.prop(self, 'property0')
         layout.prop(self, 'property1')
 
-add_node(OnVirtualButtonNode, category=PKG_AS_CATEGORY, section='virtual')
+add_node(VirtualButtonNode, category=PKG_AS_CATEGORY, section='virtual')

blender/arm/logicnode/math/LN_mix_vector.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class VectorMixNode(ArmLogicTreeNode):
     """Use to interpolate between vectors."""
     bl_idname = 'LNVectorMixNode'
-    bl_label = 'Vector Mix'
+    bl_label = 'Mix Vector'
     arm_version = 1
     property0: EnumProperty(
         items = [('Linear', 'Linear', 'Linear'),

blender/arm/logicnode/navmesh/LN_pick_navmesh_location.py

@@ -3,12 +3,12 @@ from arm.logicnode.arm_nodes import *
 class PickLocationNode(ArmLogicTreeNode):
     """Use to pick a location in a navmesh."""
     bl_idname = 'LNPickLocationNode'
-    bl_label = 'Pick Navmesh Location'
+    bl_label = 'Pick NavMesh Location'
     arm_version = 1
 
     def init(self, context):
         super(PickLocationNode, self).init(context)
-        self.add_input('ArmNodeSocketObject', 'Navmesh')
+        self.add_input('ArmNodeSocketObject', 'NavMesh')
         self.add_input('NodeSocketVector', 'Screen Coords')
         self.add_output('NodeSocketVector', 'Location')
 

blender/arm/logicnode/object/LN_get_object_children.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class GetChildrenNode(ArmLogicTreeNode):
     """Use to get the children of an object."""
     bl_idname = 'LNGetChildrenNode'
-    bl_label = 'Get Children'
+    bl_label = 'Get Object Children'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_get_rb_contacts.py

@@ -7,7 +7,7 @@ class GetContactsNode(ArmLogicTreeNode):
     @seeNode Get First Contact
     """
     bl_idname = 'LNGetContactsNode'
-    bl_label = 'Get Contacts'
+    bl_label = 'Get RB Contacts'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_get_rb_data.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class GetRigidBodyDataNode(ArmLogicTreeNode):
     """Use to get the data of a rigid body."""
     bl_idname = 'LNGetRigidBodyDataNode'
-    bl_label = 'Get Rigid Body Data'
+    bl_label = 'Get RB Data'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_get_rb_first_contact.py

@@ -6,7 +6,7 @@ class GetFirstContactNode(ArmLogicTreeNode):
     @seeNode Get Contacts
     """
     bl_idname = 'LNGetFirstContactNode'
-    bl_label = 'Get First Contact'
+    bl_label = 'Get RB First Contact'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_get_rb_velocity.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class GetVelocityNode(ArmLogicTreeNode):
     """Get the world velocity of a rigid body."""
     bl_idname = 'LNGetVelocityNode'
-    bl_label = 'Get Rigid Body Velocity'
+    bl_label = 'Get RB Velocity'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_remove_rb.py

@@ -6,7 +6,7 @@ from arm.logicnode.arm_nodes import *
 class RemovePhysicsNode (ArmLogicTreeNode):
     """Use to delete a rigid body from an object."""
     bl_idname = 'LNRemovePhysicsNode'
-    bl_label = 'Remove Rigid Body'
+    bl_label = 'Remove RB'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_set_rb_activation_state.py

@@ -6,7 +6,7 @@ from arm.logicnode.arm_nodes import *
 class SetActivationStateNode(ArmLogicTreeNode):
     """Use to set the activation state of a rigid body."""
     bl_idname = 'LNSetActivationStateNode'
-    bl_label = 'Set Activation State'
+    bl_label = 'Set RB Activation State'
     bl_icon = 'NONE'
     arm_version = 1
     property0: EnumProperty(

blender/arm/logicnode/physics/LN_set_rb_friction.py

@@ -6,7 +6,7 @@ from arm.logicnode.arm_nodes import *
 class SetFrictionNode (ArmLogicTreeNode):
     """Use to set the friction of a rigid body."""
     bl_idname = 'LNSetFrictionNode'
-    bl_label = 'Set Friction'
+    bl_label = 'Set RB Friction'
     bl_icon = 'NONE'
     arm_version = 1
 

blender/arm/logicnode/physics/LN_set_rb_gravity_enabled.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class SetGravityEnabledNode(ArmLogicTreeNode):
     """Use to set if the gravity is enabled for a rigid body."""
     bl_idname = 'LNSetGravityEnabledNode'
-    bl_label = 'Set Rigid Body Gravity'
+    bl_label = 'Set RB Gravity Enabled'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_set_rb_velocity.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class SetVelocityNode(ArmLogicTreeNode):
     """Set the velocity of a rigid body."""
     bl_idname = 'LNSetVelocityNode'
-    bl_label = 'Set Rigid Body Velocity'
+    bl_label = 'Set RB Velocity'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/physics/LN_set_world_gravity.py

@@ -6,7 +6,7 @@ class SetGravityNode(ArmLogicTreeNode):
     @seeNode Get World Gravity
     """
     bl_idname = 'LNSetGravityNode'
-    bl_label = 'Set Gravity'
+    bl_label = 'Set World Gravity'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/postprocess/LN_get_ca_settings.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class ChromaticAberrationGetNode(ArmLogicTreeNode):
     """Use to get the chromatic aberration post-processing settings."""
     bl_idname = 'LNChromaticAberrationGetNode'
-    bl_label = 'Get ChromaticAberration Settings'
+    bl_label = 'Get CA Settings'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/postprocess/LN_set_ca_settings.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class ChromaticAberrationSetNode(ArmLogicTreeNode):
     """Use to set the chromatic aberration post-processing settings."""
     bl_idname = 'LNChromaticAberrationSetNode'
-    bl_label = 'Set Chromatic Aberration Settings'
+    bl_label = 'Set CA Settings'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/scene/LN_get_scene_active.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class ActiveSceneNode(ArmLogicTreeNode):
     """Get the active scene."""
     bl_idname = 'LNActiveSceneNode'
-    bl_label = 'Get Active Scene'
+    bl_label = 'Get Scene Active'
     arm_version = 1
 
     def init(self, context):

blender/arm/logicnode/scene/LN_set_scene_active.py

@@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
 class SetSceneNode(ArmLogicTreeNode):
     """Set the active scene."""
     bl_idname = 'LNSetSceneNode'
-    bl_label = 'Set Scene'
+    bl_label = 'Set Scene Active'
     arm_version = 1
 
     def init(self, context):