added tutorial levels / minor polishing

.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5

@@ -1,3 +1,3 @@
-source_md5="47313fa4c47a9963fddd764e1ec6e4a8"
-dest_md5="2ded9e7f9060e2b530aab678b135fc5b"
+source_md5="796f894aefc4f2caceb6eff8fe937931"
+dest_md5="0b39963c37a77cc1dd1362ad397b8ae4"
 

assets/fonts/default_font.tres

@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/fonts/LycheeSoda.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 128
+font_data = ExtResource( 1 )

assets/hostiles/spikes_tilemap.tres

@@ -3,10 +3,10 @@
 [ext_resource path="res://assets/hostiles/spikes.png" type="Texture" id=1]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
-points = PoolVector2Array( 32, 32, 0, 32, 0, 0, 32, 0 )
+points = PoolVector2Array( 32, 32, 0, 32, 0, 2, 32, 2 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
-points = PoolVector2Array( 32, 32, 0, 32, 0, 0, 32, 0 )
+points = PoolVector2Array( 32, 32, 0, 32, 0, 2, 32, 2 )
 
 [resource]
 0/name = "blades.png 0"

icon.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://icon.png"
+dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.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
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

levels/MainMenu.tscn

@@ -1,14 +1,23 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=13 format=2]
 
 [ext_resource path="res://assets/props/final_pole/finalpole_animation.tres" type="SpriteFrames" id=1]
 [ext_resource path="res://assets/player/player_animations.tres" type="SpriteFrames" id=2]
+[ext_resource path="res://assets/fonts/default_font.tres" type="DynamicFont" id=3]
+[ext_resource path="res://assets/fonts/LycheeSoda.ttf" type="DynamicFontData" id=4]
 [ext_resource path="res://scripts/MainMenu.gd" type="Script" id=5]
 [ext_resource path="res://assets/box_tilemap/scene_tilemap.tres" type="TileSet" id=6]
+[ext_resource path="res://levels/season_1/level_1.tscn" type="PackedScene" id=7]
 [ext_resource path="res://assets/pieces_textures/pieces2.png" type="Texture" id=8]
-[ext_resource path="res://levels/DebugScene.tscn" type="PackedScene" id=9]
 
-[sub_resource type="Animation" id=1]
-resource_name = "Blink"
+[sub_resource type="DynamicFont" id=1]
+size = 32
+font_data = ExtResource( 4 )
+
+[sub_resource type="DynamicFont" id=2]
+size = 64
+font_data = ExtResource( 4 )
+
+[sub_resource type="Animation" id=3]
 loop = true
 tracks/0/type = "value"
 tracks/0/path = NodePath(".:visible_characters")
@@ -23,22 +32,22 @@ tracks/0/keys = {
 "values": [ -1, 0 ]
 }
 
-[sub_resource type="SpriteFrames" id=2]
+[sub_resource type="SpriteFrames" id=4]
 animations = [ {
 "frames": [ ExtResource( 8 ) ],
 "loop": true,
 "name": "default",
 "speed": 5.0
 } ]
 
-[node name="MainMenu" type="MarginContainer"]
+[node name="MainMenu" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 5 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
-first_level = ExtResource( 9 )
+first_level = ExtResource( 7 )
 
 [node name="ColorRect" type="ColorRect" parent="."]
 margin_right = 1280.0
@@ -51,11 +60,14 @@ __meta__ = {
 [node name="Control" type="Control" parent="."]
 margin_right = 1280.0
 margin_bottom = 720.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="VersionLabel" type="Label" parent="Control"]
 margin_left = 4.0
 margin_top = 4.0
-rect_scale = Vector2( 0.5, 0.5 )
+custom_fonts/font = SubResource( 1 )
 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
 custom_constants/shadow_offset_x = 4
 custom_constants/shadow_offset_y = 4
@@ -64,71 +76,72 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
-margin_right = 1280.0
-margin_bottom = 720.0
-
 [node name="CenterContainer" type="CenterContainer" parent="."]
-margin_right = 1280.0
-margin_bottom = 720.0
+anchor_right = 1.0
+margin_top = 200.0
+margin_bottom = 161.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
-margin_left = 597.0
-margin_top = 335.0
-margin_right = 682.0
-margin_bottom = 385.0
-custom_constants/separation = 22
+margin_left = 284.0
+margin_right = 996.0
+margin_bottom = 176.0
+custom_constants/separation = -16
 alignment = 1
 
 [node name="Label" type="Label" parent="CenterContainer/VBoxContainer"]
-margin_right = 85.0
-margin_bottom = 14.0
+margin_right = 712.0
+margin_bottom = 128.0
+custom_fonts/font = ExtResource( 3 )
 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
 custom_constants/shadow_offset_x = 8
 custom_constants/shadow_offset_y = 8
-text = "Make it Click!"
+text = "MAKE IT CLICK"
+align = 1
 
 [node name="Label2" type="Label" parent="CenterContainer/VBoxContainer"]
-margin_top = 36.0
-margin_right = 85.0
-margin_bottom = 50.0
+margin_top = 112.0
+margin_right = 712.0
+margin_bottom = 176.0
+custom_fonts/font = SubResource( 2 )
 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
-custom_constants/shadow_offset_x = 4
-custom_constants/shadow_offset_y = 4
-text = "Press Space "
+custom_constants/shadow_offset_x = 8
+custom_constants/shadow_offset_y = 8
+text = "Press Space"
 align = 1
-valign = 1
+__meta__ = {
+"_editor_description_": ""
+}
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="CenterContainer/VBoxContainer/Label2"]
 autoplay = "Blink"
-anims/Blink = SubResource( 1 )
+anims/Blink = SubResource( 3 )
+
+[node name="TileMap" type="TileMap" parent="."]
+position = Vector2( 136, -32 )
+tile_set = ExtResource( 6 )
+cell_size = Vector2( 32, 32 )
+format = 1
+tile_data = PoolIntArray( 983046, 0, 0, 983047, 0, 1, 983048, 0, 2, 983054, 1, 0, 983055, 1, 1, 983056, 1, 2, 983061, 2, 0, 983062, 2, 1, 983063, 2, 2, 1048582, 0, 65536, 1048583, 0, 65537, 1048584, 0, 65538, 1048590, 1, 65536, 1048591, 1, 65537, 1048592, 1, 65538, 1048597, 2, 65536, 1048598, 2, 65537, 1048599, 2, 65538, 1114118, 0, 131072, 1114119, 0, 131073, 1114120, 0, 131074, 1114126, 1, 131072, 1114127, 1, 131073, 1114128, 1, 131074, 1114133, 2, 131072, 1114134, 2, 131073, 1114135, 2, 131074 )
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
-position = Vector2( 360, 464 )
+position = Vector2( 376, 416 )
 scale = Vector2( 2, 2 )
 frames = ExtResource( 2 )
 animation = "dancing"
-frame = 6
+frame = 2
 playing = true
 
 [node name="AnimatedSprite2" type="AnimatedSprite" parent="."]
-position = Vector2( 840, 456 )
+position = Vector2( 856, 408 )
 scale = Vector2( 2, 2 )
 frames = ExtResource( 1 )
 frame = 1
 playing = true
 
 [node name="AnimatedSprite3" type="AnimatedSprite" parent="."]
-position = Vector2( 616, 456 )
+position = Vector2( 632, 408 )
 scale = Vector2( 2, 2 )
-frames = SubResource( 2 )
-
-[node name="TileMap" type="TileMap" parent="."]
-position = Vector2( 120, 16 )
-tile_set = ExtResource( 6 )
-cell_size = Vector2( 32, 32 )
-format = 1
-tile_data = PoolIntArray( 983046, 0, 0, 983047, 0, 1, 983048, 0, 2, 983054, 1, 0, 983055, 1, 1, 983056, 1, 2, 983061, 2, 0, 983062, 2, 1, 983063, 2, 2, 1048582, 0, 65536, 1048583, 0, 65537, 1048584, 0, 65538, 1048590, 1, 65536, 1048591, 1, 65537, 1048592, 1, 65538, 1048597, 2, 65536, 1048598, 2, 65537, 1048599, 2, 65538, 1114118, 0, 131072, 1114119, 0, 131073, 1114120, 0, 131074, 1114126, 1, 131072, 1114127, 1, 131073, 1114128, 1, 131074, 1114133, 2, 131072, 1114134, 2, 131073, 1114135, 2, 131074 )
+frames = SubResource( 4 )

project.godot

@@ -16,6 +16,8 @@ boot_splash/image="res://assets/white_placeholder.png"
 boot_splash/fullsize=false
 boot_splash/use_filter=false
 boot_splash/bg_color=Color( 1, 1, 1, 1 )
+config/icon="res://icon.png"
+config/windows_native_icon="res://icon.ico"
 
 [autoload]
 
@@ -108,5 +110,5 @@ common/enable_pause_aware_picking=true
 quality/driver/driver_name="GLES2"
 vram_compression/import_etc=true
 vram_compression/import_etc2=false
-quality/filters/msaa=1
 environment/default_environment="res://default_env.tres"
+quality/dynamic_fonts/use_oversampling=false

scenes/Player.tscn

@@ -29,6 +29,7 @@ script = ExtResource( 13 )
 
 [node name="PlayerMovement" type="Node" parent="."]
 script = ExtResource( 4 )
+MAX_WALKING_SPEED = 350.0
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
@@ -41,6 +42,7 @@ texture = ExtResource( 9 )
 
 [node name="Camera2D" type="Camera2D" parent="."]
 position = Vector2( 0, -64 )
+offset = Vector2( 0, 20 )
 current = true
 zoom = Vector2( 1.1, 1.1 )
 smoothing_enabled = true

scenes/powerup_system/PowerUp.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://assets/pieces_textures/pieces2.png" type="Texture" id=1]
 [ext_resource path="res://scripts/power_up/PowerUp.gd" type="Script" id=2]
 [ext_resource path="res://assets/pieces_textures/pieces4.png" type="Texture" id=3]
 [ext_resource path="res://assets/pieces_textures/pieces3.png" type="Texture" id=4]
 [ext_resource path="res://assets/pieces_textures/pieces7.png" type="Texture" id=5]
+[ext_resource path="res://assets/fonts/LycheeSoda.ttf" type="DynamicFontData" id=6]
 [ext_resource path="res://assets/pieces_textures/pieces8.png" type="Texture" id=7]
 
 [sub_resource type="RectangleShape2D" id=1]
@@ -17,28 +18,34 @@ animations = [ {
 "name": "LEGS",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 5 ) ],
+"frames": [ ExtResource( 3 ) ],
 "loop": false,
-"name": "INMORTAL",
+"name": "SLINGSHOT",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 3 ) ],
+"frames": [ ExtResource( 4 ) ],
 "loop": false,
-"name": "SLINGSHOT",
+"name": "GRAVITY",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 7 ) ],
+"frames": [ ExtResource( 5 ) ],
 "loop": false,
-"name": "SPEED_BOOST",
+"name": "INMORTAL",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 4 ) ],
+"frames": [ ExtResource( 7 ) ],
 "loop": false,
-"name": "GRAVITY",
+"name": "SPEED_BOOST",
 "speed": 5.0
 } ]
 
-[node name="PowerUp" type="Node2D"]
+[sub_resource type="DynamicFont" id=3]
+size = 48
+font_data = ExtResource( 6 )
+
+[node name="PowerUp" type="Node2D" groups=[
+"power_up",
+]]
 script = ExtResource( 2 )
 
 [node name="Area2D" type="Area2D" parent="."]
@@ -60,11 +67,15 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -20.0
-margin_top = -7.0
-margin_right = 20.0
-margin_bottom = 7.0
-text = "6"
+margin_left = -15.0
+margin_top = -24.0
+margin_right = 15.0
+margin_bottom = 24.0
+custom_fonts/font = SubResource( 3 )
+custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
+custom_constants/shadow_offset_x = 2
+custom_constants/shadow_offset_y = 2
+text = "5"
 align = 1
 __meta__ = {
 "_edit_use_anchors_": false

scripts/FinalPole.gd

@@ -1,11 +1,14 @@
 extends Node2D
 
-export(PackedScene) var next_level_scene
-
 func body_entered(_body_id, body, _body_shape, _local_shape):
 	if body.is_in_group("player"):
 		next_level()
 
 func next_level():
-	if next_level_scene != null:
-		var _a = get_tree().change_scene_to(next_level_scene)
+	GlobalScript.current_level += 1
+
+	var next_level_path: String = \
+	"levels/season_" + str(GlobalScript.current_season) + "/level_" + str(GlobalScript.current_level) + ".tscn"
+
+	if ResourceLoader.exists(next_level_path):
+		var _a = get_tree().change_scene(next_level_path)