Skip to content

Commit

Permalink
learn to pull when switching branches
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidZajicek committed Mar 13, 2023
1 parent 11750b0 commit 9b78b58
Show file tree
Hide file tree
Showing 3 changed files with 129 additions and 1 deletion.
7 changes: 7 additions & 0 deletions src/Grid.gd
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ extends Node2D
var grid_size: Vector2 = Vector2(10, 10)
var grid_center

#signals
signal score_calculation_completed

# Called when the node enters the scene tree for the first time.
func _ready():
bitmap.create(grid_size)
Expand All @@ -40,12 +43,16 @@ func destroy_lines():
var total_rows: int = bitmap.get_all_rows().size() + 1
var total_columns: int = bitmap.get_all_columns().size() + 1
var multiplier: int = total_columns * total_rows
var running_total: int = 0
for child in get_children():
if child is Poly:
for point in points:
if child.position / Globals.tile_size == point:
running_total += child.score
child.emit_signal("destroy_poly", child.score * multiplier)
if not Globals.user_settings.olister_mode:
child.animation_player.play("destroy")
bitmap.set_bitv(point, false)

emit_signal("score_calculation_completed", running_total, multiplier)

8 changes: 8 additions & 0 deletions src/InfiniteModeMain.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ extends Node2D
@onready var grid: Grid = $Grid
@onready var break_button: Button = $CanvasLayer/UserInterface/BreakButton
@onready var hint_timer: Timer = $HintTimer
@onready var pop_up_label: RichTextLabel = $CanvasLayer/PopUpLabel
@onready var animation_player: AnimationPlayer = $CanvasLayer/PopUpLabel/AnimationPlayer

var offset: Vector2
var dragging: Polyomino
Expand All @@ -28,6 +30,7 @@ func _ready() -> void:
$CanvasLayer/UserInterface/HBoxContainer/RestartButton.pressed.connect(save_and_reload.bind())
# hint_timer.timeout.connect(show_random_best_move.bind())
hint_timer.start()
grid.score_calculation_completed.connect(_on_Grid_score_caluclation_completed.bind())
break_button.pressed.connect(accept_break_warning.bind())

func _process(_delta: float) -> void:
Expand Down Expand Up @@ -107,6 +110,11 @@ func _on_Poly_destroyed(_score: int):
score += _score
$CanvasLayer/UserInterface/HBoxContainer/ScoreLabel.text = "Current Score: \n" + str(score)

func _on_Grid_score_caluclation_completed(_score: int, multiplier: int):
pop_up_label.text = "[center]" + str(_score * multiplier)
animation_player.play("display_points_earned")


func test_if_legal(_polyomino: Polyomino, _position: Vector2) -> bool:
for poly in _polyomino.get_children():
if poly is Poly:
Expand Down
115 changes: 114 additions & 1 deletion src/InfiniteModeMain.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=3 uid="uid://dxcwofo851bx3"]
[gd_scene load_steps=10 format=3 uid="uid://dxcwofo851bx3"]

[ext_resource type="Script" path="res://InfiniteModeMain.gd" id="1_l1gu7"]
[ext_resource type="PackedScene" uid="uid://t6a4vln63jxa" path="res://Grid.tscn" id="2_1uqbt"]
Expand All @@ -14,6 +14,90 @@ bg_color = Color(0, 0, 0, 1)
Button/styles/hover = SubResource("StyleBoxFlat_gil0s")
Button/styles/normal = SubResource("StyleBoxFlat_ob00p")

[sub_resource type="Animation" id="Animation_wi8wo"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("PopUpLabel:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = false
tracks/1/path = NodePath("PopUpLabel:theme_override_font_sizes/normal_font_size")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [null]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("PopUpLabel:scale")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector2(1, 1)]
}

[sub_resource type="Animation" id="Animation_wgm3c"]
resource_name = "display_points_earned"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("PopUpLabel:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [true, false]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = false
tracks/1/path = NodePath("PopUpLabel:theme_override_font_sizes/normal_font_size")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.3, 0.8, 1),
"transitions": PackedFloat32Array(1, -2, -2, 0.5),
"update": 0,
"values": [0, 100, 100, 50]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("PopUpLabel:scale")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 0.3, 0.8, 1),
"transitions": PackedFloat32Array(1, 128, 1, 1),
"update": 0,
"values": [Vector2(0, 0), Vector2(2, 2), Vector2(2, 2), Vector2(0, 0)]
}

[sub_resource type="AnimationLibrary" id="AnimationLibrary_pkxme"]
_data = {
"RESET": SubResource("Animation_wi8wo"),
"display_points_earned": SubResource("Animation_wgm3c")
}

[node name="InfiniteModeMain" type="Node2D"]
script = ExtResource("1_l1gu7")

Expand Down Expand Up @@ -74,6 +158,35 @@ layout_mode = 2
theme = SubResource("Theme_y2qe1")
text = "You've been playing for over your break reminder time, maybe take a break?"

[node name="PopUpLabel" type="RichTextLabel" parent="CanvasLayer"]
visible = false
anchors_preset = -1
anchor_left = 0.267
anchor_top = 0.45
anchor_right = 0.711
anchor_bottom = 0.55
offset_left = -192.24
offset_top = 29.5
offset_right = 208.08
offset_bottom = -29.5
grow_horizontal = 2
grow_vertical = 2
pivot_offset = Vector2(360, 34)
size_flags_horizontal = 6
size_flags_vertical = 6
mouse_filter = 2
theme = ExtResource("3_g6g1x")
bbcode_enabled = true
text = "[center]123"
scroll_active = false
shortcut_keys_enabled = false

[node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasLayer/PopUpLabel"]
root_node = NodePath("../..")
libraries = {
"": SubResource("AnimationLibrary_pkxme")
}

[node name="Timer" type="Timer" parent="."]
wait_time = 180.0
autostart = true
Expand Down

0 comments on commit 9b78b58

Please sign in to comment.