Compare commits
	
		
			No commits in common. "f21d9803521ebc5cd7498f8da00c330b38a1eec7" and "b3c7d879269422be9738f73ebffbf45a45eb2678" have entirely different histories.
		
	
	
		
			f21d980352
			...
			b3c7d87926
		
	
		
					 1 changed files with 387 additions and 387 deletions
				
			
		
							
								
								
									
										10
									
								
								viecher.py
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								viecher.py
									
										
									
									
									
								
							|  | @ -44,7 +44,7 @@ class Objects(): | |||
|         self.name = name | ||||
|         self.speed = ms | ||||
|         with open(f'art/images/{sprite}') as i: | ||||
|             self.sprite = pg.transform.scale2x(pg.image.load(i)) | ||||
|             self.sprite = pg.image.load(i) | ||||
|         self.x = x | ||||
|         self.y = y | ||||
|         self.hidden = False | ||||
|  | @ -59,9 +59,9 @@ class Objects(): | |||
| 
 | ||||
| class NPC(Objects): | ||||
|     def __init__(self, name, ms, sprite, convo_act, x, y) -> None: | ||||
|         super().__init__(name, ms, sprite, x, y) | ||||
|         self.talking = False | ||||
|         self.hidden = False | ||||
|         self.hidden = True | ||||
|         super().__init__(name, ms, sprite, x, y) | ||||
|         self.conversation = Convo('Hello, you can shoot fireballs with f now.', convo_act, 'person') | ||||
|      | ||||
|     def talk(self, objects): | ||||
|  | @ -71,7 +71,7 @@ class NPC(Objects): | |||
|      | ||||
|     def draw(self, screen): | ||||
|         super().draw(screen) | ||||
|         if self.talking: | ||||
|         if self.talking == True: | ||||
|             self.conversation.draw(screen) | ||||
|      | ||||
|     def update(self, keys, objects): | ||||
|  | @ -336,7 +336,7 @@ class Weapons(Objects): | |||
|         pos = vec(1,0) | ||||
|         angle = pos.angle_to(moveto) | ||||
|         with open(f'art/images/{sprite}') as i: | ||||
|             self.sprite = pg.transform.scale2x(pg.transform.rotate(pg.image.load(i), -angle)) | ||||
|             self.sprite = pg.transform.rotate(pg.image.load(i), -angle) | ||||
|      | ||||
|     def die(self, objects, kills): | ||||
|         touches = pg.sprite.spritecollideany(self, objects[0] + objects[1]) | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue