diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js index 84db50afb..0166923c2 100644 --- a/FloatingSpace/FloatingObject.js +++ b/FloatingSpace/FloatingObject.js @@ -170,14 +170,6 @@ function newFloatingObject () { } function tensionPhysics () { - /* Tension Inheritance */ - if (thisObject.tensedManually === false) { - let parent = thisObject.payload.chainParent - if (parent !== undefined) { - thisObject.isTensed = parent.payload.floatingObject.isTensed - } - } - /* Tension Effect */ if (thisObject.isTensed === true) { let parent = thisObject.payload.chainParent @@ -371,15 +363,10 @@ function newFloatingObject () { let position = {} if (thisObject.payload.position === undefined) { - /* if (thisObject.payload.chainParent !== undefined) { - position.x = thisObject.payload.chainParent.payload.position.x + 250 - position.y = thisObject.payload.chainParent.payload.position.y - } else { */ position = { - x: Math.floor((Math.random() * (200) - 100)) + arroundPoint.x, - y: Math.floor((Math.random() * (200) - 100)) + arroundPoint.y + x: Math.floor((Math.random() * (1000) - 500)) + arroundPoint.x, + y: Math.floor((Math.random() * (1000) - 500)) + arroundPoint.y } - // } } else { position = { x: thisObject.payload.position.x, diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index eda67cb67..3f62702a3 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -1969,7 +1969,7 @@ function newStrategyPartConstructor () { function setFloatingObjectBasicProperties (floatingObject, payload) { const FRICTION = 0.95 - const INITIAL_FRICTION = 0.99 + const INITIAL_FRICTION = 0.97 switch (payload.node.type) { case 'Workspace': { @@ -2045,11 +2045,11 @@ function newStrategyPartConstructor () { break } case 'Next Phase Event': { - level_5() + level_4() break } case 'Situation': { - level_5() + level_4() break } case 'Condition': { @@ -2136,6 +2136,10 @@ function newStrategyPartConstructor () { floatingObject.initializeFontSize(10) floatingObject.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)' + + if (payload.node.savedPayload === undefined) { + floatingObject.tensionToggle() + } } function level_5 () { @@ -2174,3 +2178,4 @@ function newStrategyPartConstructor () { payload.uiObject = undefined } } +