0.1 Merge #85
					 1 changed files with 2 additions and 2 deletions
				
			
		|  | @ -75,13 +75,13 @@ class NPC(Objects): | |||
|             self.conversation.draw(screen) | ||||
|      | ||||
|     def update(self, keys, objects):  | ||||
|         if self.lastUpdate + 150 < pg.time.get_ticks(): | ||||
|         if  self.lastUpdate + 150 < pg.time.get_ticks(): | ||||
|             if self.talking: | ||||
|                 self.conversation.update(keys, objects) | ||||
|                 self.lastUpdate = pg.time.get_ticks() | ||||
|             else: | ||||
|                 touches = pg.sprite.spritecollideany(self, objects[0]) | ||||
|                 if touches is not None and keys[pg.K_f] and isinstance(touches, MainCharacter): | ||||
|                 if touches is not None and keys[pg.K_SPACE] and isinstance(touches, MainCharacter): | ||||
|                     self.talk(objects)  | ||||
|                     self.lastUpdate = pg.time.get_ticks() | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue