fin~ player damage, player death, slime damag,e slime death, custom resources. multiple levels

scenes/game.tscn

@@ -432,17 +432,6 @@ offset = Vector2(200, 350)
 [node name="SceneManager" type="Node2D" parent="." unique_id=1778809182]
 script = ExtResource("2_lbhrr")
 
-[node name="Player" parent="." unique_id=735255374 instance=ExtResource("4_iywne")]
-position = Vector2(594, 390)
-
-[node name="foreground" type="Parallax2D" parent="." unique_id=246559660]
-scroll_scale = Vector2(1.3, 1)
-repeat_size = Vector2(400, 0)
-
-[node name="Sprite2D" type="Sprite2D" parent="foreground" unique_id=1690720392]
-texture = ExtResource("5_dinhu")
-offset = Vector2(200, 340)
-
 [node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=374407051]
 texture_filter = 1
 tile_map_data = PackedByteArray("AAASAA0AAAAEAAAAAAAVAA0AAAAAAAAAAAAWAA0AAAABAAAAAAAXAA0AAAABAAAAAAAYAA0AAAAHAAQAAAAYAAwAAAAGAAMAAAAYAAsAAAAAAAAAAAAZAAsAAAABAAAAAAAZAAwAAAABAAIAAAAaAAwAAAACAAIAAAAaAAsAAAACAAAAAAAWAAkAAAACAAQAAAAVAAkAAAAAAAQAAAANABIAAAABAAAAAAAOABIAAAABAAAAAAAPABIAAAABAAAAAAAQABIAAAABAAAAAAARABIAAAABAAAAAAASABIAAAABAAAAAAATABIAAAABAAAAAAAUABIAAAABAAAAAAAVABIAAAABAAAAAAAWABIAAAABAAAAAAAXABIAAAABAAAAAAAYABIAAAABAAAAAAAZABIAAAABAAAAAAAaABIAAAABAAAAAAAbABIAAAAHAAEAAAAbABEAAAAAAAAAAAAcABEAAAACAAAAAAAcABIAAAACAAEAAAANABMAAAAHAAAAAAAOABMAAAAGAAEAAAAPABMAAAAHAAEAAAAQABMAAAAHAAAAAAAQABQAAAAKAAQAAAAPABQAAAAJAAQAAAAOABQAAAABAAIAAAANABQAAAAAAAIAAAARABMAAAAGAAAAAAASABMAAAAGAAAAAAATABMAAAAHAAAAAAASABQAAAAJAAQAAAARABQAAAAJAAQAAAAYABMAAAAGAAAAAAAZABMAAAAGAAAAAAAaABMAAAAGAAAAAAAaABQAAAABAAIAAAAbABMAAAAGAAAAAAAcABMAAAACAAIAAAAbABQAAAACAAIAAAAYABQAAAABAAIAAAAXABMAAAAHAAAAAAAWABMAAAAGAAAAAAAVABMAAAAGAAAAAAAVABQAAAABAAIAAAAUABMAAAAGAAAAAAAUABQAAAAJAAQAAAATABQAAAAKAAQAAAAWABQAAAABAAIAAAAXABQAAAABAAIAAAAZABQAAAABAAIAAAALABMAAAABAAIAAAAMABMAAAABAAIAAAAMABIAAAABAAAAAAALABIAAAABAAAAAAAKABIAAAABAAAAAAAKABMAAAABAAIAAAAJABMAAAAAAAIAAAAJABIAAAAQAAEAAAAIABIAAAAAAAIAAAAIABEAAAAAAAEAAAAJABEAAAACAAEAAAAIABAAAAAAAAEAAAAIAA8AAAAHAAAAAAAJAA8AAAACAAEAAAAJABAAAAACAAEAAAAIAA4AAAABAAAAAAAHAA8AAAAAAAIAAAAHAA4AAAAGAAQAAAAHAA0AAAAQAAMAAAAGAA0AAAAPAAQAAAAGAAwAAAAEAAEAAAAGAAsAAAAPAAMAAAAHAAsAAAABAAQAAAAIAAsAAAABAAQAAAAJAAsAAAAKAAQAAAAKAAsAAAACAAIAAAAKAAoAAAACAAAAAAAJAAoAAAAAAAAAAAANABAAAAACAAQAAAAMABAAAAABAAQAAAALABAAAAAAAAQAAAAVAAwAAQAAAAAAAAAYAAoAAQAAAAAAAAAZAAoAAQAAAAAAAAAIAA0AAQAAAAAAAAAJAAkAAQAAAAAAAAAWAAwAAgAAAAEAAAAWAAsAAgAAAAAAAAAbABAAAgAAAAEAAAAbAA8AAgAAAAAAAAAaABEAAQAAAAAAAAAYAA4AAAACAAIAAAAXAA4AAAABAAIAAAAWAA4AAAABAAIAAAAVAA4AAAAKAAQAAAAUAA4AAAABAAQAAAATAA4AAAABAAQAAAASAA4AAAAMAAQAAAARAA4AAAABAAQAAAAQAA4AAAABAAQAAAAPAA4AAAABAAQAAAAOAA4AAAABAAQAAAANAA4AAAABAAQAAAAMAA4AAAABAAQAAAALAA4AAAABAAQAAAAKAA4AAAABAAQAAAAJAA4AAAAJAAMAAAA=")
@@ -455,6 +444,9 @@ metadata/_edit_group_ = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D" unique_id=1634682333]
 shape = SubResource("RectangleShape2D_mvphy")
 
+[node name="Player" parent="." unique_id=735255374 instance=ExtResource("4_iywne")]
+position = Vector2(594, 390)
+
 [node name="StaticBody2D2" type="StaticBody2D" parent="." unique_id=958110307]
 position = Vector2(538, 582)
 metadata/_edit_group_ = true
@@ -471,6 +463,14 @@ position = Vector2(390, 541)
 position = Vector2(514, 502)
 effect = "teleport"
 
+[node name="foreground" type="Parallax2D" parent="." unique_id=246559660]
+scroll_scale = Vector2(1.3, 1)
+repeat_size = Vector2(400, 0)
+
+[node name="Sprite2D" type="Sprite2D" parent="foreground" unique_id=1690720392]
+texture = ExtResource("5_dinhu")
+offset = Vector2(200, 340)
+
 [node name="Crates" type="Node2D" parent="." unique_id=104104750]
 
 [node name="Crate" parent="Crates" unique_id=1367266345 instance=ExtResource("3_iywne")]
@@ -502,7 +502,7 @@ position = Vector2(518, 435)
 [node name="Slime" parent="Enemies" unique_id=1316034960 instance=ExtResource("14_trtic")]
 position = Vector2(719, 409)
 
-[node name="Slime2" parent="Enemies" unique_id=1271258942 instance=ExtResource("14_trtic")]
+[node name="Slime2" parent="Enemies" unique_id=495693402 instance=ExtResource("14_trtic")]
-position = Vector2(749, 408)
+position = Vector2(750, 409)
 
 [connection signal="areaTriggered" from="Triggers/Trigger" to="." method="_on_trigger"]

scenes/level2.tscn

@@ -434,7 +434,7 @@ script = ExtResource("4_wvb8j")
 
 [node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=374407051]
 texture_filter = 1
-tile_map_data = PackedByteArray("AAAVAA0AAAAAAAAAAAAWAA0AAAABAAAAAAAXAA0AAAABAAAAAAAYAA0AAAAHAAEAAAAYAAwAAAAAAAEAAAAYAAsAAAAAAAAAAAAZAAsAAAABAAAAAAAZAAwAAAAGAAAAAAAaAAwAAAAHAAMAAAAaAAsAAAAPAAEAAAAWAAkAAAACAAQAAAAVAAkAAAAAAAQAAAAIAA8AAAABAAIAAAAJAA8AAAABAAIAAAAIAA4AAAABAAAAAAAHAA8AAAAAAAIAAAAHAA4AAAAQAAEAAAAHAA0AAAACAAAAAAAGAA0AAAAGAAEAAAAGAAwAAAACAAEAAAAGAAsAAAAGAAAAAAAHAAsAAAAJAAQAAAAIAAsAAAABAAQAAAAJAAsAAAAKAAQAAAAKAAsAAAACAAIAAAAKAAoAAAACAAAAAAAJAAoAAAAAAAAAAAAVAAwAAQAAAAAAAAAYAAoAAQAAAAAAAAAZAAoAAQAAAAAAAAAIAA0AAQAAAAAAAAAJAAkAAQAAAAAAAAAWAAwAAgAAAAEAAAAWAAsAAgAAAAAAAAAYAA4AAAABAAIAAAAXAA4AAAAGAAAAAAAWAA4AAAAGAAAAAAAVAA4AAAAHAAEAAAAUAA4AAAABAAAAAAATAA4AAAABAAAAAAASAA4AAAAGAAEAAAARAA4AAAAHAAEAAAAQAA4AAAABAAAAAAAPAA4AAAABAAAAAAAOAA4AAAAKAAMAAAANAA4AAAABAAQAAAAMAA4AAAABAAQAAAALAA4AAAABAAQAAAAKAA4AAAAJAAMAAAAJAA4AAAABAAAAAAAKAA8AAAACAAIAAAAOAA8AAAAAAAIAAAAPAA8AAAABAAIAAAAQAA8AAAABAAIAAAARAA8AAAABAAIAAAASAA8AAAABAAIAAAATAA8AAAABAAIAAAAUAA8AAAABAAIAAAAVAA8AAAABAAIAAAAXAA8AAAACAAIAAAAWAA8AAAABAAIAAAAZAA4AAAAKAAEAAAAaAA4AAAACAAIAAAAaAA0AAAAHAAMAAAAZAA8AAAAEAAIAAAAZAA0AAAAGAAAAAAANAAsAAAAAAAQAAAAOAAsAAAABAAQAAAAPAAsAAAAQAAQAAAAPAAoAAAAPAAMAAAAQAAoAAAAQAAQAAAAQAAkAAAAPAAMAAAARAAkAAAACAAQAAAAHAAoAAAACAAAAAAAGAAoAAAAJAAAAAAAFAAwAAAAAAAEAAAAFAA0AAAAAAAEAAAAFAA4AAAAAAAIAAAAGAA4AAAABAAIAAAAFAAsAAAAJAAEAAAAGAAkAAAAEAAAAAAAEAAsAAAAAAAQAAAAFAAoAAAAAAAAAAAAaAAoAAAAAAAAAAAAbAAoAAAACAAAAAAAbAAsAAAACAAIAAAAVAAgAAQAAAAAAAAAWAAgAAgAAAAEAAAAWAAcAAgAAAAAAAAANAAoAAgAAAAEAAAANAAkAAgAAAAAAAAASAA0AAAACAAAAAAARAA0AAAAAAAAAAAA=")
+tile_map_data = PackedByteArray("AAASAA0AAAAEAAAAAAAVAA0AAAAAAAAAAAAWAA0AAAABAAAAAAAXAA0AAAABAAAAAAAYAA0AAAAHAAQAAAAYAAwAAAAGAAMAAAAYAAsAAAAAAAAAAAAZAAsAAAABAAAAAAAZAAwAAAABAAIAAAAaAAwAAAACAAIAAAAaAAsAAAACAAAAAAAWAAkAAAACAAQAAAAVAAkAAAAAAAQAAAANABIAAAABAAAAAAAOABIAAAABAAAAAAAPABIAAAABAAAAAAAQABIAAAABAAAAAAARABIAAAABAAAAAAASABIAAAABAAAAAAATABIAAAABAAAAAAAUABIAAAABAAAAAAAVABIAAAABAAAAAAAWABIAAAABAAAAAAAXABIAAAABAAAAAAAYABIAAAABAAAAAAAZABIAAAABAAAAAAAaABIAAAABAAAAAAAbABIAAAAHAAEAAAAbABEAAAAAAAAAAAAcABEAAAAHAAEAAAANABMAAAAHAAAAAAAOABMAAAAGAAEAAAAPABMAAAAHAAEAAAAQABMAAAAHAAAAAAAQABQAAAAKAAQAAAAPABQAAAAJAAQAAAAOABQAAAABAAIAAAANABQAAAAAAAIAAAARABMAAAAGAAAAAAASABMAAAAGAAAAAAATABMAAAAHAAAAAAASABQAAAAJAAQAAAARABQAAAAJAAQAAAAYABMAAAAGAAAAAAAZABMAAAAGAAAAAAAaABMAAAAGAAAAAAAaABQAAAABAAIAAAAbABMAAAAGAAAAAAAcABMAAAACAAIAAAAbABQAAAACAAIAAAAYABQAAAABAAIAAAAXABMAAAAHAAAAAAAWABMAAAAGAAAAAAAVABMAAAAGAAAAAAAVABQAAAABAAIAAAAUABMAAAAGAAAAAAAUABQAAAAJAAQAAAATABQAAAAKAAQAAAAWABQAAAABAAIAAAAXABQAAAABAAIAAAAZABQAAAABAAIAAAALABMAAAABAAIAAAAMABMAAAABAAIAAAAMABIAAAABAAAAAAALABIAAAABAAAAAAAKABIAAAABAAAAAAAKABMAAAABAAIAAAAJABMAAAAAAAIAAAAJABIAAAAQAAEAAAAIABIAAAAAAAIAAAAIABEAAAAAAAEAAAAJABEAAAACAAEAAAAIABAAAAAAAAEAAAAIAA8AAAAHAAAAAAAJAA8AAAACAAEAAAAJABAAAAACAAEAAAAIAA4AAAABAAAAAAAHAA8AAAAAAAIAAAAHAA4AAAAGAAQAAAAHAA0AAAAQAAMAAAAGAA0AAAAPAAQAAAAGAAwAAAAEAAEAAAAGAAsAAAAMAAMAAAAHAAsAAAABAAQAAAAIAAsAAAABAAQAAAAJAAsAAAAKAAQAAAAKAAsAAAACAAIAAAAKAAoAAAACAAAAAAAJAAoAAAAAAAAAAAANABAAAAACAAQAAAAMABAAAAABAAQAAAALABAAAAAAAAQAAAAVAAwAAQAAAAAAAAAYAAoAAQAAAAAAAAAZAAoAAQAAAAAAAAAIAA0AAQAAAAAAAAAJAAkAAQAAAAAAAAAWAAwAAgAAAAEAAAAWAAsAAgAAAAAAAAAbABAAAgAAAAEAAAAbAA8AAgAAAAAAAAAaABEAAQAAAAAAAAAYAA4AAAACAAIAAAAXAA4AAAABAAIAAAAWAA4AAAABAAIAAAAVAA4AAAAKAAQAAAAUAA4AAAABAAQAAAATAA4AAAABAAQAAAASAA4AAAAMAAQAAAARAA4AAAABAAQAAAAQAA4AAAABAAQAAAAPAA4AAAABAAQAAAAOAA4AAAABAAQAAAANAA4AAAABAAQAAAAMAA4AAAABAAQAAAALAA4AAAABAAQAAAAKAA4AAAABAAQAAAAJAA4AAAAJAAMAAAAcABIAAAAGAAAAAAAcABAAAAAAAAEAAAAcAA8AAAAAAAAAAAAdAA8AAAAHAAEAAAAdABAAAAAGAAAAAAAdABEAAAACAAEAAAAdABIAAAACAAIAAAAeAA8AAAAGAAEAAAAfAA8AAAABAAAAAAAgAA8AAAABAAAAAAAhAA8AAAABAAAAAAAiAA8AAAAHAAQAAAAiABAAAAACAAIAAAAhABAAAAABAAIAAAAgABAAAAABAAIAAAAfABAAAAABAAIAAAAeABAAAAABAAIAAAAgAA4AAQAAAAAAAAAhAA4AAgAAAAEAAAAhAA0AAgAAAAAAAAAdAA4AAAAAAAEAAAAdAA0AAAAAAAAAAAAeAA0AAAACAAAAAAAeAA4AAAACAAEAAAAiAA4AAAAEAAEAAAAiAA0AAAAEAAEAAAAiAAwAAAAEAAEAAAAiAAsAAAAEAAEAAAAiAAoAAAAEAAEAAAAiAAkAAAAEAAEAAAAiAAgAAAAEAAEAAAAiAAcAAAAEAAEAAAAiAAYAAAAEAAEAAAAGAAoAAAAEAAEAAAAGAAkAAAAEAAEAAAAGAAgAAAAEAAEAAAAGAAcAAAAEAAEAAAAGAAYAAAAEAAEAAAAGAAUAAAAEAAEAAAAGAAQAAAAEAAEAAAAGAAMAAAAEAAAAAAAiAAUAAAAEAAEAAAAiAAQAAAAEAAEAAAAiAAMAAAAEAAAAAAA=")
 tile_set = SubResource("TileSet_mvphy")
 
 [node name="StaticBody2D" type="StaticBody2D" parent="." unique_id=1148293182]
@@ -445,7 +445,7 @@ metadata/_edit_group_ = true
 shape = SubResource("RectangleShape2D_mvphy")
 
 [node name="Player" parent="." unique_id=735255374 instance=ExtResource("8_24ks5")]
-position = Vector2(216, 270)
+position = Vector2(473, 509)
 
 [node name="StaticBody2D2" type="StaticBody2D" parent="." unique_id=958110307]
 position = Vector2(538, 582)
@@ -474,10 +474,10 @@ offset = Vector2(200, 340)
 [node name="Crates" type="Node2D" parent="." unique_id=104104750]
 
 [node name="Crate" parent="Crates" unique_id=1367266345 instance=ExtResource("11_y6lc1")]
-position = Vector2(322, 300)
+position = Vector2(322, 307)
 
 [node name="Crate2" parent="Crates" unique_id=1110392418 instance=ExtResource("11_y6lc1")]
-position = Vector2(846, 305)
+position = Vector2(600, 496)
 
 [node name="RigidBody2D" parent="Crates" unique_id=721458511 instance=ExtResource("11_y6lc1")]
 position = Vector2(423, 425)
@@ -500,9 +500,9 @@ position = Vector2(518, 435)
 [node name="Enemies" type="Node2D" parent="." unique_id=81054696]
 
 [node name="Slime" parent="Enemies" unique_id=1316034960 instance=ExtResource("13_nflru")]
-position = Vector2(459, 339)
+position = Vector2(719, 409)
 
-[node name="Slime2" parent="Enemies" unique_id=1271258942 instance=ExtResource("13_nflru")]
+[node name="Slime2" parent="Enemies" unique_id=495693402 instance=ExtResource("13_nflru")]
-position = Vector2(749, 408)
+position = Vector2(750, 409)
 
 [connection signal="areaTriggered" from="Triggers/Trigger" to="." method="_on_trigger"]

scenes/level3.tscn

@@ -502,7 +502,7 @@ position = Vector2(518, 435)
 [node name="Slime" parent="Enemies" unique_id=1316034960 instance=ExtResource("13_d5gix")]
 position = Vector2(719, 409)
 
-[node name="Slime2" parent="Enemies" unique_id=1271258942 instance=ExtResource("13_d5gix")]
+[node name="Slime2" parent="Enemies" unique_id=495693402 instance=ExtResource("13_d5gix")]
-position = Vector2(749, 408)
+position = Vector2(750, 409)
 
 [connection signal="areaTriggered" from="Triggers/Trigger" to="." method="_on_trigger"]

scenes/player.tscn

@@ -184,7 +184,7 @@ animations = [{
 }],
 "loop": 0,
 "name": &"death",
-"speed": 12.0
+"speed": 6.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -207,7 +207,7 @@ animations = [{
 "duration": 1.0,
 "texture": SubResource("AtlasTexture_hax0n")
 }],
-"loop": 0,
+"loop": 1,
 "name": &"hurt",
 "speed": 12.0
 }, {
@@ -288,6 +288,7 @@ animations = [{
 }]
 
 [node name="Player" type="CharacterBody2D" unique_id=735255374]
+position = Vector2(0, -1)
 script = ExtResource("1_3vyb7")
 metadata/_edit_group_ = true
 
@@ -302,10 +303,10 @@ target_position = Vector2(16, 0)
 target_position = Vector2(-16, 0)
 
 [node name="RightSpawn" type="Marker2D" parent="." unique_id=1276129807]
-position = Vector2(16, -1)
+position = Vector2(14, -1)
 
 [node name="LeftSpawn" type="Marker2D" parent="." unique_id=522145742]
-position = Vector2(-17, -1)
+position = Vector2(-15, -1)
 
 [node name="PlayerGraphic" type="AnimatedSprite2D" parent="." unique_id=1106134562]
 texture_filter = 1

scripts/gamecontroller.gd

@@ -8,17 +8,15 @@ var numberOfCrates = 2
 var totalCoins = 0
 var coinsRemaining = 0
 var coinsCollected = 0
-
-var enemiesDict={}
-var playerStats={
-	"health":100,
-	"meleeAttack": 50,
-	"rangeAttack": 20
-}
-
 var enemy:CharacterStats
 var player:CharacterStats
 
+var enemiesDict={}
+
+var playerStats={}
+
+
+
 # level information
 var levelArray = ["res://scenes/game.tscn", "res://scenes/level2.tscn", "res://scenes/level3.tscn"]
 var currentLevel = 0
@@ -43,16 +41,18 @@ func _process(delta: float) -> void:
 
 
 func _on_trigger(effect: Variant, Object: Variant) -> void:
-
+	print("GC knows about trigger")
 	match effect:
 		"destroy":
 			if not Object is Player:
 				destroySignal.emit(Object)
 		"teleport":
+			print("Trigger wants to teleport")
 			if Object is Crate:
 				teleportSignal.emit(Object)
 
 func _on_bullet_hit(body, bullet) -> void:
+	#print("GC knows bullet hit")	
 	if body is Crate:
 		destroySignal.emit(body)
 		destroySignal.emit(bullet)
@@ -79,16 +79,19 @@ func crateTotal(amount)->void:
 			else:
 				currentLevel = 0
 			levelChange()
+			
 func coinTotal(amount)->void:
 	if totalCoins == 0:
 		totalCoins = amount
 	coinsRemaining = amount
+	print("Collected "+str(totalCoins-coinsRemaining)+" of "+str(totalCoins) ) 
 func coinCollected(body, coin)->void:
 	if body is Player:
 		#give them a coin
 		coinsCollected +=1
 		destroySignal.emit(coin)
 func slimeAttack(body, slime)->void:
+	print("GC knows slime attacking")
 	playerStats.health -= enemiesDict[slime].meleeDamage
 	if playerStats.health >0:
 		print("player takes damage")
@@ -98,13 +101,14 @@ func slimeAttack(body, slime)->void:
 		destroySignal.emit(body)
 		
 func addEnemyToLevel(slime)->void:
-
+	print("Adding enemy to level")
 	var stat={
 		"health":enemy.currentHealth + randi_range(0,10),
-		"meleeDamage":enemy.meleeDamage + randi_range(0,8)
+		"meleeDamage":enemy.meleeDamage+ randi_range(0,10)
 	}
 	enemiesDict[slime]=stat	
 func removeEnemyFromLevel(enemy)->void:
+	print("removeEnemyFromLevel")
 	enemiesDict.erase(enemy)
 
 func levelChange()-> void:

scripts/player.gd

@@ -32,6 +32,7 @@ func _physics_process(delta: float) -> void:
 	# Add the gravity.
 	if not is_on_floor():
 		velocity += get_gravity() * delta
+	
 	if not current_player_state == PlayerStates.DEATH:	
 		handle_input()
 	handle_movement()
@@ -149,7 +150,6 @@ func _animation_finished() -> void:
 		PlayerStates.DEATH:
 			deathCompleteSignal.emit()
 			
-
 func takeDamage()->void:
 	print("player taking damage")
 	current_player_state = PlayerStates.HURT

scripts/rscs/playerStats.tres

@@ -5,7 +5,6 @@
 [resource]
 script = ExtResource("1_sqkfu")
 currentHealth = 150
-maxHealth = 200
 startingHealth = 150
 meleeDamage = 0
 rangeDamage = 30

scripts/rscs/slimeStats.tres

@@ -7,6 +7,5 @@ script = ExtResource("1_ppipo")
 currentHealth = 80
 maxHealth = 90
 startingHealth = 80
-meleeDamage = 10
 rangeDamage = 0
 metadata/_custom_type_script = "uid://bjb5jd6442ta7"

scripts/scene_manager.gd

@@ -63,6 +63,7 @@ func updateEnemies()->void:
 				if not enemy.enemyAttackSignal.is_connected(Gamecontroller.slimeAttack):
 					enemy.enemyAttackSignal.connect(Gamecontroller.slimeAttack)
 		
+	
 func buildLevel()->void:
 	if triggers:
 		for obj in triggers.get_children():