diff --git a/assets/textures/cupcake.png b/assets/textures/cupcake.png index fe8244a..05bfd8c 100644 Binary files a/assets/textures/cupcake.png and b/assets/textures/cupcake.png differ diff --git a/project.godot b/project.godot index ed8041f..6ad434c 100644 --- a/project.godot +++ b/project.godot @@ -12,11 +12,14 @@ config_version=4 config/name="RPG-Test" run/main_scene="res://scenes/Main.tscn" +boot_splash/show_image=false +boot_splash/bg_color=Color( 0.141176, 0.141176, 0.141176, 1 ) config/icon="res://icon.png" [display] window/size/height=640 +window/stretch/aspect="keep" [gui] diff --git a/scenes/Player.tscn b/scenes/Player.tscn index 280a3a7..4394d55 100644 --- a/scenes/Player.tscn +++ b/scenes/Player.tscn @@ -12,7 +12,7 @@ animations = [ { } ] [sub_resource type="CapsuleShape2D" id=2] -radius = 46.0 +radius = 30.0 height = 4.0 [node name="Player" type="Area2D"] @@ -22,7 +22,6 @@ __meta__ = { } [node name="AnimatedSprite" type="AnimatedSprite" parent="."] -scale = Vector2( 0.7, 0.7 ) frames = SubResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/scenes/World.tscn b/scenes/World.tscn index 3c5fb31..deb8cda 100644 --- a/scenes/World.tscn +++ b/scenes/World.tscn @@ -8,9 +8,9 @@ tile_set = ExtResource( 1 ) cell_size = Vector2( 512, 512 ) cell_quadrant_size = 128 format = 1 -tile_data = PoolIntArray( -131076, 0, 0, -131075, 0, 1, -131074, 0, 1, -131073, 0, 1, -196608, 0, 1, -196607, 0, 1, -196606, 0, 1, -196605, 0, 2, -65540, 0, 65536, -65539, 0, 65537, -65538, 0, 65537, -65537, 0, 65537, -131072, 0, 65537, -131071, 0, 65537, -131070, 0, 65537, -131069, 0, 65538, -4, 0, 65536, -3, 0, 65537, -2, 0, 65537, -1, 0, 65537, -65536, 0, 65537, -65535, 0, 65537, -65534, 0, 65537, -65533, 0, 65538, 65532, 0, 65536, 65533, 0, 65537, 65534, 0, 65537, 65535, 0, 65537, 0, 0, 65537, 1, 0, 65537, 2, 0, 65537, 3, 0, 65538, 131068, 0, 65536, 131069, 0, 65537, 131070, 0, 65537, 131071, 0, 65537, 65536, 0, 65537, 65537, 0, 65537, 65538, 0, 65537, 65539, 0, 65538, 196604, 0, 131072, 196605, 0, 131073, 196606, 0, 131073, 196607, 0, 131073, 131072, 0, 131073, 131073, 0, 131073, 131074, 0, 131073, 131075, 0, 131074 ) +tile_data = PoolIntArray( -196612, 0, 0, -196611, 0, 1, -196610, 0, 1, -196609, 0, 1, -262144, 0, 1, -262143, 0, 1, -262142, 0, 1, -262141, 0, 2, -131076, 0, 65536, -131075, 0, 65537, -131074, 0, 131073, -131073, 0, 131073, -196608, 0, 131073, -196607, 0, 131073, -196606, 0, 65537, -196605, 0, 65538, -65540, 0, 65536, -65539, 0, 65538, -131070, 0, 65536, -131069, 0, 65538, -4, 0, 65536, -3, 0, 65537, -2, 0, 1, -1, 0, 1, -65536, 0, 1, -65535, 0, 1, -65534, 0, 65537, -65533, 0, 65538, 65532, 0, 65536, 65533, 0, 65537, 65534, 0, 65537, 65535, 0, 65537, 0, 0, 65537, 1, 0, 65537, 2, 0, 65537, 3, 0, 65538, 131068, 0, 65536, 131069, 0, 65537, 131070, 0, 65537, 131071, 0, 65537, 65536, 0, 65537, 65537, 0, 65537, 65538, 0, 65537, 65539, 0, 65538, 196604, 0, 131072, 196605, 0, 131073, 196606, 0, 131073, 196607, 0, 131073, 131072, 0, 131073, 131073, 0, 131073, 131074, 0, 131073, 131075, 0, 131074 ) [node name="Foreground" type="TileMap" parent="."] tile_set = ExtResource( 2 ) -cell_size = Vector2( 128, 128 ) format = 1 +tile_data = PoolIntArray( 196607, 0, 0, 131072, 0, 0, 131073, 0, 0, 196608, 0, 0, 196609, 0, 0, 327678, 0, 0, 327679, 0, 0, 262144, 0, 0, 262145, 0, 0, 393214, 0, 0, 393215, 0, 0, 327680, 0, 0, 327681, 0, 0, 327682, 0, 0, 393216, 0, 0, 393217, 0, 0, 393218, 0, 0, 458752, 0, 0, 458753, 0, 0, 458754, 0, 0, 524289, 0, 0, 524290, 0, 0, 589826, 0, 0 ) diff --git a/tilesets/foreground_test.tres b/tilesets/foreground_test.tres index 66cfaee..ecbb8f3 100644 --- a/tilesets/foreground_test.tres +++ b/tilesets/foreground_test.tres @@ -7,13 +7,19 @@ 0/texture = ExtResource( 1 ) 0/tex_offset = Vector2( 0, 0 ) 0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( -32, -32, 192, 192 ) +0/region = Rect2( 0, 0, 64, 64 ) 0/tile_mode = 0 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) 0/shape_offset = Vector2( 0, 0 ) 0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) 0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] +0/shape_one_way_margin = 1.0 +0/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": null, +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] 0/z_index = 0