Pepperman boss prep

Backgrounds/bg_characterselect.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_foregroundblock_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_hubspecial.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_hubworld1.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_mainmenu_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_mainmenulight_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_mainmenulight_1.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_mainmenulight_2.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_pepperman_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_pepperman_1.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_pepperman_2.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_pepperman_3.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_pepperman_4.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_pepperman_5.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_pizzamart_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_sagetitle_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_title_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Backgrounds/bg_tutorialsign_0.png.import

@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=1
 flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false

Objects/Baddies/Bosses/obj_pepperman_chase.gd

@@ -21,7 +21,7 @@ func _process(delta):
 		spd = floor(obj_player.movespeed)
 	else:
 		spd = 5
-	if (obj_player.state != global.states.comingoutdoor && !screamintro):
+	if (obj_player.is_on_floor() && obj_player.state != global.states.freefall && obj_player.state != global.states.freefallland && !screamintro):
 		obj_player.xscale = -1
 		obj_player.state = global.states.backbreaker
 		obj_player.set_animation("bossintro")

Objects/Blocks/obj_unclimbablewall.tscn

@@ -0,0 +1,19 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://Objects/Blocks/sprites/unclimbablewall.png" type="Texture" id=1]
+
+[sub_resource type="RectangleShape2D" id=4]
+extents = Vector2( 16, 16 )
+
+[node name="obj_unclimbablewall" type="StaticBody2D" groups=["obj_solid", "obj_unclimbablewall"]]
+z_index = -4
+collision_layer = 2
+collision_mask = 0
+
+[node name="Sprite" type="Sprite" parent="."]
+texture = ExtResource( 1 )
+centered = false
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+position = Vector2( 16, 16 )
+shape = SubResource( 4 )

Objects/Blocks/sprites/unclimbablewall.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/unclimbablewall.png-8148a04e021acd353829a7ebc877e8cd.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Objects/Blocks/sprites/unclimbablewall.png"
+dest_files=[ "res://.import/unclimbablewall.png-8148a04e021acd353829a7ebc877e8cd.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=false
+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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Objects/Global/obj_debugcontroller.gd

@@ -13,6 +13,8 @@ func _process(delta):
 		obj_player.position.y = obj_player.roomstarty
 	for i in get_tree().get_nodes_in_group("collision"):
 		i.visible = global.debugcollisions
+	for i in get_tree().get_nodes_in_group("obj_unclimbablewall"):
+		i.visible = global.debugcollisions
 	for i in get_tree().get_nodes_in_group("obj_secretblock"):
 		i.visible = global.debugcollisions
 	for i in get_tree().get_nodes_in_group("obj_secretbigblock"):

Objects/Hub/obj_startgate.gd

@@ -3,6 +3,7 @@ extends Area2D
 export(String) var targetDoor = "A"
 export(String) var targetLevel = "testroom"
 export(String) var targetRoom = "testroom_1"
+export(bool) var boss = false
 
 var highscore = 0
 var secretcount = 0
@@ -14,12 +15,13 @@ func loadleveldata():
 	if SaveData != OK:
 		return
 	highscore = SaveManager.get_value("Highscore", targetLevel, 0)
-	secretcount = SaveManager.get_value("Secret", targetLevel, 0)
-	toppin[0] = SaveManager.get_value("Toppin", (targetLevel + "1"), false)
-	toppin[1] = SaveManager.get_value("Toppin", (targetLevel + "2"), false)
-	toppin[2] = SaveManager.get_value("Toppin", (targetLevel + "3"), false)
-	toppin[3] = SaveManager.get_value("Toppin", (targetLevel + "4"), false)
-	toppin[4] = SaveManager.get_value("Toppin", (targetLevel + "5"), false)
+	if (!boss):
+		secretcount = SaveManager.get_value("Secret", targetLevel, 0)
+		toppin[0] = SaveManager.get_value("Toppin", (targetLevel + "1"), false)
+		toppin[1] = SaveManager.get_value("Toppin", (targetLevel + "2"), false)
+		toppin[2] = SaveManager.get_value("Toppin", (targetLevel + "3"), false)
+		toppin[3] = SaveManager.get_value("Toppin", (targetLevel + "4"), false)
+		toppin[4] = SaveManager.get_value("Toppin", (targetLevel + "5"), false)
 
 func _ready():
 	$Sprite.playing = true
@@ -30,46 +32,52 @@ func _process(delta):
 	if (overlaps_body(obj_player)):
 		$Sprite.speed_scale = 0.35
 		$ScoreLabel.visible = true
-		$SecretLabel.visible = true
+		if (!boss):
+			$SecretLabel.visible = true
 	else:
 		$Sprite.speed_scale = 0
 		$Sprite.frame = 0
 		$ScoreLabel.visible = false
-		$SecretLabel.visible = false
+		if (!boss):
+			$SecretLabel.visible = false
 	if (overlaps_body(obj_player)):
 		$ScoreLabel.text = str(highscore)
-		$SecretLabel.text = str(secretcount) + " OF 6 SECRET"
-		match targetLevel:
-			"testroom":
-				for obj in get_tree().get_nodes_in_group("obj_tv"):
-					obj.message = "TEST LEVEL"
-					obj.showtext = true
-					obj.resettimer.wait_time = 0.03
-					obj.resettimer.start()
-			"entrance":
-				for obj in get_tree().get_nodes_in_group("obj_tv"):
-					obj.message = "ENTRANCE"
-					obj.showtext = true
-					obj.resettimer.wait_time = 0.03
-					obj.resettimer.start()
-			"medieval":
-				for obj in get_tree().get_nodes_in_group("obj_tv"):
-					obj.message = "PIZZASCAPE"
-					obj.showtext = true
-					obj.resettimer.wait_time = 0.03
-					obj.resettimer.start()
-			"ruin":
-				for obj in get_tree().get_nodes_in_group("obj_tv"):
-					obj.message = "THE ANCIENT CHEESE"
-					obj.showtext = true
-					obj.resettimer.wait_time = 0.03
-					obj.resettimer.start()
-			"dungeon":
-				for obj in get_tree().get_nodes_in_group("obj_tv"):
-					obj.message = "BLOODSAUCE DUNGEON"
-					obj.showtext = true
-					obj.resettimer.wait_time = 0.03
-					obj.resettimer.start()
+		if (!boss):
+			$SecretLabel.text = str(secretcount) + " OF 6 SECRET"
+		if (!boss):
+			match targetLevel:
+				"entrance":
+					for obj in get_tree().get_nodes_in_group("obj_tv"):
+						obj.message = "ENTRANCE"
+						obj.showtext = true
+						obj.resettimer.wait_time = 0.03
+						obj.resettimer.start()
+				"medieval":
+					for obj in get_tree().get_nodes_in_group("obj_tv"):
+						obj.message = "PIZZASCAPE"
+						obj.showtext = true
+						obj.resettimer.wait_time = 0.03
+						obj.resettimer.start()
+				"ruin":
+					for obj in get_tree().get_nodes_in_group("obj_tv"):
+						obj.message = "THE ANCIENT CHEESE"
+						obj.showtext = true
+						obj.resettimer.wait_time = 0.03
+						obj.resettimer.start()
+				"dungeon":
+					for obj in get_tree().get_nodes_in_group("obj_tv"):
+						obj.message = "BLOODSAUCE DUNGEON"
+						obj.showtext = true
+						obj.resettimer.wait_time = 0.03
+						obj.resettimer.start()
+		else:
+			match targetRoom:
+				"boss_pepperman_old":
+					for obj in get_tree().get_nodes_in_group("obj_tv"):
+						obj.message = "PEPPERMAN"
+						obj.showtext = true
+						obj.resettimer.wait_time = 0.03
+						obj.resettimer.start()
 		if (Input.is_action_pressed("key_up") && obj_player.is_on_floor() && (obj_player.state == global.states.normal || obj_player.state == global.states.mach1 || obj_player.state == global.states.mach2 || obj_player.state == global.states.mach3) && !utils.instance_exists("obj_fadeout") && obj_player.state != global.states.victory && obj_player.state != global.states.comingoutdoor):
 			for i in get_tree().get_nodes_in_group("obj_music"):
 				i.musicnode.stop()

Objects/Misc/obj_rank.gd

@@ -47,5 +47,5 @@ func _on_Timer_timeout():
 	global.roomtorestart = ""
 	global.leveltorestart = ""
 	utils.get_player().scr_playerreset()
-	utils.room_goto("", "hub_room1")
+	utils.room_goto("", utils.get_player().backtohubroom)
 	queue_free()

Objects/Player/obj_player.gd

@@ -2145,8 +2145,11 @@ func scr_player_climbwall():
 		windingAnim += 1
 	suplexmove = 0
 	velocity.y = (-wallspeed)
-	if (wallspeed < 24 && move == xscale):
-		wallspeed += 0.05
+	if ((($SolidCheck.is_colliding() && $SolidCheck.get_collider() != null && ($SolidCheck.get_collider().is_in_group("obj_unclimbablewall"))) || ($WallClimbCheck.is_colliding() && $WallClimbCheck.get_collider() != null && $WallClimbCheck.get_collider().is_in_group("obj_unclimbablewall")))):
+		wallspeed -= 0.5
+	else:
+		if (wallspeed < 24 && move == xscale):
+			wallspeed += 0.05
 	crouchslideAnim = 1
 	charactersprite.animation = "climbwall"
 	if (!Input.is_action_pressed("key_dash") || (move != xscale && move != 0)):
@@ -2239,6 +2242,8 @@ func scr_player_tumble():
 	charactersprite.speed_scale = 0.35
 
 func scr_player_titlescreen():
+	position.x = -500
+	position.y = 250
 	global.targetDoor = "A"
 	if (charactersprite.animation == "pepcooter" && (!utils.instance_exists("obj_superdashcloud"))):
 		utils.instance_create(position.x - 120, position.y, "res://Objects/Visuals/obj_superdashcloud.tscn")
@@ -3044,17 +3049,12 @@ func scr_player_faceplant():
 				i.sprite.flip_h = true
 
 func scr_player_ejected():
-	if (position.y > utils.get_instance_level("obj_camlimit_bottom").position.y + 100 && !utils.instance_exists("obj_fadeout")):
+	if (position.y > utils.get_instance_level("obj_camlimit_bottom").position.y + 200 && !utils.instance_exists("obj_fadeout")):
 		landAnim = 0
 		targetLevel = lastlevel
 		targetRoom = lastroom
 		global.targetDoor = lastdoor
 		state = global.states.normal
-		global.combo = 0
-		global.combotime = 0
-		global.combodropped = false
-		global.combomilestone = 10
-		supercharged = false
 		for i in get_tree().get_nodes_in_group("obj_camera"):
 			i.ded = 0
 		utils.instance_create(utils.get_gamenode().global_position.x, utils.get_gamenode().global_position.y, "res://Objects/Visuals/obj_fadeout.tscn")