yuki/smashball
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: yuki:bc7545542a5b662188a5fef2713fcfc64a4d2df6
Branches Tags
yuki:master
..
compare: yuki:7878e4bd142659652f708c90a07d1908f77fbd38
Branches Tags
yuki:master

No commits in common. "bc7545542a5b662188a5fef2713fcfc64a4d2df6" and "7878e4bd142659652f708c90a07d1908f77fbd38" have entirely different histories.
bc7545542a ... 7878e4bd14

5 changed files with 202 additions and 236 deletions
Show stats Expand all files Collapse all files

26
scenes/classes/level.gd
View file

@ -1,26 +0,0 @@
class_name Level extends Node2D
@export var director: StateMachine
@export var player_1_spawn: PlayerSpawnPoint
@export var player_2_spawn: PlayerSpawnPoint
@export var ball_spawn: Marker2D
@export var floor_layer: TileMapLayer
@export var wall_layer: TileMapLayer
@export var block_layer: BlockTileLayer
#@export var goal_layer: GoalTileLayer
func _ready() -> void:
# :sheesh:
assert(director != null, "no director set")
assert(player_1_spawn != null, "no player 1 spawn point set")
assert(player_2_spawn != null, "no player 2 spawn point set")
assert(ball_spawn != null, "no ball spawn point set")
assert(floor_layer != null, "no floor tilemap layer set")
assert(wall_layer != null, "no wall tilemap layer set")
assert(block_layer != null, "no block tilemap layer set")
#assert(goal_layer != null, "no goal tilemap layer set")
player_1_spawn.player_id = 1
player_2_spawn.player_id = 2

1
scenes/classes/level.gd.uid
View file

@ -1 +0,0 @@
uid://dhvek22isq1ts

6
scenes/classes/level.tscn
View file

@ -1,6 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://dr4fwwrukyko0"]
[ext_resource type="Script" uid="uid://dhvek22isq1ts" path="res://scenes/classes/level.gd" id="1_fds1s"]
[node name="Level" type="Node2D"]
script = ExtResource("1_fds1s")

5
scenes/markers/player_spawn_point.gd
View file

@ -1,6 +1,5 @@
class_name PlayerSpawnPoint extends Marker2D extends Marker2D
@export_range(1,2) var player_id: int
@onready var player_scene: PackedScene = preload("res://scenes/player/player.tscn") @onready var player_scene: PackedScene = preload("res://scenes/player/player.tscn")
var player_id: int

400
scenes/player/player.tscn
View file

@ -59,174 +59,6 @@ tracks/3/keys = {
"values": [-16.0] "values": [-16.0]
} }
[sub_resource type="Animation" id="Animation_fcs02"]
resource_name = "hit_left_down"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_down"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [0]
}
[sub_resource type="Animation" id="Animation_h17s1"]
resource_name = "hit_left_up"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_up"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [0]
}
[sub_resource type="Animation" id="Animation_kvlxm"]
resource_name = "hit_power_down"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_down"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
[sub_resource type="Animation" id="Animation_myrg7"]
resource_name = "hit_power_up"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_up"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
[sub_resource type="Animation" id="Animation_ugbui"]
resource_name = "hit_right_down"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_down"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
[sub_resource type="Animation" id="Animation_je7p5"]
resource_name = "hit_right_up"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_up"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
[sub_resource type="Animation" id="Animation_fm80t"] [sub_resource type="Animation" id="Animation_fm80t"]
resource_name = "idle_down" resource_name = "idle_down"
length = 2.0 length = 2.0
@ -311,6 +143,60 @@ tracks/2/keys = {
"values": [0.0] "values": [0.0]
} }
[sub_resource type="Animation" id="Animation_qek5x"]
resource_name = "walk_right"
length = 0.475
loop_mode = 1
step = 0.0
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:frame")
tracks/0/interp = 0
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.12206663, 0.20329137, 0.37493116),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [1, 0, 1, 2]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:animation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"right"]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("AnimatedSprite2D:speed_scale")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [0.0]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("AnimatedSprite2D:offset:y")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0, 0.12206663, 0.20329137, 0.37493116),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [-16.0, -18.0, -16.0, -18.0]
}
[sub_resource type="Animation" id="Animation_5gtgg"] [sub_resource type="Animation" id="Animation_5gtgg"]
resource_name = "walk_left" resource_name = "walk_left"
length = 0.475 length = 0.475
@ -365,58 +251,172 @@ tracks/3/keys = {
"values": [-16.0, -18.0, -16.0, -18.0] "values": [-16.0, -18.0, -16.0, -18.0]
} }
[sub_resource type="Animation" id="Animation_qek5x"] [sub_resource type="Animation" id="Animation_h17s1"]
resource_name = "walk_right" resource_name = "hit_left_up"
length = 0.475
loop_mode = 1 loop_mode = 1
step = 0.0
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:frame") tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 0 tracks/0/interp = 1
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
"times": PackedFloat32Array(0, 0.12206663, 0.20329137, 0.37493116), "times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1, 1, 1, 1), "transitions": PackedFloat32Array(1),
"update": 1, "update": 1,
"values": [1, 0, 1, 2] "values": [&"idle_up"]
} }
tracks/1/type = "value" tracks/1/type = "value"
tracks/1/imported = false tracks/1/imported = false
tracks/1/enabled = true tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:animation") tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1 tracks/1/interp = 1
tracks/1/loop_wrap = true tracks/1/loop_wrap = true
tracks/1/keys = { tracks/1/keys = {
"times": PackedFloat32Array(0), "times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1), "transitions": PackedFloat32Array(1),
"update": 1, "update": 1,
"values": [&"right"] "values": [0]
} }
tracks/2/type = "value"
tracks/2/imported = false [sub_resource type="Animation" id="Animation_je7p5"]
tracks/2/enabled = true resource_name = "hit_right_up"
tracks/2/path = NodePath("AnimatedSprite2D:speed_scale") loop_mode = 1
tracks/2/interp = 1 tracks/0/type = "value"
tracks/2/loop_wrap = true tracks/0/imported = false
tracks/2/keys = { tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0), "times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1), "transitions": PackedFloat32Array(1),
"update": 0,
"values": [0.0]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("AnimatedSprite2D:offset:y")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0, 0.12206663, 0.20329137, 0.37493116),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1, "update": 1,
"values": [-16.0, -18.0, -16.0, -18.0] "values": [&"idle_up"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
[sub_resource type="Animation" id="Animation_ugbui"]
resource_name = "hit_right_down"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_down"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
[sub_resource type="Animation" id="Animation_fcs02"]
resource_name = "hit_left_down"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_down"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [0]
}
[sub_resource type="Animation" id="Animation_myrg7"]
resource_name = "hit_power_up"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_up"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
}
[sub_resource type="Animation" id="Animation_kvlxm"]
resource_name = "hit_power_down"
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("AnimatedSprite2D:animation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle_down"]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("AnimatedSprite2D:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [2]
} }
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ugbui"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_ugbui"]
@ -605,6 +605,7 @@ radius = 8.0
[node name="Player" type="CharacterBody2D"] [node name="Player" type="CharacterBody2D"]
collision_layer = 2 collision_layer = 2
collision_mask = 13 collision_mask = 13
floor_stop_on_slope = false
script = ExtResource("1_v6fml") script = ExtResource("1_v6fml")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
@ -615,7 +616,6 @@ libraries = {
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_f1ej7") sprite_frames = SubResource("SpriteFrames_f1ej7")
animation = &"idle_up" animation = &"idle_up"
frame = 1
offset = Vector2(0, -16) offset = Vector2(0, -16)
flip_h = true flip_h = true