Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix player errors

  • Loading branch information...
commit 166f356c0be37d595f7b750a517e7793416e5f9a 1 parent 456abc3
@aardvarrk aardvarrk authored
View
2  Brick.ctxt
@@ -1,5 +1,5 @@
#BlueJ class context
comment0.params=
comment0.target=void\ act()
-comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ Brick\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment0.text=\n\ Act\ -\ do\ whatever\ the\ Brick\ wants\ to\ do.\ This\ method\ is\ called\ whenever\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\n
numComments=1
View
2  Coin.ctxt
@@ -1,7 +1,7 @@
#BlueJ class context
comment0.params=
comment0.target=Coin()
-comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ Coin\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment0.text=\n\ Act\ -\ do\ whatever\ the\ Coin\ wants\ to\ do.\ This\ method\ is\ called\ whenever\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\n
comment1.params=
comment1.target=void\ act()
numComments=2
View
2  Enemy.ctxt
@@ -1,7 +1,7 @@
#BlueJ class context
comment0.params=
comment0.target=void\ act()
-comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ Enemy\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment0.text=\n\ Act\ -\ do\ whatever\ the\ Enemy\ wants\ to\ do.\ This\ method\ is\ called\ whenever\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\n
comment1.params=
comment1.target=int\ getPoints()
numComments=2
View
6 GameOverScreen.ctxt
@@ -1,15 +1,15 @@
#BlueJ class context
comment0.params=
comment0.target=void\ act()
-comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ menuBar\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment0.text=\n\ Act\ -\ do\ whatever\ the\ menuBar\ wants\ to\ do.\ This\ method\ is\ called\ whenever\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\n
comment1.params=
comment1.target=GameOverScreen()
-comment1.text=\r\n\ Create\ a\ score\ board\ with\ dummy\ result\ for\ testing.\r\n
+comment1.text=\n\ Create\ a\ score\ board\ with\ dummy\ result\ for\ testing.\n
comment2.params=score\ coins\ total
comment2.target=GameOverScreen(int,\ int,\ int)
comment3.params=title\ prefix\ score
comment3.target=void\ makeScoreImage(java.lang.String,\ java.lang.String,\ int)
-comment3.text=\r\n\ Make\ the\ score\ board\ image.\r\n
+comment3.text=\n\ Make\ the\ score\ board\ image.\n
comment4.params=title\ prefix\ coins
comment4.target=void\ makeCoinImage(java.lang.String,\ java.lang.String,\ int)
comment5.params=title\ prefix\ total
View
2  Ground.ctxt
@@ -1,5 +1,5 @@
#BlueJ class context
comment0.params=
comment0.target=void\ act()
-comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ Ground\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment0.text=\n\ Act\ -\ do\ whatever\ the\ Ground\ wants\ to\ do.\ This\ method\ is\ called\ whenever\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\n
numComments=1
View
BIN  HighScoreWorld.class
Binary file not shown
View
4 MovingBrickLeft.ctxt
@@ -1,12 +1,12 @@
#BlueJ class context
comment0.params=leftT\ rightT
comment0.target=MovingBrickLeft(int,\ int)
-comment0.text=\r\n\ Move\ in\ the\ direction\ we\ are\ currently\ moving\ in.\ Turn\ if\ we\ reach\ a\ turning\ point.\r\n
+comment0.text=\n\ Move\ in\ the\ direction\ we\ are\ currently\ moving\ in.\ Turn\ if\ we\ reach\ a\ turning\ point.\n
comment1.params=
comment1.target=void\ act()
comment2.params=
comment2.target=boolean\ atTurningPoint()
-comment2.text=\r\n\ Test\ if\ we\ are\ at\ one\ of\ the\ turning\ points.\r\n
+comment2.text=\n\ Test\ if\ we\ are\ at\ one\ of\ the\ turning\ points.\n
comment3.params=
comment3.target=int\ getMovingBrickLeftSpeed()
numComments=4
View
4 MovingBrickRight.ctxt
@@ -1,12 +1,12 @@
#BlueJ class context
comment0.params=leftT\ rightT
comment0.target=MovingBrickRight(int,\ int)
-comment0.text=\r\n\ Move\ in\ the\ direction\ we\ are\ currently\ moving\ in.\ Turn\ if\ we\ reach\ a\ turning\ point.\r\n
+comment0.text=\n\ Move\ in\ the\ direction\ we\ are\ currently\ moving\ in.\ Turn\ if\ we\ reach\ a\ turning\ point.\n
comment1.params=
comment1.target=void\ act()
comment2.params=
comment2.target=boolean\ atTurningPoint()
-comment2.text=\r\n\ Test\ if\ we\ are\ at\ one\ of\ the\ turning\ points.\r\n
+comment2.text=\n\ Test\ if\ we\ are\ at\ one\ of\ the\ turning\ points.\n
comment3.params=
comment3.target=int\ getMovingBrickRightSpeed()
numComments=4
View
4 MovingBrickUp.ctxt
@@ -1,12 +1,12 @@
#BlueJ class context
comment0.params=topT\ bottomT
comment0.target=MovingBrickUp(int,\ int)
-comment0.text=\r\n\ Move\ in\ the\ direction\ we\ are\ currently\ moving\ in.\ Turn\ if\ we\ reach\ a\ turning\ point.\r\n
+comment0.text=\n\ Move\ in\ the\ direction\ we\ are\ currently\ moving\ in.\ Turn\ if\ we\ reach\ a\ turning\ point.\n
comment1.params=
comment1.target=void\ act()
comment2.params=
comment2.target=boolean\ atTurningPoint()
-comment2.text=\r\n\ Test\ if\ we\ are\ at\ one\ of\ the\ turning\ points.\r\n
+comment2.text=\n\ Test\ if\ we\ are\ at\ one\ of\ the\ turning\ points.\n
comment3.params=
comment3.target=int\ getMovingBrickUpSpeed()
numComments=4
View
BIN  Obstacles$GifDecoder.class
Binary file not shown
View
10 Obstacles.ctxt
@@ -1,17 +1,17 @@
#BlueJ class context
comment0.params=file
comment0.target=void\ setImage(java.lang.String)
-comment0.text=\r\n\ Set\ the\ image\ of\ the\ actor.\ If\ the\ image\ is\ a\ normal\ picture,\ it\ will\ be\ displayed\ as\ normal.\r\n\ If\ it's\ an\ animated\ GIF\ file\ then\ it\ will\ be\ displayed\ as\ an\ animated\ actor.\r\n\ @overrides\ setImage\ in\ Actor.\r\n
+comment0.text=\n\ Set\ the\ image\ of\ the\ actor.\ If\ the\ image\ is\ a\ normal\ picture,\ it\ will\ be\ displayed\ as\ normal.\n\ If\ it's\ an\ animated\ GIF\ file\ then\ it\ will\ be\ displayed\ as\ an\ animated\ actor.\n\ @overrides\ setImage\ in\ Actor.\n
comment1.params=
comment1.target=java.util.List\ getImages()
-comment1.text=\r\n\ Get\ all\ the\ images\ used\ in\ the\ animation\r\n\ @return\ a\ list\ of\ GreenfootImages,\ corresponding\ to\ each\ frame.\r\n
+comment1.text=\n\ Get\ all\ the\ images\ used\ in\ the\ animation\n\ @return\ a\ list\ of\ GreenfootImages,\ corresponding\ to\ each\ frame.\n
comment2.params=
comment2.target=void\ act()
-comment2.text=\r\n\ Move\ onto\ the\ next\ frame\ if\ the\ time\ for\ the\ current\ frame\ has\ expired.\r\n
+comment2.text=\n\ Move\ onto\ the\ next\ frame\ if\ the\ time\ for\ the\ current\ frame\ has\ expired.\n
comment3.params=
comment3.target=void\ nextFrame()
-comment3.text=\r\n\ Advance\ to\ the\ next\ frame\ in\ the\ animation.\r\n
+comment3.text=\n\ Advance\ to\ the\ next\ frame\ in\ the\ animation.\n
comment4.params=
comment4.target=void\ loadImages()
-comment4.text=\r\n\ Load\ the\ images\r\n
+comment4.text=\n\ Load\ the\ images\n
numComments=5
View
BIN  Player.class
Binary file not shown
View
4 Player.ctxt
@@ -1,6 +1,6 @@
#BlueJ class context
-comment0.params=speed
-comment0.target=Player(int)
+comment0.params=
+comment0.target=Player()
comment1.params=
comment1.target=void\ act()
comment10.params=
View
4 Player.java
@@ -23,9 +23,9 @@
protected GreenfootImage image8;
- public Player(int speed) {
+ public Player() {
this.initialSpeed = speed;
- this.speed = speed;
+ this.speed = 5;
//super(6);
getImage().scale(40, 40);
View
BIN  SkyscraperWorld.class
Binary file not shown
View
8 SkyscraperWorld.java
@@ -22,11 +22,13 @@
public SkyscraperWorld() {
super(80, 80, 10);
currentLevel = 1;
+
+ player = new Player();
+
levelCompletePoints = loadLevel(currentLevel);
//backgroundMusic.playLoop();
- setPaintOrder(GameOverScreen.class, /*Overlay.class,*/ Counter.class, MenuBar.class, MovingWater.class, Player.class, Coin.class, Surface.class);
-
+ setPaintOrder(GameOverScreen.class, /*Overlay.class,*/ Counter.class, MenuBar.class, MovingWater.class, Player.class, Coin.class, Surface.class);
/**General stuff**/
@@ -34,8 +36,6 @@ public SkyscraperWorld() {
addObject(new MenuBar(), 39, 75);
- player = new Player();
-
scoreCounter = new Counter("Score: ");
addObject(scoreCounter, 6, 74);
}
View
2  Surface.ctxt
@@ -1,5 +1,5 @@
#BlueJ class context
comment0.params=
comment0.target=void\ act()
-comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ Surface\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n
+comment0.text=\n\ Act\ -\ do\ whatever\ the\ Surface\ wants\ to\ do.\ This\ method\ is\ called\ whenever\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\n
numComments=1
View
360 project.greenfoot
@@ -1,11 +1,11 @@
#Greenfoot project file
+=\=\=\=\=\=\=
+<<<<<<<=HEAD
+>>>>>>>=0138834689668b09cd6bfe2f83100da050e4b8d6
class.Brick.image=SCHOTconcrete.png
class.Brick.superclass=Surface
-<<<<<<< HEAD
-=======
class.Citizen.image=BURGERvoor1.png
class.Citizen.superclass=Player
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
class.Coin.image=coin.png
class.Coin.superclass=greenfoot.Actor
class.Counter.superclass=greenfoot.Actor
@@ -14,38 +14,34 @@ class.Game.superclass=
class.GameOverScreen.image=GameOverScreen.png
class.GameOverScreen.superclass=greenfoot.Actor
class.GameOverWorld.superclass=greenfoot.World
-<<<<<<< HEAD
-=======
class.Genius.image=GENIEvoor1.png
class.Genius.superclass=Player
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
class.Ground.image=SCHOTiron.png
class.Ground.superclass=Surface
class.HighScore.superclass=
class.HighScoreWorld.superclass=greenfoot.World
class.MenuBar.image=menubalk.png
class.MenuBar.superclass=greenfoot.Actor
-<<<<<<< HEAD
-class.MovingBrickLeft.image=SCHOTconcrete.png
-class.MovingBrickLeft.superclass=Surface
-class.MovingBrickRight.image=SCHOTconcrete.png
-class.MovingBrickRight.superclass=Surface
-=======
class.MovingBrick.image=SCHOTconcrete.png
class.MovingBrick.superclass=Surface
class.MovingBrick2.image=SCHOTconcrete.png
class.MovingBrick2.superclass=Surface
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
+class.MovingBrickLeft.image=SCHOTconcrete.png
+class.MovingBrickLeft.superclass=Surface
+class.MovingBrickRight.image=SCHOTconcrete.png
+class.MovingBrickRight.superclass=Surface
class.MovingBrickUp.image=SCHOTconcrete.png
class.MovingBrickUp.superclass=Surface
class.MovingWater.image=wet-blue.jpg
class.MovingWater.superclass=greenfoot.Actor
class.Obstacles.superclass=greenfoot.Actor
-<<<<<<< HEAD
class.Player.image=POLITIEvoor1.png
class.Player.superclass=greenfoot.Actor
+class.Police.image=POLITIEvoor1.png
+class.Police.superclass=Player
class.SkyscraperWorld.image=rivets.jpg
class.SkyscraperWorld.superclass=greenfoot.World
+class.SkyscraperWorldMenu.superclass=greenfoot.World
class.Surface.image=menubalk.png
class.Surface.superclass=greenfoot.Actor
dependency1.from=Player
@@ -61,145 +57,64 @@ dependency12.from=SkyscraperWorld
dependency12.to=Brick
dependency12.type=UsesDependency
dependency13.from=SkyscraperWorld
-dependency13.to=MovingBrickRight
+dependency13.to=Surface
dependency13.type=UsesDependency
-dependency14.from=MovingBrickRight
-dependency14.to=Player
+dependency14.from=SkyscraperWorld
+dependency14.to=MovingWater
dependency14.type=UsesDependency
dependency15.from=SkyscraperWorld
-dependency15.to=Surface
+dependency15.to=MovingBrickUp
dependency15.type=UsesDependency
-dependency16.from=SkyscraperWorld
-dependency16.to=MovingWater
+dependency16.from=HighScore
+dependency16.to=Game
dependency16.type=UsesDependency
-dependency17.from=Player
-dependency17.to=MovingBrickRight
+dependency17.from=HighScoreWorld
+dependency17.to=Game
dependency17.type=UsesDependency
-dependency18.from=SkyscraperWorld
-dependency18.to=MovingBrickLeft
+dependency18.from=HighScoreWorld
+dependency18.to=HighScore
dependency18.type=UsesDependency
-dependency19.from=SkyscraperWorld
-dependency19.to=MovingBrickUp
+dependency19.from=GameOverWorld
+dependency19.to=Game
dependency19.type=UsesDependency
dependency2.from=Player
dependency2.to=Coin
dependency2.type=UsesDependency
-dependency20.from=HighScore
-dependency20.to=Game
+dependency20.from=GameOverWorld
+dependency20.to=HighScoreWorld
dependency20.type=UsesDependency
-dependency21.from=HighScoreWorld
-dependency21.to=Game
+dependency21.from=SkyscraperWorld
+dependency21.to=HighScore
dependency21.type=UsesDependency
-dependency22.from=HighScoreWorld
-dependency22.to=HighScore
+dependency22.from=SkyscraperWorld
+dependency22.to=GameOverWorld
dependency22.type=UsesDependency
-dependency23.from=GameOverWorld
+dependency23.from=SkyscraperWorld
dependency23.to=Game
dependency23.type=UsesDependency
-dependency24.from=GameOverWorld
+dependency24.from=SkyscraperWorld
dependency24.to=HighScoreWorld
dependency24.type=UsesDependency
-dependency25.from=SkyscraperWorld
+dependency25.from=GameOverWorld
dependency25.to=HighScore
dependency25.type=UsesDependency
-dependency26.from=SkyscraperWorld
-dependency26.to=GameOverWorld
+dependency26.from=Player
+dependency26.to=MovingBrickLeft
dependency26.type=UsesDependency
-dependency27.from=SkyscraperWorld
-dependency27.to=Game
+dependency27.from=Player
+dependency27.to=MovingBrickRight
dependency27.type=UsesDependency
-dependency28.from=SkyscraperWorld
-dependency28.to=HighScoreWorld
+dependency28.from=Player
+dependency28.to=MovingBrickUp
dependency28.type=UsesDependency
-dependency29.from=Player
-dependency29.to=MovingBrickLeft
+dependency29.from=SkyscraperWorld
+dependency29.to=MovingBrickRight
dependency29.type=UsesDependency
dependency3.from=SkyscraperWorld
dependency3.to=Counter
dependency3.type=UsesDependency
-dependency30.from=Player
-dependency30.to=MovingBrickUp
-=======
-class.Player.superclass=greenfoot.Actor
-class.Police.image=POLITIEvoor1.png
-class.Police.superclass=Player
-class.SkyscraperWorld.image=rivets.jpg
-class.SkyscraperWorld.superclass=greenfoot.World
-class.SkyscraperWorldMenu.superclass=greenfoot.World
-class.Surface.image=menubalk.png
-class.Surface.superclass=greenfoot.Actor
-dependency1.from=Player
-dependency1.to=Citizen
-dependency1.type=UsesDependency
-dependency10.from=SkyscraperWorld
-dependency10.to=GameOverScreen
-dependency10.type=UsesDependency
-dependency11.from=SkyscraperWorldMenu
-dependency11.to=SkyscraperWorld
-dependency11.type=UsesDependency
-dependency12.from=SkyscraperWorldMenu
-dependency12.to=Player
-dependency12.type=UsesDependency
-dependency13.from=Player
-dependency13.to=Enemy
-dependency13.type=UsesDependency
-dependency14.from=Player
-dependency14.to=Surface
-dependency14.type=UsesDependency
-dependency15.from=SkyscraperWorld
-dependency15.to=Enemy
-dependency15.type=UsesDependency
-dependency16.from=SkyscraperWorld
-dependency16.to=Ground
-dependency16.type=UsesDependency
-dependency17.from=SkyscraperWorld
-dependency17.to=Brick
-dependency17.type=UsesDependency
-dependency18.from=SkyscraperWorld
-dependency18.to=MovingBrick
-dependency18.type=UsesDependency
-dependency19.from=MovingBrick
-dependency19.to=Player
-dependency19.type=UsesDependency
-dependency2.from=Player
-dependency2.to=Police
-dependency2.type=UsesDependency
-dependency20.from=SkyscraperWorld
-dependency20.to=Surface
-dependency20.type=UsesDependency
-dependency21.from=SkyscraperWorld
-dependency21.to=MovingWater
-dependency21.type=UsesDependency
-dependency22.from=Player
-dependency22.to=MovingBrick
-dependency22.type=UsesDependency
-dependency23.from=SkyscraperWorld
-dependency23.to=MovingBrick2
-dependency23.type=UsesDependency
-dependency24.from=SkyscraperWorld
-dependency24.to=MovingBrickUp
-dependency24.type=UsesDependency
-dependency25.from=HighScore
-dependency25.to=Game
-dependency25.type=UsesDependency
-dependency26.from=HighScoreWorld
-dependency26.to=Game
-dependency26.type=UsesDependency
-dependency27.from=HighScoreWorld
-dependency27.to=HighScore
-dependency27.type=UsesDependency
-dependency28.from=GameOverWorld
-dependency28.to=Game
-dependency28.type=UsesDependency
-dependency29.from=GameOverWorld
-dependency29.to=HighScoreWorld
-dependency29.type=UsesDependency
-dependency3.from=Player
-dependency3.to=Genius
-dependency3.type=UsesDependency
dependency30.from=SkyscraperWorld
-dependency30.to=HighScore
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
+dependency30.to=MovingBrickLeft
dependency30.type=UsesDependency
dependency31.from=SkyscraperWorld
dependency31.to=GameOverWorld
@@ -210,9 +125,8 @@ dependency32.type=UsesDependency
dependency33.from=SkyscraperWorld
dependency33.to=HighScoreWorld
dependency33.type=UsesDependency
-<<<<<<< HEAD
-dependency34.from=Player
-dependency34.to=MovingBrickLeft
+dependency34.from=GameOverWorld
+dependency34.to=HighScore
dependency34.type=UsesDependency
dependency35.from=Player
dependency35.to=MovingBrickUp
@@ -235,45 +149,14 @@ dependency8.type=UsesDependency
dependency9.from=Player
dependency9.to=Surface
dependency9.type=UsesDependency
-mainWindow.height=1040
-mainWindow.width=1296
-mainWindow.x=-1288
-mainWindow.y=-8
-package.numDependencies=30
-package.numTargets=19
-project.charset=UTF-8
-simulation.speed=42
-=======
-dependency34.from=GameOverWorld
-dependency34.to=HighScore
-dependency34.type=UsesDependency
-dependency4.from=Player
-dependency4.to=SkyscraperWorld
-dependency4.type=UsesDependency
-dependency5.from=Player
-dependency5.to=Coin
-dependency5.type=UsesDependency
-dependency6.from=SkyscraperWorld
-dependency6.to=Counter
-dependency6.type=UsesDependency
-dependency7.from=SkyscraperWorld
-dependency7.to=Player
-dependency7.type=UsesDependency
-dependency8.from=SkyscraperWorld
-dependency8.to=MenuBar
-dependency8.type=UsesDependency
-dependency9.from=SkyscraperWorld
-dependency9.to=Coin
-dependency9.type=UsesDependency
mainWindow.height=774
mainWindow.width=1118
mainWindow.x=1
mainWindow.y=22
-package.numDependencies=34
-package.numTargets=23
+package.numDependencies=30
+package.numTargets=19
project.charset=UTF-8
simulation.speed=40
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target1.editor.height=700
target1.editor.width=900
target1.editor.x=40
@@ -287,15 +170,9 @@ target1.width=80
target1.x=10
target1.y=370
target10.editor.height=744
-<<<<<<< HEAD
-target10.editor.width=1382
-target10.editor.x=-8
-target10.editor.y=-8
-=======
target10.editor.width=1280
target10.editor.x=0
target10.editor.y=22
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target10.height=50
target10.name=SkyscraperWorld
target10.naviview.expanded=false
@@ -307,7 +184,6 @@ target10.y=70
target11.editor.height=700
target11.editor.width=900
target11.editor.x=40
-<<<<<<< HEAD
target11.editor.y=42
target11.height=50
target11.name=GameOverWorld
@@ -317,32 +193,16 @@ target11.type=ClassTarget
target11.width=120
target11.x=100
target11.y=610
-=======
-target11.editor.y=20
-target11.height=50
-target11.name=SkyscraperWorldMenu
-target11.naviview.expanded=false
-target11.showInterface=false
-target11.type=ClassTarget
-target11.width=160
-target11.x=10
-target11.y=130
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target12.editor.height=700
target12.editor.width=900
target12.editor.x=40
target12.editor.y=20
target12.height=50
-<<<<<<< HEAD
target12.name=MenuBar
-=======
-target12.name=Genius
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target12.naviview.expanded=false
target12.showInterface=false
target12.type=ClassTarget
target12.width=80
-<<<<<<< HEAD
target12.x=200
target12.y=190
target13.editor.height=700
@@ -357,49 +217,23 @@ target13.type=ClassTarget
target13.width=110
target13.x=10
target13.y=430
-=======
-target12.x=180
-target12.y=130
-target13.editor.height=700
-target13.editor.width=900
-target13.editor.x=40
-target13.editor.y=42
-target13.height=50
-target13.name=GameOverWorld
-target13.naviview.expanded=false
-target13.showInterface=false
-target13.type=ClassTarget
-target13.width=120
-target13.x=100
-target13.y=610
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target14.editor.height=700
target14.editor.width=900
target14.editor.x=40
target14.editor.y=20
target14.height=50
-<<<<<<< HEAD
target14.name=Brick
-=======
-target14.name=Citizen
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target14.naviview.expanded=false
target14.showInterface=false
target14.type=ClassTarget
target14.width=80
-<<<<<<< HEAD
target14.x=190
target14.y=430
-=======
-target14.x=10
-target14.y=190
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target15.editor.height=700
target15.editor.width=900
target15.editor.x=40
target15.editor.y=20
target15.height=50
-<<<<<<< HEAD
target15.name=Surface
target15.naviview.expanded=false
target15.showInterface=false
@@ -407,64 +241,35 @@ target15.type=AbstractTarget
target15.width=80
target15.x=100
target15.y=370
-=======
-target15.name=MenuBar
-target15.naviview.expanded=false
-target15.showInterface=false
-target15.type=ClassTarget
-target15.width=80
-target15.x=200
-target15.y=190
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target16.editor.height=700
target16.editor.width=900
target16.editor.x=40
-target16.editor.y=20
+target16.editor.y=42
target16.height=50
-<<<<<<< HEAD
target16.name=MovingBrickRight
target16.naviview.expanded=false
target16.showInterface=false
target16.type=ClassTarget
-target16.width=120
-target16.x=10
-target16.y=490
-=======
-target16.name=MovingBrickUp
-target16.naviview.expanded=false
-target16.showInterface=false
-target16.type=ClassTarget
-target16.width=110
-target16.x=10
-target16.y=430
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
+target16.width=130
+target16.x=150
+target16.y=130
target17.editor.height=700
target17.editor.width=900
target17.editor.x=40
target17.editor.y=20
target17.height=50
-<<<<<<< HEAD
target17.name=Coin
-=======
-target17.name=Brick
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target17.naviview.expanded=false
target17.showInterface=false
target17.type=ClassTarget
target17.width=80
-<<<<<<< HEAD
target17.x=10
target17.y=250
-=======
-target17.x=190
-target17.y=430
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target18.editor.height=700
target18.editor.width=900
target18.editor.x=40
target18.editor.y=20
target18.height=50
-<<<<<<< HEAD
target18.name=GameOverScreen
target18.naviview.expanded=false
target18.showInterface=false
@@ -472,21 +277,11 @@ target18.type=ClassTarget
target18.width=130
target18.x=100
target18.y=250
-=======
-target18.name=Surface
-target18.naviview.expanded=false
-target18.showInterface=false
-target18.type=AbstractTarget
-target18.width=80
-target18.x=100
-target18.y=370
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target19.editor.height=700
target19.editor.width=900
target19.editor.x=40
target19.editor.y=20
target19.height=50
-<<<<<<< HEAD
target19.name=Obstacles
target19.naviview.expanded=false
target19.showInterface=false
@@ -494,15 +289,6 @@ target19.type=AbstractTarget
target19.width=80
target19.x=10
target19.y=310
-=======
-target19.name=Coin
-target19.naviview.expanded=false
-target19.showInterface=false
-target19.type=ClassTarget
-target19.width=80
-target19.x=10
-target19.y=250
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target2.editor.height=700
target2.editor.width=900
target2.editor.x=0
@@ -520,15 +306,6 @@ target20.editor.width=900
target20.editor.x=40
target20.editor.y=20
target20.height=50
-<<<<<<< HEAD
-target20.name=Coin
-target20.naviview.expanded=false
-target20.showInterface=false
-target20.type=ClassTarget
-target20.width=80
-target20.x=10
-target20.y=250
-=======
target20.name=MovingBrick2
target20.naviview.expanded=false
target20.showInterface=false
@@ -536,7 +313,6 @@ target20.type=ClassTarget
target20.width=100
target20.x=10
target20.y=550
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target21.editor.height=700
target21.editor.width=900
target21.editor.x=40
@@ -575,24 +351,16 @@ target23.x=100
target23.y=310
target3.editor.height=700
target3.editor.width=900
-<<<<<<< HEAD
target3.editor.x=40
-target3.editor.y=20
+target3.editor.y=42
target3.height=50
target3.name=MovingBrickLeft
-=======
-target3.editor.x=0
-target3.editor.y=22
-target3.height=50
-target3.name=HighScoreWorld
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target3.naviview.expanded=false
target3.showInterface=false
target3.type=ClassTarget
-target3.width=120
-<<<<<<< HEAD
+target3.width=130
target3.x=10
-target3.y=550
+target3.y=120
target4.editor.height=700
target4.editor.width=900
target4.editor.x=0
@@ -606,38 +374,14 @@ target4.width=120
target4.x=120
target4.y=550
target5.editor.height=744
-target5.editor.width=1382
-target5.editor.x=-8
-target5.editor.y=-8
-=======
-target3.x=120
-target3.y=550
-target4.editor.height=700
-target4.editor.width=900
-target4.editor.x=40
-target4.editor.y=20
-target4.height=50
-target4.name=MovingBrick
-target4.naviview.expanded=false
-target4.showInterface=false
-target4.type=ClassTarget
-target4.width=90
-target4.x=10
-target4.y=490
-target5.editor.height=744
target5.editor.width=1280
target5.editor.x=0
target5.editor.y=22
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target5.height=50
target5.name=Player
target5.naviview.expanded=false
target5.showInterface=false
-<<<<<<< HEAD
target5.type=ClassTarget
-=======
-target5.type=AbstractTarget
->>>>>>> 0138834689668b09cd6bfe2f83100da050e4b8d6
target5.width=80
target5.x=170
target5.y=10
@@ -690,4 +434,4 @@ target9.width=100
target9.x=110
target9.y=490
version=2.4.0
-world.lastInstantiated=SkyscraperWorldMenu
+world.lastInstantiated=SkyscraperWorld
Please sign in to comment.
Something went wrong with that request. Please try again.