forked from InfoProjekt/game
		
	Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
This commit is contained in:
		
						commit
						690a00b718
					
				
					 2 changed files with 439 additions and 439 deletions
				
			
		|  | @ -522,7 +522,7 @@ class Convo(Label): | ||||||
|                         for i in range(0,5): |                         for i in range(0,5): | ||||||
|                             objects[1].append(Rat('rat', random.randint(150,250), 800, 400+i*20, 1, 1, 1, 100, 25)) |                             objects[1].append(Rat('rat', random.randint(150,250), 800, 400+i*20, 1, 1, 1, 100, 25)) | ||||||
|                     elif convo[1] == 1: |                     elif convo[1] == 1: | ||||||
|                         objects[0][0].level.level = 50 |                         objects[0][0].level.level = 5 | ||||||
|                         while 'rat' in objects[0][0].killed: objects[0][0].killed.remove('rat') |                         while 'rat' in objects[0][0].killed: objects[0][0].killed.remove('rat') | ||||||
|                 elif convo[0] == 'elder': |                 elif convo[0] == 'elder': | ||||||
|                     if convo[1] == 0: |                     if convo[1] == 0: | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								main.py
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								main.py
									
										
									
									
									
								
							|  | @ -111,7 +111,7 @@ def play(screen, clock, running, background, isblack, WIDTH, HEIGHT): | ||||||
|                         play(screen, clock, running, background, isblack, WIDTH, HEIGHT) |                         play(screen, clock, running, background, isblack, WIDTH, HEIGHT) | ||||||
|                     elif 'door-' in result: |                     elif 'door-' in result: | ||||||
|                         target = result.split('-')[1] |                         target = result.split('-')[1] | ||||||
|                         objects[0][0].level.level += 25 |                         objects[0][0].level.level += 6.33 | ||||||
|                         objects = scene.update(target, objects) |                         objects = scene.update(target, objects) | ||||||
|                         #play(screen, clock, running, background, isblack, WIDTH, HEIGHT) |                         #play(screen, clock, running, background, isblack, WIDTH, HEIGHT) | ||||||
|                     else: |                     else: | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 SpagettiFisch
						SpagettiFisch