diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js index 2a3a5e667..b90da54a3 100644 --- a/FloatingSpace/FloatingObject.js +++ b/FloatingSpace/FloatingObject.js @@ -132,14 +132,8 @@ function newFloatingObject () { /* Floating object position in screen coordinates */ - let position = { - x: 0, - y: 0 - } - - position = thisObject.container.frame.frameThisPoint(position) - - thisObject.payload.position = position + thisObject.payload.position.x = thisObject.container.frame.position.x + thisObject.payload.position.y = thisObject.container.frame.position.y } function onMouseOver (point) { @@ -255,11 +249,14 @@ function newFloatingObject () { y: Math.floor((Math.random() * (200) - 100)) + arroundPoint.y } - thisObject.container.frame.position = position - thisObject.payload.position = { - x: position.x, - y: position.y - } + // thisObject.container.frame.position = thisObject.container.frame.frameThisPoint(position) + + thisObject.container.frame.position.x = position.x + thisObject.container.frame.position.y = position.y + + thisObject.payload.position = {} + thisObject.payload.position.x = position.x + thisObject.payload.position.y = position.y } function radomizeCurrentSpeed () { diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 6bfa2f17d..57c02c27d 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -404,8 +404,8 @@ function newStrategyPart () { thisObject.payload.targetPosition.x = canvas.floatingSpace.container.frame.width / 2, thisObject.payload.targetPosition.y = canvas.floatingSpace.container.frame.height / 2 } else { - thisObject.payload.targetPosition.x = thisObject.payload.chainParent.payload.position.x - canvas.floatingSpace.container.frame.position.x - thisObject.payload.targetPosition.y = thisObject.payload.chainParent.payload.position.y - canvas.floatingSpace.container.frame.position.y + thisObject.payload.targetPosition.x = thisObject.payload.chainParent.payload.position.x + thisObject.payload.targetPosition.y = thisObject.payload.chainParent.payload.position.y } } diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index bcabcfaa2..f3f475ef8 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -31,9 +31,9 @@ function newStrategyPartConstructor () { function createStrategyPart (payload) { let floatingObject = newFloatingObject() + floatingObject.container.connectToParent(canvas.floatingSpace.container, false, false, false, false, false, false, false, false) floatingObject.initialize('Strategy Part', payload) payload.floatingObject = floatingObject - floatingObject.container.connectToParent(canvas.floatingSpace.container, false, false, false, false, false, false, false, false) let strategyPart = newStrategyPart() strategyPart.initialize(payload) diff --git a/StrategySpace/InvestmentPlan.js b/StrategySpace/InvestmentPlan.js index 34a3da0d9..0eefe04e2 100644 --- a/StrategySpace/InvestmentPlan.js +++ b/StrategySpace/InvestmentPlan.js @@ -48,8 +48,8 @@ function newInvestmentPlan () { } } else { payload.targetPosition = { - x: chainParent.payload.position.x - canvas.floatingSpace.container.frame.position.x, - y: chainParent.payload.position.y - canvas.floatingSpace.container.frame.position.y + x: chainParent.payload.position.x, + y: chainParent.payload.position.y } }