fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83 from AAMasters/develop

Browse Source 
Last Repositioning Bug
This commit is contained in:
benme authored and GitHub committed 2019-07-04 19:44:02 -03:00
2 parents f942d7d0ae 2a44fcc5b3
commit 572e7cecd0
4 files changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

FloatingSpace/FloatingLayer.js
+1 -1
View File
@@ -315,7 +315,7 @@ function newFloatingLayer () {
floatingObject.currentSpeed.y = floatingObject.currentSpeed.y - 0.005
}
const MAX_SPEED = 50
const MAX_SPEED = 10
if (floatingObject.currentSpeed.x > MAX_SPEED) {
floatingObject.currentSpeed.x = MAX_SPEED
FloatingSpace/FloatingObject.js
+2 -2
View File
@@ -364,8 +364,8 @@ function newFloatingObject () {
if (thisObject.payload.position === undefined) {
position = {
x: Math.floor((Math.random() * (1000) - 500)) + arroundPoint.x,
y: Math.floor((Math.random() * (1000) - 500)) + arroundPoint.y
x: Math.floor((Math.random() * (200) - 100)) + arroundPoint.x,
y: Math.floor((Math.random() * (200) - 100)) + arroundPoint.y
}
} else {
position = {
FloatingSpace/StrategyPartConstructor.js
+7 -7
View File
@@ -2070,7 +2070,7 @@ function newStrategyPartConstructor () {
floatingObject.targetFriction = 0.93
floatingObject.friction = INITIAL_FRICTION
floatingObject.initializeMass(400)
floatingObject.initializeMass(1000)
floatingObject.initializeRadius(45)
floatingObject.initializeImageSize(80)
floatingObject.initializeFontSize(10)
@@ -2082,7 +2082,7 @@ function newStrategyPartConstructor () {
floatingObject.targetFriction = 0.94
floatingObject.friction = INITIAL_FRICTION
floatingObject.initializeMass(200)
floatingObject.initializeMass(750)
floatingObject.initializeRadius(45)
floatingObject.initializeImageSize(80)
floatingObject.initializeFontSize(10)
@@ -2098,7 +2098,7 @@ function newStrategyPartConstructor () {
floatingObject.targetFriction = FRICTION
floatingObject.friction = INITIAL_FRICTION
floatingObject.initializeMass(100)
floatingObject.initializeMass(500)
floatingObject.initializeRadius(40)
floatingObject.initializeImageSize(70)
floatingObject.initializeFontSize(10)
@@ -2114,7 +2114,7 @@ function newStrategyPartConstructor () {
floatingObject.targetFriction = FRICTION
floatingObject.friction = INITIAL_FRICTION
floatingObject.initializeMass(50)
floatingObject.initializeMass(250)
floatingObject.initializeRadius(35)
floatingObject.initializeImageSize(60)
floatingObject.initializeFontSize(10)
@@ -2130,7 +2130,7 @@ function newStrategyPartConstructor () {
floatingObject.targetFriction = FRICTION
floatingObject.friction = INITIAL_FRICTION
floatingObject.initializeMass(20)
floatingObject.initializeMass(100)
floatingObject.initializeRadius(30)
floatingObject.initializeImageSize(50)
floatingObject.initializeFontSize(10)
@@ -2146,7 +2146,7 @@ function newStrategyPartConstructor () {
floatingObject.targetFriction = FRICTION
floatingObject.friction = INITIAL_FRICTION
floatingObject.initializeMass(20)
floatingObject.initializeMass(50)
floatingObject.initializeRadius(25)
floatingObject.initializeImageSize(40)
floatingObject.initializeFontSize(10)
@@ -2157,7 +2157,7 @@ function newStrategyPartConstructor () {
floatingObject.targetFriction = FRICTION
floatingObject.friction = INITIAL_FRICTION
floatingObject.initializeMass(20)
floatingObject.initializeMass(25)
floatingObject.initializeRadius(20)
floatingObject.initializeImageSize(30)
floatingObject.initializeFontSize(10)
Spaces/FloatingSpace.js
+2 -2
View File
@@ -35,8 +35,8 @@ function newFloatingSpace () {
let devicePixelRatio = window.devicePixelRatio
const SPACE_SIZE = 50000
thisObject.container.frame.width = devicePixelRatio * SPACE_SIZE
thisObject.container.frame.height = devicePixelRatio * SPACE_SIZE
thisObject.container.frame.width = SPACE_SIZE
thisObject.container.frame.height = SPACE_SIZE
thisObject.container.frame.position.x = browserCanvas.width / 2 - thisObject.container.frame.width / 2
thisObject.container.frame.position.y = browserCanvas.height / 2 - thisObject.container.frame.height / 2