mirror of
				https://github.com/mightypanders/GMTKJam2021.git
				synced 2025-11-04 02:59:50 +01:00 
			
		
		
		
	Merge branch 'main' of https://github.com/mightypanders/GMTKJam2021
This commit is contained in:
		
							
								
								
									
										1
									
								
								World.gd
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								World.gd
									
									
									
									
									
								
							@@ -59,6 +59,7 @@ func create_new_guest():
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func _on_Playa_scored(value:int):
 | 
					func _on_Playa_scored(value:int):
 | 
				
			||||||
 | 
						spawn_tries = 0
 | 
				
			||||||
	print('Its a score of %s'% String(value))
 | 
						print('Its a score of %s'% String(value))
 | 
				
			||||||
	player_score += value
 | 
						player_score += value
 | 
				
			||||||
	money_label.update_text(player_score)
 | 
						money_label.update_text(player_score)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
[gd_scene load_steps=90 format=2]
 | 
					[gd_scene load_steps=91 format=2]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[ext_resource path="res://assets/city_tiles/Street.png" type="Texture" id=1]
 | 
					[ext_resource path="res://assets/city_tiles/Street.png" type="Texture" id=1]
 | 
				
			||||||
[ext_resource path="res://assets/city_tiles/Buildings.png" type="Texture" id=2]
 | 
					[ext_resource path="res://assets/city_tiles/Buildings.png" type="Texture" id=2]
 | 
				
			||||||
@@ -1072,6 +1072,7 @@ autostart = true
 | 
				
			|||||||
position = Vector2( 337.119, 100.387 )
 | 
					position = Vector2( 337.119, 100.387 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[node name="GUI" parent="." instance=ExtResource( 33 )]
 | 
					[node name="GUI" parent="." instance=ExtResource( 33 )]
 | 
				
			||||||
 | 
					margin_bottom = 80.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[connection signal="scored" from="Playa" to="." method="_on_Playa_scored"]
 | 
					[connection signal="scored" from="Playa" to="." method="_on_Playa_scored"]
 | 
				
			||||||
[connection signal="timeout" from="GuestTimer" to="." method="_on_GuestTimer_timeout"]
 | 
					[connection signal="timeout" from="GuestTimer" to="." method="_on_GuestTimer_timeout"]
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										34
									
								
								assets/ui/bg.png.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								assets/ui/bg.png.import
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,34 @@
 | 
				
			|||||||
 | 
					[remap]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					importer="texture"
 | 
				
			||||||
 | 
					type="StreamTexture"
 | 
				
			||||||
 | 
					path="res://.import/bg.png-daa4f12a72b2bebe48ad6bf555201289.stex"
 | 
				
			||||||
 | 
					metadata={
 | 
				
			||||||
 | 
					"vram_texture": false
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[deps]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					source_file="res://assets/ui/bg.png"
 | 
				
			||||||
 | 
					dest_files=[ "res://.import/bg.png-daa4f12a72b2bebe48ad6bf555201289.stex" ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[params]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					compress/mode=0
 | 
				
			||||||
 | 
					compress/lossy_quality=0.7
 | 
				
			||||||
 | 
					compress/hdr_mode=0
 | 
				
			||||||
 | 
					compress/bptc_ldr=0
 | 
				
			||||||
 | 
					compress/normal_map=0
 | 
				
			||||||
 | 
					flags/repeat=0
 | 
				
			||||||
 | 
					flags/filter=true
 | 
				
			||||||
 | 
					flags/mipmaps=false
 | 
				
			||||||
 | 
					flags/anisotropic=false
 | 
				
			||||||
 | 
					flags/srgb=2
 | 
				
			||||||
 | 
					process/fix_alpha_border=true
 | 
				
			||||||
 | 
					process/premult_alpha=false
 | 
				
			||||||
 | 
					process/HDR_as_SRGB=false
 | 
				
			||||||
 | 
					process/invert_color=false
 | 
				
			||||||
 | 
					stream=false
 | 
				
			||||||
 | 
					size_limit=0
 | 
				
			||||||
 | 
					detect_3d=true
 | 
				
			||||||
 | 
					svg/scale=1.0
 | 
				
			||||||
							
								
								
									
										34
									
								
								assets/ui/coin.png.import
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								assets/ui/coin.png.import
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,34 @@
 | 
				
			|||||||
 | 
					[remap]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					importer="texture"
 | 
				
			||||||
 | 
					type="StreamTexture"
 | 
				
			||||||
 | 
					path="res://.import/coin.png-d9debef27353ce88915cf147748ea67d.stex"
 | 
				
			||||||
 | 
					metadata={
 | 
				
			||||||
 | 
					"vram_texture": false
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[deps]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					source_file="res://assets/ui/coin.png"
 | 
				
			||||||
 | 
					dest_files=[ "res://.import/coin.png-d9debef27353ce88915cf147748ea67d.stex" ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[params]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					compress/mode=0
 | 
				
			||||||
 | 
					compress/lossy_quality=0.7
 | 
				
			||||||
 | 
					compress/hdr_mode=0
 | 
				
			||||||
 | 
					compress/bptc_ldr=0
 | 
				
			||||||
 | 
					compress/normal_map=0
 | 
				
			||||||
 | 
					flags/repeat=0
 | 
				
			||||||
 | 
					flags/filter=true
 | 
				
			||||||
 | 
					flags/mipmaps=false
 | 
				
			||||||
 | 
					flags/anisotropic=false
 | 
				
			||||||
 | 
					flags/srgb=2
 | 
				
			||||||
 | 
					process/fix_alpha_border=true
 | 
				
			||||||
 | 
					process/premult_alpha=false
 | 
				
			||||||
 | 
					process/HDR_as_SRGB=false
 | 
				
			||||||
 | 
					process/invert_color=false
 | 
				
			||||||
 | 
					stream=false
 | 
				
			||||||
 | 
					size_limit=0
 | 
				
			||||||
 | 
					detect_3d=true
 | 
				
			||||||
 | 
					svg/scale=1.0
 | 
				
			||||||
		Reference in New Issue
	
	Block a user