fixed issue #3

src/menu.py

@@ -84,7 +84,7 @@ class menu():
 				key = pygame.key.name(event.key)
 				if key == "escape":
 					pygame.mouse.set_visible(False)
-					return(["event.EXIT"])
+					return(["event.QUIT"])
 				if key == "return":
 					pygame.mouse.set_visible(False)
 					return(["event.CONTINUE"])
@@ -149,8 +149,6 @@ def main():
 		#Calling events and checking through events
 		events = main_menu.run()
 		for event in events:
-			if event == "event.EXIT":
-				settings.quit()
 			if event == "event.CONTINUE":
 				run = False
 			if event == "Start":
@@ -162,7 +160,7 @@ def main():
 				main_menu.update()
 			if event == "Credits":
 				namings.run()
-			if event == "Exit":
+			if event in ["Exit", "event.EXIT", "event.QUIT"]:
 				settings.quit()
 		pygame.display.flip()
 	sounds.music.play("next", 0)
@@ -205,7 +203,7 @@ def pause():
 			if event == "Settings":
 				options()
 				pause_menu.update()
-			if event in ["Exit", "event.EXIT"]:
+			if event in ["Exit", "event.EXIT", "event.QUIT"]:
 				main()
 				run = False
 		pygame.display.flip()
@@ -252,12 +250,11 @@ def choose_world():
 			if event in ["event.CONTINUE", "Warp"]:
 				sounds.music.play("unpause")
 				run = False
-			if event == "Return":
+			if event in ["Return", "event.QUIT"]:
 				selected = -1
 				run = False
-			if event in ["Exit", "event.EXIT"]:
-				main()
-				run = False
+			if event in ["event.EXIT"]:
+				settings.quit()
 			if event[0:5] == "world":
 				selected = event[5]
 			pygame.time.wait(128)

src/objects.py

@@ -305,13 +305,17 @@ class target():
 		self.kill_entity = False
 		self.inscreen = True
 		self.move(settings.player.pos.x, settings.player.pos.y)
+		self.test = 0
 
 	def update(self):
 		"""Adjusts position according to screen size"""
 		self.pos_x = self.pos_xper * float(settings.world.background_pos.w
 					- 20 - self.pos.w) + 10 + self.pos.w / 2.0
-		self.pos_y = self.pos_yper * float(settings.world.background_pos.w
-					- 20 - self.pos.h) + 10 + self.pos.w / 2.0
+		self.pos_y = self.pos_yper * float(settings.world.background_pos.h
+					- 20 - self.pos.h) + 10 + self.pos.h / 2.0
+		self.pos_x = self.pos_xper * float(settings.world.background_pos.w
+					- 20 - self.pos.w) + 10 + self.pos.w / 2.0
+		self.pos_y = self.pos_yper * ((settings.screeny_current - self.pos.h) * 2.0)
 
 	def move(self, x, y):
 		"""Moves rect according to playerposition"""
@@ -335,8 +339,8 @@ class target():
 	def test_ishit(self, bulletrect):
 		"""Tests if target got hit"""
 		if self.pos.colliderect(bulletrect) and not self.gothit:
-			self.pos_x -= self.explosion.get_Rect().w
-			self.pos_y -= self.explosion.get_Rect().h
+			self.pos_x -= self.explosion.getRect().w / 2.0
+			self.pos_y -= self.explosion.getRect().h / 2.0
 			self.explosion.play()
 			self.gothit = True
 

src/worlds.py

@@ -175,7 +175,7 @@ class world():
 		screen_current = (int(tmpx), int(tmpy))
 		background = pygame.image.load("./assets/sprites/Background2.tif").convert()
 		self.background = pygame.transform.smoothscale(background, screen_current)
-		self.background_pos = background.get_rect()
+		self.background_pos = self.background.get_rect()
 
 		tmp = -(settings.player.pos.x * (settings.screenx_current *
 					(settings.fake_size - 1)))