Skip to content

Commit

Permalink
added Olister Mode
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidZajicek committed Mar 8, 2023
1 parent 96bbc4e commit c5d47e1
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 12 deletions.
7 changes: 4 additions & 3 deletions src/Grid.gd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var grid_center
func _ready():
bitmap.create(grid_size)
create_grid()
var spawn_pos: = Globals.tile_size.y * (10)
var spawn_pos: = Globals.tile_size.y * (11)
spawn_points.position.y = spawn_pos

func _process(_delta: float) -> void:
Expand All @@ -45,6 +45,7 @@ func destroy_lines():
for point in points:
if child.position / Globals.tile_size == point:
child.emit_signal("destroy_poly", child.score * multiplier)
child.animation_player.play("destroy")
bitmap.set_bitv(point, false)
if not Globals.user_settings.olister_mode:
child.animation_player.play("destroy")
bitmap.set_bitv(point, false)

2 changes: 1 addition & 1 deletion src/MainMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ text = "Exit Game"

[node name="Label" type="Label" parent="MainMenu/MarginContainer/VBoxContainer"]
layout_mode = 2
text = "v0.2.3"
text = "v0.2.4"
horizontal_alignment = 2
vertical_alignment = 2
6 changes: 6 additions & 0 deletions src/settings_menu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ const BASE_BLOCK_SIZE_LABEL: String = "[center]Max Block Size: "
@onready var break_time_label: RichTextLabel = $MarginContainer/VBoxContainer/GridContainer/BreakTimeLabel
@onready var break_time_slider: HSlider = $MarginContainer/VBoxContainer/GridContainer/BreakTimeSlider

@onready var check_button: CheckButton = $MarginContainer/VBoxContainer/GridContainer/CheckButton


@onready var change_block_texture_button: TextureButton = $MarginContainer/VBoxContainer/GridContainer/ChangeBlockTextureButton
@onready var back_button: Button = $MarginContainer/VBoxContainer/NavigationButtons/BackButton

Expand All @@ -38,6 +41,9 @@ func _ready() -> void:
break_time_slider.value_changed.connect(change_break_timer.bind())
break_time_slider.value = Globals.user_settings.break_time / 60

check_button.set_pressed_no_signal(Globals.user_settings.olister_mode)
check_button.toggled.connect(func(new_value): Globals.user_settings.olister_mode = new_value)

back_button.pressed.connect(func(): get_tree().change_scene_to_file("res://MainMenu.tscn"))


Expand Down
15 changes: 15 additions & 0 deletions src/settings_menu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,18 @@ max_value = 240.0
step = 5.0
tick_count = 6
ticks_on_borders = true

[node name="OlisterModeLabel" type="RichTextLabel" parent="MarginContainer/VBoxContainer/GridContainer"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 4
bbcode_enabled = true
text = "[center]Toggle Oliver/Alister Mode:
[font_size=14]This setting will disable blocks from being cleared, meaning you can't ever earn points[/font_size]
[/center]"
fit_content = true
scroll_active = false

[node name="CheckButton" type="CheckButton" parent="MarginContainer/VBoxContainer/GridContainer"]
layout_mode = 2
focus_mode = 0
13 changes: 5 additions & 8 deletions src/user_settings.gd
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,8 @@ const USER_SETTINGS_BASE_PATH := "user://user_settings"
@export var pickup_offset: float = 64.0 : set = set_pickup_offset
@export var block_scale: float = 0.5 : set = set_block_scale
@export var break_time: int = 0 : set = set_break_time
@export var olister_mode: bool = false : set = set_olister_mode

# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.


# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
pass

func write_settings() -> void:
ResourceSaver.save(self, UserSettings.get_settings_path())
Expand Down Expand Up @@ -57,3 +50,7 @@ func set_block_scale(new_scale: float):
func set_break_time(new_time: int):
break_time = new_time
write_settings()

func set_olister_mode(new_value: bool):
olister_mode = new_value
write_settings()

0 comments on commit c5d47e1

Please sign in to comment.