diff --git a/scripts/radial/item/reverse_engineering_tool.py b/scripts/radial/item/reverse_engineering_tool.py index 35e2a590..b82ced03 100644 --- a/scripts/radial/item/reverse_engineering_tool.py +++ b/scripts/radial/item/reverse_engineering_tool.py @@ -18,8 +18,9 @@ def createRadial(core, owner, target, radials): return def handleSelection(core, owner, target, option): - #if owner.getPlayerObject().getProfession()!='trader_0a' and owner.getPlayerObject().getProfession()!='trader_0b' and owner.getPlayerObject().getProfession()!='trader_0c' and owner.getPlayerObject().getProfession()!='trader_0d': - #return # You lack the skills to use this + if owner.getPlayerObject().getProfession()!='trader_0a' and owner.getPlayerObject().getProfession()!='trader_0b' and owner.getPlayerObject().getProfession()!='trader_0c' and owner.getPlayerObject().getProfession()!='trader_0d': + owner.sendSystemMessage('@base_player:not_correct_skill', 0) + return if option == 21 and target: if owner is not None: @@ -28,19 +29,16 @@ def handleSelection(core, owner, target, option): if option == 132: if owner is not None: core.reverseEngineeringService.reverseEngineer(owner, target) - owner.sendSystemMessage('REVERSE ENGINEER', 0) return if option == 133: if owner is not None: core.reverseEngineeringService.createSEA(owner, target) - owner.sendSystemMessage('SEA', 0) return if option == 134: if owner is not None: core.reverseEngineeringService.createPowerup(owner, target) - owner.sendSystemMessage('POWER UP', 0) return return diff --git a/src/services/DevService.java b/src/services/DevService.java index bd80b4a7..d3f37e10 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -95,7 +95,8 @@ public class DevService implements INetworkDispatch { suiOptions.put((long) 130, "Vehicle Deeds"); if (creature.getClient().isGM()) { suiOptions.put((long) 121, "Sandbox City"); - suiOptions.put((long) 177, "REing"); + if(creature.getPlayerObject().getProfession().equals("trader_0a") || creature.getPlayerObject().getProfession().equals("trader_0b") || creature.getPlayerObject().getProfession().equals("trader_0c") || creature.getPlayerObject().getProfession().equals("trader_0d")) + suiOptions.put((long) 177, "REing"); } break; diff --git a/src/services/reverseengineering/ReverseEngineeringService.java b/src/services/reverseengineering/ReverseEngineeringService.java index 570f3141..44e4248c 100644 --- a/src/services/reverseengineering/ReverseEngineeringService.java +++ b/src/services/reverseengineering/ReverseEngineeringService.java @@ -3017,7 +3017,7 @@ public class ReverseEngineeringService implements INetworkDispatch { qualityfactor += luck/1000; // around 1200 luck was top qualityfactor = Math.max(1.0F, qualityfactor); int itemCL = 1; - if (piece.getIntAttribute("required_combat_level")!=0) + if (piece.getAttributes().get("required_combat_level")!=null) itemCL = piece.getIntAttribute("required_combat_level"); float CLFactor = itemCL/85.71F; // item Combat Level adds a small amount too if (CLFactor>1.0F)