From e4cc684603fc55ecd1c378d16d43255a89e1e8d7 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sun, 14 May 2023 21:35:09 -0400 Subject: [PATCH] replaced player with player scholar and touched up level design --- maps/boss/boss1_arena.tscn | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/maps/boss/boss1_arena.tscn b/maps/boss/boss1_arena.tscn index cb8779e..491c466 100644 --- a/maps/boss/boss1_arena.tscn +++ b/maps/boss/boss1_arena.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=15 format=2] [ext_resource path="res://objects/enemy/boss/scrump.tscn" type="PackedScene" id=1] -[ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2] +[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=2] [ext_resource path="res://graphics/backgrounds/mountain_clouds.png" type="Texture" id=3] [ext_resource path="res://graphics/backgrounds/mountain_sunset.png" type="Texture" id=4] [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=5] @@ -43,17 +43,16 @@ __meta__ = { tile_set = ExtResource( 5 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( -65537, 0, 0, -131072, 0, 0, -131071, 0, 0, -131070, 0, 0, -131069, 0, 0, -131068, 0, 0, -131067, 0, 0, -131066, 0, 0, -131065, 0, 0, -131064, 0, 0, -131063, 0, 0, -131062, 0, 0, -131061, 0, 0, -131060, 0, 0, -131059, 0, 0, -131058, 0, 0, -131057, 0, 0, -131056, 0, 0, -131055, 0, 0, -131054, 0, 0, -131053, 0, 0, -131052, 0, 0, -131051, 0, 0, -131050, 0, 0, -131049, 0, 0, -131048, 0, 0, -131047, 0, 0, -131046, 0, 0, -131045, 0, 0, -131044, 0, 0, -131043, 0, 0, -131042, 0, 0, -131041, 0, 0, -131040, 0, 0, -1, 0, 0, -65504, 0, 0, 65535, 0, 0, 32, 0, 0, 131071, 0, 0, 65568, 0, 0, 196607, 0, 0, 131104, 0, 0, 262143, 0, 0, 196640, 0, 0, 327679, 0, 0, 262176, 0, 0, 393215, 0, 0, 327712, 0, 0, 458751, 0, 0, 393248, 0, 0, 524287, 0, 0, 458784, 0, 0, 589823, 0, 0, 524320, 0, 0, 655359, 0, 0, 589856, 0, 0, 720895, 0, 0, 655392, 0, 0, 786431, 0, 0, 720907, 0, 65536, 720908, 0, 65537, 720909, 0, 65538, 720928, 0, 0, 851967, 0, 0, 786464, 0, 0, 917503, 0, 0, 851972, 0, 65536, 851973, 0, 65538, 851974, 0, 65538, 852000, 0, 0, 983039, 0, 0, 917536, 0, 0, 1048575, 0, 0, 983072, 0, 0, 1114111, 0, 0, 1048608, 0, 0, 1179647, 0, 0, 1114122, 0, 65536, 1114123, 0, 65537, 1114124, 0, 65537, 1114125, 0, 65538, 1114144, 0, 0, 1245183, 0, 0, 1179680, 0, 0, 1310719, 0, 0, 1245216, 0, 0, 1376255, 0, 0, 1310723, 0, 65536, 1310724, 0, 65537, 1310725, 0, 65537, 1310726, 0, 65537, 1310727, 0, 65537, 1310728, 0, 65537, 1310729, 0, 65537, 1310730, 0, 65537, 1310731, 0, 65537, 1310732, 0, 65537, 1310733, 0, 65537, 1310734, 0, 65537, 1310735, 0, 65537, 1310736, 0, 65537, 1310737, 0, 65537, 1310738, 0, 65537, 1310739, 0, 65537, 1310740, 0, 65538, 1310752, 0, 0, 1441791, 0, 0, 1376288, 0, 0, 1507327, 0, 0, 1441824, 0, 0, 1572863, 0, 0, 1507360, 0, 0, 1638399, 0, 0, 1572896, 0, 0 ) +tile_data = PoolIntArray( -65537, 0, 0, -131072, 0, 0, -131071, 0, 0, -131070, 0, 0, -131069, 0, 0, -131068, 0, 0, -131067, 0, 0, -131066, 0, 0, -131065, 0, 0, -131064, 0, 0, -131063, 0, 0, -131062, 0, 0, -131061, 0, 0, -131060, 0, 0, -131059, 0, 0, -131058, 0, 0, -131057, 0, 0, -131056, 0, 0, -131055, 0, 0, -131054, 0, 0, -131053, 0, 0, -131052, 0, 0, -131051, 0, 0, -131050, 0, 0, -131049, 0, 0, -131048, 0, 0, -131047, 0, 0, -131046, 0, 0, -131045, 0, 0, -131044, 0, 0, -131043, 0, 0, -131042, 0, 0, -131041, 0, 0, -131040, 0, 0, -1, 0, 0, -65504, 0, 0, 65535, 0, 0, 32, 0, 0, 131071, 0, 0, 65568, 0, 0, 196607, 0, 0, 131104, 0, 0, 262143, 0, 0, 196640, 0, 0, 327679, 0, 0, 262176, 0, 0, 393215, 0, 0, 327712, 0, 0, 458751, 0, 0, 393248, 0, 0, 524287, 0, 0, 458784, 0, 0, 589823, 0, 0, 524320, 0, 0, 655359, 0, 0, 589856, 0, 0, 720895, 0, 0, 655370, 0, 65536, 655371, 0, 65537, 655372, 0, 65538, 655392, 0, 0, 786431, 0, 0, 720928, 0, 0, 851967, 0, 0, 786436, 0, 65536, 786437, 0, 65537, 786438, 0, 65538, 786464, 0, 0, 917503, 0, 0, 852000, 0, 0, 983039, 0, 0, 917536, 0, 0, 1048575, 0, 0, 983072, 0, 0, 1114111, 0, 0, 1048608, 0, 0, 1179647, 0, 0, 1114122, 0, 65536, 1114123, 0, 65537, 1114124, 0, 65537, 1114125, 0, 65537, 1114126, 0, 65538, 1114144, 0, 0, 1245183, 0, 0, 1179680, 0, 0, 1310719, 0, 0, 1245216, 0, 0, 1376255, 0, 0, 1310723, 0, 65536, 1310724, 0, 65537, 1310725, 0, 65537, 1310726, 0, 65537, 1310727, 0, 65537, 1310728, 0, 65537, 1310729, 0, 65537, 1310730, 0, 65537, 1310731, 0, 65537, 1310732, 0, 65537, 1310733, 0, 65537, 1310734, 0, 65537, 1310735, 0, 65537, 1310736, 0, 65537, 1310737, 0, 65537, 1310738, 0, 65537, 1310739, 0, 65537, 1310740, 0, 65538, 1310752, 0, 0, 1441791, 0, 0, 1376288, 0, 0, 1507327, 0, 0, 1441824, 0, 0, 1572863, 0, 0, 1507360, 0, 0, 1638399, 0, 0, 1572896, 0, 0 ) [node name="Player" parent="." instance=ExtResource( 2 )] -position = Vector2( 48, 144 ) -use_iframes = true +position = Vector2( 48, 160 ) [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 14 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 851976, 0, 2, 917512, 0, 2, 983048, 0, 2 ) +tile_data = PoolIntArray( 786440, 0, 2, 851976, 0, 2, 917512, 0, 2 ) [node name="Boss1" parent="." instance=ExtResource( 1 )] position = Vector2( 168, 112 ) @@ -64,10 +63,10 @@ right_down_boundary = 2.0 position = Vector2( 72, 144 ) [node name="TurningPlatform2" parent="." instance=ExtResource( 9 )] -position = Vector2( 112, 144 ) +position = Vector2( 120, 144 ) [node name="Ladder2" parent="." instance=ExtResource( 10 )] -position = Vector2( 64, 104 ) +position = Vector2( 64, 96 ) scale = Vector2( 1, 3 ) [node name="DelayedArrow" parent="." instance=ExtResource( 12 )] @@ -81,13 +80,13 @@ position = Vector2( 96, 128 ) delay = 5.0 [node name="Arrow2" parent="DelayedArrow2" instance=ExtResource( 8 )] -position = Vector2( 40, 96 ) +position = Vector2( 40, 88 ) [node name="DelayedArrow3" parent="." instance=ExtResource( 12 )] delay = 5.0 [node name="Arrow3" parent="DelayedArrow3" instance=ExtResource( 8 )] -position = Vector2( 96, 80 ) +position = Vector2( 88, 72 ) [node name="DeathTile" parent="." instance=ExtResource( 13 )] position = Vector2( 0, 192 )