Skip to content

Commit

Permalink
Update Levels with Free Tileset Asset Pack
Browse files Browse the repository at this point in the history
## Type of Change

Minor

## Description

- Removed any scale transformation from all sprites so that pixel size is consistent among sprites
- Fixed issue with Player speed
- Updated Player to move more slowly 
- Updated camera to be closer to Player to account for smaller size
- Slowed down blade to account for larger size
- Updated design of all levels with free tileset asset designed by [Szadi Art](https://szadiart.itch.io/2d-magic-lands-dung1) 

## Screenshots
![image](https://user-images.githubusercontent.com/23248722/106846737-5000f400-6662-11eb-9f93-1e3f4937574b.png)
![image](https://user-images.githubusercontent.com/23248722/106846753-57c09880-6662-11eb-9ac8-d33ce07d8f22.png)
![image](https://user-images.githubusercontent.com/23248722/106847022-f4833600-6662-11eb-953c-948bba670f38.png)
  • Loading branch information
Izook authored Feb 4, 2021
1 parent fbad1dd commit 226e481
Show file tree
Hide file tree
Showing 19 changed files with 453 additions and 150 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.7.alpha
0.0.8.alpha
6 changes: 3 additions & 3 deletions scenes/blade/blade.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ extends Node2D

class_name Blade

const MAX_RADIUS := 300
const MIN_RADIUS := 150
const MAX_RADIUS := 200
const MIN_RADIUS := 125

const MAX_ANGULAR_SPEED := 4 * PI
const MAX_ANGULAR_SPEED := 3.5 * PI

const BLADE_SPEED_FACTOR := 40
const BLADE_ROTATIONAL_SPEED := PI/10
Expand Down
5 changes: 1 addition & 4 deletions scenes/enemies/slimes/spawner/slime_spawner.tscn
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=3 format=2]

[ext_resource path="res://scenes/enemies/slimes/spawner/slime_spawner.gd" type="Script" id=1]
[ext_resource path="res://scenes/enemies/slimes/slime/slime.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/enemies/slimes/slime/gibs/gib_1.png" type="Texture" id=3]

[node name="SlimeSpawner" type="Node2D"]
script = ExtResource( 1 )
enemy_scene = ExtResource( 2 )

[node name="Sprite" type="Sprite" parent="."]
scale = Vector2( 4, 4 )
texture = ExtResource( 3 )

[node name="SpawnTimer" type="Timer" parent="."]
Expand Down
36 changes: 31 additions & 5 deletions scenes/levels/playground/playground.tscn

Large diffs are not rendered by default.

29 changes: 26 additions & 3 deletions scenes/levels/slime_spawners/slime_spawners.tscn

Large diffs are not rendered by default.

29 changes: 26 additions & 3 deletions scenes/levels/three_slimes/three_slimes.tscn

Large diffs are not rendered by default.

Binary file added scenes/levels/tile_assets/decorative_props.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added scenes/levels/tile_assets/magic_dungeon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added scenes/levels/tile_assets/outdoor_structures.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions scenes/levels/tile_sets/background_tileset.tres

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[gd_resource type="TileSet" load_steps=3 format=2]

[ext_resource path="res://scenes/levels/tiles/wall.png" type="Texture" id=1]
[ext_resource path="res://scenes/levels/tile_assets/invisible_boundaries.png" type="Texture" id=1]

[sub_resource type="ConvexPolygonShape2D" id=1]
points = PoolVector2Array( 32, 32, 0, 32, 0, 0, 32, 0 )

[resource]
0/name = "wall"
0/name = "square"
0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 )
0/modulate = Color( 1, 1, 1, 1 )
Expand Down
299 changes: 299 additions & 0 deletions scenes/levels/tile_sets/magic_dungeon.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,299 @@
[gd_resource type="TileSet" load_steps=2 format=2]

[ext_resource path="res://scenes/levels/tile_assets/magic_dungeon.png" type="Texture" id=1]

[resource]
0/name = "walls"
0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 )
0/modulate = Color( 1, 1, 1, 1 )
0/region = Rect2( 0, 0, 384, 288 )
0/tile_mode = 2
0/autotile/icon_coordinate = Vector2( 7, 5 )
0/autotile/tile_size = Vector2( 32, 32 )
0/autotile/spacing = 0
0/autotile/occluder_map = [ ]
0/autotile/navpoly_map = [ ]
0/autotile/priority_map = [ ]
0/autotile/z_index_map = [ ]
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/z_index = 0
1/name = "columned_walls"
1/texture = ExtResource( 1 )
1/tex_offset = Vector2( 0, 0 )
1/modulate = Color( 1, 1, 1, 1 )
1/region = Rect2( 384, 0, 224, 224 )
1/tile_mode = 2
1/autotile/icon_coordinate = Vector2( 2, 5 )
1/autotile/tile_size = Vector2( 32, 32 )
1/autotile/spacing = 0
1/autotile/occluder_map = [ ]
1/autotile/navpoly_map = [ ]
1/autotile/priority_map = [ ]
1/autotile/z_index_map = [ ]
1/occluder_offset = Vector2( 0, 0 )
1/navigation_offset = Vector2( 0, 0 )
1/shape_offset = Vector2( 0, 0 )
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
1/shape_one_way = false
1/shape_one_way_margin = 0.0
1/shapes = [ ]
1/z_index = 0
2/name = "more_columned_walls"
2/texture = ExtResource( 1 )
2/tex_offset = Vector2( 0, 0 )
2/modulate = Color( 1, 1, 1, 1 )
2/region = Rect2( 608, 0, 416, 160 )
2/tile_mode = 2
2/autotile/icon_coordinate = Vector2( 2, 3 )
2/autotile/tile_size = Vector2( 32, 32 )
2/autotile/spacing = 0
2/autotile/occluder_map = [ ]
2/autotile/navpoly_map = [ ]
2/autotile/priority_map = [ ]
2/autotile/z_index_map = [ ]
2/occluder_offset = Vector2( 0, 0 )
2/navigation_offset = Vector2( 0, 0 )
2/shape_offset = Vector2( 0, 0 )
2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
2/shape_one_way = false
2/shape_one_way_margin = 0.0
2/shapes = [ ]
2/z_index = 0
3/name = "elevated_floors"
3/texture = ExtResource( 1 )
3/tex_offset = Vector2( 0, 0 )
3/modulate = Color( 1, 1, 1, 1 )
3/region = Rect2( 0, 288, 512, 352 )
3/tile_mode = 2
3/autotile/icon_coordinate = Vector2( 4, 5 )
3/autotile/tile_size = Vector2( 32, 32 )
3/autotile/spacing = 0
3/autotile/occluder_map = [ ]
3/autotile/navpoly_map = [ ]
3/autotile/priority_map = [ ]
3/autotile/z_index_map = [ ]
3/occluder_offset = Vector2( 0, 0 )
3/navigation_offset = Vector2( 0, 0 )
3/shape_offset = Vector2( 0, 0 )
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
3/shape_one_way = false
3/shape_one_way_margin = 0.0
3/shapes = [ ]
3/z_index = 0
4/name = "light_brick_erosion"
4/texture = ExtResource( 1 )
4/tex_offset = Vector2( 0, 0 )
4/modulate = Color( 1, 1, 1, 1 )
4/region = Rect2( 512, 320, 256, 256 )
4/tile_mode = 2
4/autotile/icon_coordinate = Vector2( 1, 1 )
4/autotile/tile_size = Vector2( 32, 32 )
4/autotile/spacing = 0
4/autotile/occluder_map = [ ]
4/autotile/navpoly_map = [ ]
4/autotile/priority_map = [ ]
4/autotile/z_index_map = [ ]
4/occluder_offset = Vector2( 0, 0 )
4/navigation_offset = Vector2( 0, 0 )
4/shape_offset = Vector2( 0, 0 )
4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
4/shape_one_way = false
4/shape_one_way_margin = 0.0
4/shapes = [ ]
4/z_index = 0
5/name = "green_brick_erosion"
5/texture = ExtResource( 1 )
5/tex_offset = Vector2( 0, 0 )
5/modulate = Color( 1, 1, 1, 1 )
5/region = Rect2( 512, 576, 256, 256 )
5/tile_mode = 2
5/autotile/icon_coordinate = Vector2( 1, 1 )
5/autotile/tile_size = Vector2( 32, 32 )
5/autotile/spacing = 0
5/autotile/occluder_map = [ ]
5/autotile/navpoly_map = [ ]
5/autotile/priority_map = [ ]
5/autotile/z_index_map = [ ]
5/occluder_offset = Vector2( 0, 0 )
5/navigation_offset = Vector2( 0, 0 )
5/shape_offset = Vector2( 0, 0 )
5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
5/shape_one_way = false
5/shape_one_way_margin = 0.0
5/shapes = [ ]
5/z_index = 0
6/name = "light_faded_bricks"
6/texture = ExtResource( 1 )
6/tex_offset = Vector2( 0, 0 )
6/modulate = Color( 1, 1, 1, 1 )
6/region = Rect2( 768, 320, 192, 256 )
6/tile_mode = 2
6/autotile/icon_coordinate = Vector2( 1, 1 )
6/autotile/tile_size = Vector2( 32, 32 )
6/autotile/spacing = 0
6/autotile/occluder_map = [ ]
6/autotile/navpoly_map = [ ]
6/autotile/priority_map = [ ]
6/autotile/z_index_map = [ ]
6/occluder_offset = Vector2( 0, 0 )
6/navigation_offset = Vector2( 0, 0 )
6/shape_offset = Vector2( 0, 0 )
6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
6/shape_one_way = false
6/shape_one_way_margin = 0.0
6/shapes = [ ]
6/z_index = 0
7/name = "dark_faded_bricks"
7/texture = ExtResource( 1 )
7/tex_offset = Vector2( 0, 0 )
7/modulate = Color( 1, 1, 1, 1 )
7/region = Rect2( 928, 736, 32, 32 )
7/tile_mode = 2
7/autotile/icon_coordinate = Vector2( 1, 1 )
7/autotile/tile_size = Vector2( 32, 32 )
7/autotile/spacing = 0
7/autotile/occluder_map = [ ]
7/autotile/navpoly_map = [ ]
7/autotile/priority_map = [ ]
7/autotile/z_index_map = [ ]
7/occluder_offset = Vector2( 0, 0 )
7/navigation_offset = Vector2( 0, 0 )
7/shape_offset = Vector2( 0, 0 )
7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
7/shape_one_way = false
7/shape_one_way_margin = 0.0
7/shapes = [ ]
7/z_index = 0
8/name = "tiles_a"
8/texture = ExtResource( 1 )
8/tex_offset = Vector2( 0, 0 )
8/modulate = Color( 1, 1, 1, 1 )
8/region = Rect2( 192, 672, 96, 96 )
8/tile_mode = 2
8/autotile/icon_coordinate = Vector2( 0, 0 )
8/autotile/tile_size = Vector2( 32, 32 )
8/autotile/spacing = 0
8/autotile/occluder_map = [ ]
8/autotile/navpoly_map = [ ]
8/autotile/priority_map = [ ]
8/autotile/z_index_map = [ ]
8/occluder_offset = Vector2( 0, 0 )
8/navigation_offset = Vector2( 0, 0 )
8/shape_offset = Vector2( 0, 0 )
8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
8/shape_one_way = false
8/shape_one_way_margin = 0.0
8/shapes = [ ]
8/z_index = 0
9/name = "tiles_b"
9/texture = ExtResource( 1 )
9/tex_offset = Vector2( 0, 0 )
9/modulate = Color( 1, 1, 1, 1 )
9/region = Rect2( 320, 672, 96, 96 )
9/tile_mode = 2
9/autotile/icon_coordinate = Vector2( 0, 0 )
9/autotile/tile_size = Vector2( 32, 32 )
9/autotile/spacing = 0
9/autotile/occluder_map = [ ]
9/autotile/navpoly_map = [ ]
9/autotile/priority_map = [ ]
9/autotile/z_index_map = [ ]
9/occluder_offset = Vector2( 0, 0 )
9/navigation_offset = Vector2( 0, 0 )
9/shape_offset = Vector2( 0, 0 )
9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
9/shape_one_way = false
9/shape_one_way_margin = 0.0
9/shapes = [ ]
9/z_index = 0
10/name = "tiles_c"
10/texture = ExtResource( 1 )
10/tex_offset = Vector2( 0, 0 )
10/modulate = Color( 1, 1, 1, 1 )
10/region = Rect2( 192, 800, 96, 96 )
10/tile_mode = 2
10/autotile/icon_coordinate = Vector2( 0, 0 )
10/autotile/tile_size = Vector2( 32, 32 )
10/autotile/spacing = 0
10/autotile/occluder_map = [ ]
10/autotile/navpoly_map = [ ]
10/autotile/priority_map = [ ]
10/autotile/z_index_map = [ ]
10/occluder_offset = Vector2( 0, 0 )
10/navigation_offset = Vector2( 0, 0 )
10/shape_offset = Vector2( 0, 0 )
10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
10/shape_one_way = false
10/shape_one_way_margin = 0.0
10/shapes = [ ]
10/z_index = 0
11/name = "tiles_c"
11/texture = ExtResource( 1 )
11/tex_offset = Vector2( 0, 0 )
11/modulate = Color( 1, 1, 1, 1 )
11/region = Rect2( 320, 800, 96, 96 )
11/tile_mode = 2
11/autotile/icon_coordinate = Vector2( 0, 0 )
11/autotile/tile_size = Vector2( 32, 32 )
11/autotile/spacing = 0
11/autotile/occluder_map = [ ]
11/autotile/navpoly_map = [ ]
11/autotile/priority_map = [ ]
11/autotile/z_index_map = [ ]
11/occluder_offset = Vector2( 0, 0 )
11/navigation_offset = Vector2( 0, 0 )
11/shape_offset = Vector2( 0, 0 )
11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
11/shape_one_way = false
11/shape_one_way_margin = 0.0
11/shapes = [ ]
11/z_index = 0
12/name = "grass_floor"
12/texture = ExtResource( 1 )
12/tex_offset = Vector2( 0, 0 )
12/modulate = Color( 1, 1, 1, 1 )
12/region = Rect2( 480, 832, 192, 192 )
12/tile_mode = 2
12/autotile/icon_coordinate = Vector2( 1, 1 )
12/autotile/tile_size = Vector2( 32, 32 )
12/autotile/spacing = 0
12/autotile/occluder_map = [ ]
12/autotile/navpoly_map = [ ]
12/autotile/priority_map = [ ]
12/autotile/z_index_map = [ ]
12/occluder_offset = Vector2( 0, 0 )
12/navigation_offset = Vector2( 0, 0 )
12/shape_offset = Vector2( 0, 0 )
12/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
12/shape_one_way = false
12/shape_one_way_margin = 0.0
12/shapes = [ ]
12/z_index = 0
13/name = "holes"
13/texture = ExtResource( 1 )
13/tex_offset = Vector2( 0, 0 )
13/modulate = Color( 1, 1, 1, 1 )
13/region = Rect2( 32, 672, 128, 224 )
13/tile_mode = 2
13/autotile/icon_coordinate = Vector2( 3, 5 )
13/autotile/tile_size = Vector2( 32, 32 )
13/autotile/spacing = 0
13/autotile/occluder_map = [ ]
13/autotile/navpoly_map = [ ]
13/autotile/priority_map = [ ]
13/autotile/z_index_map = [ ]
13/occluder_offset = Vector2( 0, 0 )
13/navigation_offset = Vector2( 0, 0 )
13/shape_offset = Vector2( 0, 0 )
13/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
13/shape_one_way = false
13/shape_one_way_margin = 0.0
13/shapes = [ ]
13/z_index = 0
Binary file removed scenes/levels/tiles/floor_grid.ase
Binary file not shown.
Binary file removed scenes/levels/tiles/floor_grid.png
Binary file not shown.
2 changes: 1 addition & 1 deletion scenes/menus/pause_menu/pause_menu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ func _on_MainMenuButton_pressed() -> void:
func _on_UnPauseButton_pressed() -> void:
emit_signal("unpaused")



Loading

0 comments on commit 226e481

Please sign in to comment.