diff --git a/Replays/Rival.dat b/Replays/Rival.dat new file mode 100644 index 0000000..bdbc7f4 Binary files /dev/null and b/Replays/Rival.dat differ diff --git a/Scenes/DownhillAutoscroller.tscn b/Scenes/DownhillAutoscroller.tscn index 4f00b54..a12ff84 100644 --- a/Scenes/DownhillAutoscroller.tscn +++ b/Scenes/DownhillAutoscroller.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://Tile Sets/SnowySlopes.tres" type="TileSet" id=1] [ext_resource path="res://Units/DownhillAutoscrollerPlayer.tscn" type="PackedScene" id=2] @@ -14,6 +14,8 @@ [ext_resource path="res://Fonts/squares/squares.tres" type="DynamicFont" id=12] [ext_resource path="res://Scripts/InGameUI.gd" type="Script" id=13] [ext_resource path="res://Fonts/squares/squares_big.tres" type="DynamicFont" id=14] +[ext_resource path="res://Scripts/Units/FollowReplay.gd" type="Script" id=15] +[ext_resource path="res://Scripts/PlayerRecorder.gd" type="Script" id=16] [sub_resource type="Animation" id=3] resource_name = "InitialFade" @@ -121,11 +123,17 @@ position = Vector2( 91, -197 ) offset = Vector2( 0, -15 ) smoothing_speed = 7.0 +[node name="PlayerRecorder" type="Node" parent="Player"] +script = ExtResource( 16 ) +save_to = "res://Replays/ReplayOutput.dat" + [node name="SpectatorCam" type="Camera2D" parent="."] offset = Vector2( 0, -15 ) [node name="Rival" parent="." instance=ExtResource( 6 )] position = Vector2( 91, -197 ) +script = ExtResource( 15 ) +replay_file = "res://Replays/Rival.dat" [node name="CanvasLayer" type="CanvasLayer" parent="."] script = ExtResource( 13 ) diff --git a/Scripts/GameScene.gd b/Scripts/GameScene.gd index 06bffe6..d9e9fef 100644 --- a/Scripts/GameScene.gd +++ b/Scripts/GameScene.gd @@ -16,7 +16,6 @@ export var target_time : float export var defeat_cutscene : String export var victory_cutscene : String const Constants = preload("res://Scripts/Constants.gd") -const Unit = preload("res://Scripts/Unit.gd") const UNIT_DIRECTORY = { Constants.UnitType.CIRNO: preload("res://Units/DownhillAutoscrollerNPCCirno.tscn"), Constants.UnitType.SANAE: preload("res://Units/DownhillAutoscrollerNPCSanae.tscn"), @@ -64,22 +63,24 @@ var rng = RandomNumberGenerator.new() func _ready(): MusicController.play_kyouko_snow() - units.append(get_node("Player")) + units.append($Player) player = units[0] player.init_unit_w_scene(self) - player_cam = player.get_node("Camera2D") + player_cam = $Player/Camera2D player_cam.make_current() player_cam.offset_v = camera_v_offset - units.append(get_node("Rival")) - get_node("Rival").init_unit_w_scene(self) + units.append($Rival) + $Rival.init_unit_w_scene(self) stage_env = load("res://Scripts/StageEnvironment.gd").new(self) - player.get_node("Camera2D").make_current() + $Player/Camera2D.make_current() for spawning_key in spawning: spawning_map[spawning_key] = null find_node("PitTransitionPlayer").play("InitialFade") + + target_time = $Rival.replay.length() # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): @@ -107,6 +108,10 @@ func _process(delta): if not race_over and player.pos.x >= finish_x_pos: race_over = true + + if is_instance_valid(player.recorder): + player.recorder.save() + if time_elapsed_in_race > target_time: # lost race get_tree().change_scene("res://Scenes/" + defeat_cutscene + ".tscn") diff --git a/Scripts/InGameUI.gd b/Scripts/InGameUI.gd index c3ede8f..e4458b0 100644 --- a/Scripts/InGameUI.gd +++ b/Scripts/InGameUI.gd @@ -21,18 +21,16 @@ var timer : RichTextLabel func _ready(): scene = get_node("/root/Scene") player = get_node("/root/Scene/Player") - speedometer = get_node("Speedometer") - timer = get_node("Timer") - boost_label = get_node("BoostLabel") + speedometer = $Speedometer + timer = $Timer + boost_label = $BoostLabel # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): - speedometer.text = str(floor(scene.player_speed_mph)) + " MPH" + speedometer.text = " %d MPH" % scene.player_speed_mph - var dec_value : int = floor((scene.time_elapsed_in_race - floor(scene.time_elapsed_in_race)) - * 100) - timer.text = str(floor(scene.time_elapsed_in_race)) + ":" + str(dec_value) + timer.text = (" %05.2f" % scene.time_elapsed_in_race).replace(".", ":") if player.get_current_action() == Constants.UnitCurrentAction.SPINNING: flash_boost = false diff --git a/Scripts/PlayerRecorder.gd b/Scripts/PlayerRecorder.gd new file mode 100644 index 0000000..b80d57b --- /dev/null +++ b/Scripts/PlayerRecorder.gd @@ -0,0 +1,35 @@ +extends Node +class_name PlayerRecorder + +var replay: ReplayRecording +var this_frame: bool = true +var sprite: int = 0 +var player: Node +var scene: Node + +export var save_to: String +export var enabled: bool + +func _ready(): + if not enabled: + queue_free() + + replay = ReplayRecording.new() + replay.time_per_frame = 1.0 / 30.0 + player = get_parent() + player.recorder = self + scene = player.get_parent() + +func _process(_delta): + if this_frame: + this_frame = false + replay.positions.append(player.pos) + replay.sprites.append(sprite) + replay.frames += 1 + + else: + this_frame = true + +func save(): + replay.save_to_uri(save_to) + queue_free() diff --git a/Scripts/ReplayRecording.gd b/Scripts/ReplayRecording.gd new file mode 100644 index 0000000..5187e15 --- /dev/null +++ b/Scripts/ReplayRecording.gd @@ -0,0 +1,58 @@ +extends Object +class_name ReplayRecording + +const TAPER: float = 7.0 + +var time_per_frame: float +var frames: int = 0 + +var positions: Array +var sprites: Array + +func load_from(file: File): + time_per_frame = file.get_real() + frames = file.get_32() + positions = [] + sprites = [] + + for _i in range(frames): + var x: float = file.get_real() + var y: float = file.get_real() + positions.append(Vector2(x, y)) + sprites.append(file.get_8()) + +func load_from_uri(uri: String): + var file: File = File.new() + file.open(uri, File.READ) + load_from(file) + file.close() + +func save_to(file: File): + file.store_real(time_per_frame) + file.store_32(frames) + + for i in range(frames): + file.store_real(positions[i].x) + file.store_real(positions[i].y) + file.store_8(sprites[i]) + +func save_to_uri(uri: String): + var file: File = File.new() + file.open(uri, File.WRITE) + save_to(file) + file.close() + +func position(frame: int) -> Vector2: + if frame < frames: + return positions[frame] + else: + return lerp(positions[-2], positions[-1], 2 + TAPER * atan((frame - frames) / TAPER)) + +func sprite(frame: int) -> int: + if frame < frames: + return sprites[frame] + else: + return sprites[-1] + +func length() -> float: + return time_per_frame * frames diff --git a/Scripts/Unit.gd b/Scripts/Unit.gd index 49b4669..a5549df 100644 --- a/Scripts/Unit.gd +++ b/Scripts/Unit.gd @@ -35,6 +35,8 @@ var time_elapsed : float var is_flash : bool = false var flash_start_timestamp : float +var recorder: PlayerRecorder = null + # Called when the node enters the scene tree for the first time func _ready(): for action_num in Constants.UNIT_TYPE_ACTIONS[unit_type]: @@ -236,13 +238,22 @@ func handle_idle(): else: set_sprite(Constants.SpriteClass.JUMP, 1) -func set_sprite(sprite_class : int, index : int = 0): +func set_sprite(sprite_class: int, index: int = 0, ignore_bad_values: bool = false): + if ignore_bad_values: + if not(unit_type in Constants.UNIT_SPRITES) or not(sprite_class in Constants.UNIT_SPRITES[unit_type]): + return + assert(unit_type in Constants.UNIT_SPRITES) assert(sprite_class in Constants.UNIT_SPRITES[unit_type]) + var node_list = sprite_class_nodes[sprite_class] var true_index : int = index if true_index > len(node_list) - 1: true_index = 0 + + if is_instance_valid(recorder): + recorder.sprite = (index << 3) | sprite_class + var new_sprite : Node2D = node_list[true_index] if (is_flash): if int((time_elapsed - flash_start_timestamp) / Constants.FLASH_CYCLE) % 2 == 1: diff --git a/Scripts/Units/DownhillAutoscrollerPlayer.gd b/Scripts/Units/DownhillAutoscrollerPlayer.gd index e2a3453..321d2dc 100644 --- a/Scripts/Units/DownhillAutoscrollerPlayer.gd +++ b/Scripts/Units/DownhillAutoscrollerPlayer.gd @@ -19,7 +19,6 @@ var jump_audiostream_player : AudioStreamPlayer var land_audiostream_player : AudioStreamPlayer var snow_audiostream_player : AudioStreamPlayer - func init_unit_w_scene(scene): .init_unit_w_scene(scene) hit_audiostream_player = scene.get_node("HitAudioStreamPlayer") diff --git a/Scripts/Units/FollowReplay.gd b/Scripts/Units/FollowReplay.gd new file mode 100644 index 0000000..1029cd1 --- /dev/null +++ b/Scripts/Units/FollowReplay.gd @@ -0,0 +1,29 @@ +extends Unit + +var replay : ReplayRecording = null + +export var replay_file: String + +func _ready(): + ._ready() + replay = ReplayRecording.new() + replay.load_from_uri(replay_file) + + +func process_unit(delta : float, time_elapsed : float): + self.time_elapsed = time_elapsed + + if replay != null and replay.time_per_frame > 0: + handle_replay(time_elapsed) + +func handle_replay(at_time: float): + var frame: int = int(at_time / replay.time_per_frame) + var subframe: float = (at_time / replay.time_per_frame) - frame + + pos = lerp(replay.position(frame), replay.position(frame + 1), subframe) + + var sprite: int = replay.sprite(frame) + var index: int = sprite >> 3 + sprite &= 7 + + set_sprite(sprite, index, true) diff --git a/Sounds/Beep.wav.import b/Sounds/Beep.wav.import index bd13725..eb73235 100644 --- a/Sounds/Beep.wav.import +++ b/Sounds/Beep.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/Sounds/ski-67717.wav.import b/Sounds/ski-67717.wav.import index ed6ae53..22b0978 100644 --- a/Sounds/ski-67717.wav.import +++ b/Sounds/ski-67717.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/project.godot b/project.godot index 8ea1d1e..0eee88e 100644 --- a/project.godot +++ b/project.godot @@ -34,6 +34,16 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Scripts/Units/Player.gd" }, { +"base": "Node", +"class": "PlayerRecorder", +"language": "GDScript", +"path": "res://Scripts/PlayerRecorder.gd" +}, { +"base": "Object", +"class": "ReplayRecording", +"language": "GDScript", +"path": "res://Scripts/ReplayRecording.gd" +}, { "base": "Area2D", "class": "Unit", "language": "GDScript", @@ -45,6 +55,8 @@ _global_script_class_icons={ "NPCExample": "", "NPCUnit": "", "Player": "", +"PlayerRecorder": "", +"ReplayRecording": "", "Unit": "" }