kyouko sprites

Graphics/Units/Kyouko/Fall.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Fall.png-2c9259571806c4b9d15c6463a6fe8e58.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Fall.png"
+dest_files=[ "res://.import/Fall.png-2c9259571806c4b9d15c6463a6fe8e58.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

Graphics/Units/Kyouko/Jump.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Jump.png-a5d1a712550007197431f84523fc452f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Jump.png"
+dest_files=[ "res://.import/Jump.png-a5d1a712550007197431f84523fc452f.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

Graphics/Units/Kyouko/Move+1.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Move+1.png-3e75955a195a0b7837fa64951b5a15c4.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Move+1.png"
+dest_files=[ "res://.import/Move+1.png-3e75955a195a0b7837fa64951b5a15c4.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

Graphics/Units/Kyouko/Move+2.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Move+2.png-44d729da36284cb971b1c9c4e686440c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Move+2.png"
+dest_files=[ "res://.import/Move+2.png-44d729da36284cb971b1c9c4e686440c.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

Graphics/Units/Kyouko/Move-1.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Move-1.png-79d5eb0e0ca0e87eaca04fcc1be78959.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Move-1.png"
+dest_files=[ "res://.import/Move-1.png-79d5eb0e0ca0e87eaca04fcc1be78959.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

Graphics/Units/Kyouko/Move-2.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Move-2.png-c0cbc2cc67f3223c34f29d7c0e4ae91d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Move-2.png"
+dest_files=[ "res://.import/Move-2.png-c0cbc2cc67f3223c34f29d7c0e4ae91d.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

Graphics/Units/Kyouko/Move0.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Move0.png-aab4fed117ff97fa8d7ce12b9bb41976.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Move0.png"
+dest_files=[ "res://.import/Move0.png-aab4fed117ff97fa8d7ce12b9bb41976.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

Graphics/Units/Kyouko/Recoil.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Recoil.png-cb2ffa935fa919be619c86e5dc0f5aef.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Graphics/Units/Kyouko/Recoil.png"
+dest_files=[ "res://.import/Recoil.png-cb2ffa935fa919be619c86e5dc0f5aef.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

Scenes/DownhillAutoscroller.tscn

@@ -53,8 +53,8 @@ tracks/0/keys = {
 [node name="Scene" type="Node"]
 script = ExtResource( 5 )
 __meta__ = {
-"_edit_horizontal_guides_": [ 214.0, 332.0, 1379.0 ],
-"_edit_vertical_guides_": [ 2134.0, 3833.0, 10449.0 ]
+"_edit_horizontal_guides_": [ 214.0, 332.0 ],
+"_edit_vertical_guides_": [ 2134.0, 3833.0 ]
 }
 tile_set_name = "SnowySlopes"
 camera_h_offset = 2.5
@@ -78,7 +78,10 @@ format = 1
 tile_data = PoolIntArray( 1, 8, 0, 6, 3, 0, 65539, 9, 0, 65541, 8, 0, 65544, 3, 0, 131080, 8, 0, 131082, 3, 0, 196620, 3, 0, 262154, 9, 0, 262157, 1, 0, 327694, 1, 0, 327700, 0, 0, 393227, 9, 0, 393229, 8, 0, 393232, 3, 0, 393234, 2, 0, 458771, 8, 0, 458781, 8, 0, 458795, 8, 0, 524312, 8, 0, 524320, 9, 0, 524322, 9, 0, 524323, 8, 0, 589863, 8, 0, 589897, 2, 0, 589901, 3, 0, 655432, 0, 0, 655442, 3, 0, 720966, 2, 0, 720972, 8, 0, 720976, 8, 0, 720980, 3, 0, 786498, 8, 0, 786502, 9, 0, 786517, 1, 0, 852017, 9, 0, 852019, 8, 0, 852025, 9, 0, 852054, 1, 0, 852062, 2, 0, 852066, 3, 0, 917565, 8, 0, 917584, 9, 0, 917591, 1, 0, 917597, 0, 0, 917603, 1, 0, 983129, 3, 0, 983131, 2, 0, 983135, 8, 0, 983140, 1, 0, 1048662, 8, 0, 1048675, 8, 0, 1048677, 1, 0, 1114212, 9, 0, 1114215, 3, 0, 1179754, 3, 0, 1245291, 1, 0, 1245308, 2, 0, 1245312, 3, 0, 1310826, 8, 0, 1310829, 3, 0, 1310843, 0, 0, 1310845, 8, 0, 1310849, 1, 0, 1376360, 9, 0, 1376367, 3, 0, 1376377, 2, 0, 1376386, 1, 0, 1441904, 8, 0, 1441908, 8, 0, 1441923, 1, 0, 1507460, 1, 0, 1572978, 9, 0, 1572995, 8, 0, 1572997, 1, 0, 1638534, 1, 0, 1704071, 1, 0, 1769605, 9, 0, 1769608, 1, 0, 1769619, 3, 0, 1835146, 3, 0, 1835156, 1, 0, 1900681, 8, 0, 1900688, 8, 0, 1900693, 1, 0, 1966230, 1, 0, 2031768, 3, 0, 2031779, 2, 0, 2031794, 9, 0, 2031799, 3, 0, 2097302, 9, 0, 2097312, 9, 0, 2097333, 8, 0, 2097336, 1, 0, 2097344, 2, 0, 2097373, 3, 0, 2162844, 8, 0, 2162862, 8, 0, 2162873, 1, 0, 2162879, 0, 0, 2162880, 8, 0, 2162885, 2, 0, 2228372, 9, 0, 2228402, 9, 0, 2228411, 3, 0, 2228413, 2, 0, 2228428, 2, 0, 2228447, 8, 0, 2293950, 8, 0, 2293967, 8, 0, 2359478, 9, 0, 2359533, 8, 0, 2425030, 9, 0, 2425063, 8, 0, 2425072, 1, 0, 2490609, 1, 0, 2556147, 3, 0, 2621684, 9, 0, 2621685, 3, 0, 2687222, 1, 0, 2883835, 1, 0, 2949372, 1, 0, 3014910, 3, 0, 3080451, 3, 0, 3145985, 9, 0, 3145988, 1, 0, 3211525, 1, 0, 3211530, 3, 0, 3211531, 1, 0, 3277059, 8, 0, 3277066, 9, 0, 3277069, 3, 0, 3342606, 1, 0, 3342607, 1, 0, 3342615, 3, 0, 3408143, 9, 0, 3408145, 3, 0, 3408148, 2, 0, 3408152, 1, 0, 3473682, 8, 0, 3473689, 1, 0, 3473699, 2, 0, 3473703, 3, 0, 3539226, 1, 0, 3539234, 0, 0, 3539240, 1, 0, 3604763, 1, 0, 3604768, 2, 0, 3604778, 3, 0, 3670306, 8, 0, 3670312, 9, 0, 3670316, 3, 0, 3735861, 9, 0, 3801395, 8, 0, 3801400, 8, 0, 3801406, 3, 0, 3801416, 2, 0, 3801442, 9, 0, 3866934, 9, 0, 3866943, 1, 0, 3866951, 0, 0, 3866975, 8, 0, 3932480, 1, 0, 3932495, 8, 0, 3932501, 9, 0, 3932516, 9, 0, 3998020, 2, 0, 4063551, 8, 0, 4129092, 8, 0 )
 
 [node name="Player" parent="." instance=ExtResource( 2 )]
-position = Vector2( 10, -150 )
+position = Vector2( 91, -197 )
+__meta__ = {
+"_edit_group_": true
+}
 
 [node name="Camera2D" type="Camera2D" parent="Player"]
 offset = Vector2( 0, -15 )

Scripts/Constants.gd

@@ -182,7 +182,7 @@ const UNIT_SPRITES = {
 	# Sprite-class: [Is-animation?, Nodes]
 	UnitType.PLAYER: {
 		SpriteClass.IDLE: [false, ["Idle"]],
-		SpriteClass.WALK: [true, ["Walk"]],
+		SpriteClass.WALK: [false, ["Move0", "Move-1", "Move-2", "Move+1", "Move+2"]],
 		SpriteClass.JUMP: [false, ["Jump1", "Jump2"]],
 		SpriteClass.RECOIL: [false, ["Recoil"]],
 	},

Scripts/Unit.gd

@@ -54,10 +54,8 @@ func _ready():
 	pos = Vector2(position.x / Constants.GRID_SIZE, position.y / -Constants.GRID_SIZE)
 	position.x = position.x * Constants.SCALE_FACTOR
 	position.y = position.y * Constants.SCALE_FACTOR
-	# scale.x = Constants.SCALE_FACTOR
-	# scale.y = Constants.SCALE_FACTOR
-	scale.x = 2.4
-	scale.y = 2.4
+	scale.x = Constants.SCALE_FACTOR
+	scale.y = Constants.SCALE_FACTOR
 
 func init_unit_w_scene(scene):
 	self.scene = scene

Scripts/Units/DownhillAutoscrollerPlayer.gd

@@ -28,12 +28,36 @@ func execute_actions(delta):
 func spin(delta):
 	set_current_action(Constants.UnitCurrentAction.SPINNING)
 	boost += boost_per_second * delta
+	current_sprite.visible = false
+	get_node("SpinningSprite").visible = true
+	get_node("SpinningSprite").rotation += delta * 32
+
+func move():
+	set_unit_condition(Constants.UnitCondition.MOVING_STATUS, Constants.UnitMovingStatus.MOVING)
+	if (get_current_action() == Constants.UnitCurrentAction.IDLE
+	and unit_conditions[Constants.UnitCondition.IS_ON_GROUND]):
+		if last_contacted_map_elem_type == Constants.MapElemType.SQUARE:
+			set_sprite(Constants.SpriteClass.WALK, 0)
+		elif (last_contacted_map_elem_type == Constants.MapElemType.SMALL_SLOPE_RIGHT_1
+		or last_contacted_map_elem_type == Constants.MapElemType.SMALL_SLOPE_RIGHT_2):
+			set_sprite(Constants.SpriteClass.WALK, 1)
+		elif last_contacted_map_elem_type == Constants.MapElemType.SLOPE_RIGHT:
+			set_sprite(Constants.SpriteClass.WALK, 2)
+		elif (last_contacted_map_elem_type == Constants.MapElemType.SMALL_SLOPE_LEFT_1
+		or last_contacted_map_elem_type == Constants.MapElemType.SMALL_SLOPE_LEFT_2):
+			set_sprite(Constants.SpriteClass.WALK, 3)
+		elif last_contacted_map_elem_type == Constants.MapElemType.SLOPE_LEFT:
+			set_sprite(Constants.SpriteClass.WALK, 4)
 
 func reset_current_action():
 	.reset_current_action()
 	if get_current_action() == Constants.UnitCurrentAction.SPINNING:
 		if not actions[Constants.ActionType.SPIN]:
 			set_current_action(Constants.UnitCurrentAction.IDLE)
+			get_node("SpinningSprite").visible = false
+			get_node("SpinningSprite").rotation = 0
+			.handle_idle()
+			current_sprite.visible = true
 
 func custom_inputs():
 	if scene.input_table[Constants.PlayerInput.GBA_B][scene.I_T_JUST_PRESSED]:
@@ -43,6 +67,10 @@ func custom_inputs():
 	and scene.input_table[Constants.PlayerInput.GBA_B][scene.I_T_PRESSED]):
 		set_action(Constants.ActionType.SPIN)
 
+func handle_idle():
+	if boost == 0:
+		.handle_idle()
+
 func process_unit(delta, time_elapsed : float):
 	# always be movin'
 	facing = Constants.Direction.RIGHT
@@ -136,6 +164,8 @@ func handle_recoil():
 	# set to min_speed
 
 func landed():
+	get_node("SpinningSprite").visible = false
+	get_node("SpinningSprite").rotation = 0
 	if get_current_action() == Constants.UnitCurrentAction.SPINNING:
 		hit(Constants.Direction.RIGHT)
 		boost = 0

Units/DownhillAutoscrollerPlayer.tscn

@@ -1,14 +1,18 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://Scripts/Units/DownhillAutoscrollerPlayer.gd" type="Script" id=1]
 [ext_resource path="res://Graphics/Units/Player.png" type="Texture" id=2]
-[ext_resource path="res://Graphics/Units/PlayerJump2.png" type="Texture" id=3]
-[ext_resource path="res://Graphics/Units/PlayerJump1.png" type="Texture" id=4]
-[ext_resource path="res://Graphics/Animations/PlayerWalk.tres" type="SpriteFrames" id=5]
-[ext_resource path="res://Graphics/Units/PlayerRecoil.png" type="Texture" id=6]
+[ext_resource path="res://Graphics/Units/Kyouko/Move-2.png" type="Texture" id=3]
+[ext_resource path="res://Graphics/Units/Kyouko/Move+2.png" type="Texture" id=4]
+[ext_resource path="res://Graphics/Units/Kyouko/Jump.png" type="Texture" id=5]
+[ext_resource path="res://Graphics/Units/Kyouko/Move0.png" type="Texture" id=6]
+[ext_resource path="res://Graphics/Units/Kyouko/Fall.png" type="Texture" id=7]
+[ext_resource path="res://Graphics/Units/Kyouko/Move+1.png" type="Texture" id=8]
+[ext_resource path="res://Graphics/Units/Kyouko/Recoil.png" type="Texture" id=9]
+[ext_resource path="res://Graphics/Units/Kyouko/Move-1.png" type="Texture" id=10]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 6, 14 )
+extents = Vector2( 9, 34 )
 
 [node name="Player" type="Area2D"]
 z_index = 1
@@ -16,7 +20,7 @@ collision_layer = 0
 script = ExtResource( 1 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( 0, -14 )
+position = Vector2( 0, -36 )
 shape = SubResource( 1 )
 
 [node name="Idle" type="Sprite" parent="."]
@@ -24,24 +28,49 @@ visible = false
 texture = ExtResource( 2 )
 offset = Vector2( 0, -15 )
 
-[node name="Walk" type="AnimatedSprite" parent="."]
+[node name="Move0" type="Sprite" parent="."]
 visible = false
-frames = ExtResource( 5 )
-offset = Vector2( 0, -15 )
+texture = ExtResource( 6 )
+offset = Vector2( 0, -48 )
+
+[node name="Move+1" type="Sprite" parent="."]
+visible = false
+texture = ExtResource( 8 )
+offset = Vector2( 0, -48 )
+
+[node name="Move+2" type="Sprite" parent="."]
+visible = false
+texture = ExtResource( 4 )
+offset = Vector2( 0, -48 )
+
+[node name="Move-1" type="Sprite" parent="."]
+visible = false
+texture = ExtResource( 10 )
+offset = Vector2( 0, -48 )
+
+[node name="Move-2" type="Sprite" parent="."]
+visible = false
+texture = ExtResource( 3 )
+offset = Vector2( 0, -48 )
 
 [node name="Jump1" type="Sprite" parent="."]
 visible = false
-texture = ExtResource( 4 )
-offset = Vector2( 0, -15 )
+texture = ExtResource( 5 )
+offset = Vector2( 0, -48 )
 
 [node name="Jump2" type="Sprite" parent="."]
 visible = false
-texture = ExtResource( 3 )
-offset = Vector2( 0, -15 )
+texture = ExtResource( 7 )
+offset = Vector2( 0, -48 )
 
 [node name="Recoil" type="Sprite" parent="."]
 visible = false
-texture = ExtResource( 6 )
-offset = Vector2( 0, -15 )
+texture = ExtResource( 9 )
+offset = Vector2( 0, -48 )
+
+[node name="SpinningSprite" type="Sprite" parent="."]
+visible = false
+position = Vector2( 0, -48 )
+texture = ExtResource( 5 )
 
 [connection signal="area_entered" from="." to="." method="_on_Player_area_entered"]