Skip to content

Remove some useless code and singletons #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions source/actors/hand/hand_behavior.gd
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ onready var initial_pos = get_pos()
var can_squeeze = false

func back():
t.interpolate_property(self, "transform/pos", get_pos(), can_squeeze, 0.2, Tween.TRANS_LINEAR,\
Tween.EASE_IN)
t.interpolate_property(self, "transform/pos", get_pos(), can_squeeze, 0.2,\
Tween.TRANS_LINEAR, Tween.EASE_IN)
t.start()
can_squeeze = false

func move_to( pos ):
t.interpolate_property(self, "transform/pos", get_pos(), pos, 0.2, Tween.TRANS_LINEAR,\
Tween.EASE_IN)
t.interpolate_method(self, "set_global_pos", get_global_pos(), pos, 0.2,\
Tween.TRANS_LINEAR, Tween.EASE_IN)
t.start()
can_squeeze = false

Expand Down
21 changes: 6 additions & 15 deletions source/actors/planet/planet.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[gd_scene load_steps=12 format=1]
[gd_scene load_steps=11 format=1]

[ext_resource path="res://actors/planet/planet_new_behavior.gd" type="Script" id=1]
[ext_resource path="res://screens/GUI/under.png" type="Texture" id=2]
[ext_resource path="res://screens/GUI/fill.png" type="Texture" id=3]
[ext_resource path="res://actors/planet/tapometer_behavior.gd" type="Script" id=4]
[ext_resource path="res://actors/planet/samples.tres" type="SampleLibrary" id=5]
[ext_resource path="res://actors/planet/samples.tres" type="SampleLibrary" id=4]

[sub_resource type="CircleShape2D" id=1]

Expand Down Expand Up @@ -143,7 +142,9 @@ tracks/1/keys = {
"values": [ 54.5617, 64.5283 ]
}

[node name="planet" type="Node2D"]
[node name="planet" type="Node2D" groups=[
"planet",
]]

script/script = ExtResource( 1 )
needed_tics = 10
Expand Down Expand Up @@ -175,7 +176,6 @@ texture/over = null
texture/progress = ExtResource( 3 )
radial_fill/fill_degrees = 360.0
radial_fill/center_offset = Vector2( 0, 0 )
script/script = ExtResource( 4 )

[node name="sprites" type="Node2D" parent="."]

Expand Down Expand Up @@ -206,13 +206,6 @@ __meta__ = {
"_edit_lock_": true
}

[node name="timer" type="Timer" parent="."]

process_mode = 1
wait_time = 2.0
one_shot = true
autostart = false

[node name="animator" type="AnimationPlayer" parent="."]

playback/process_mode = 1
Expand Down Expand Up @@ -243,7 +236,7 @@ params/attenuation/min_distance = 1.0
params/attenuation/max_distance = 2048.0
params/attenuation/distance_exp = 1.0
config/polyphony = 1
config/samples = ExtResource( 5 )
config/samples = ExtResource( 4 )
config/pitch_random = 0.0

[connection signal="input_event" from="area" to="." method="_on_area_input_event"]
Expand All @@ -252,8 +245,6 @@ config/pitch_random = 0.0

[connection signal="mouse_exit" from="area" to="." method="_on_area_mouse_exit"]

[connection signal="timeout" from="timer" to="." method="_on_timer_timeout"]

[connection signal="tween_complete" from="tween" to="." method="_on_tween_tween_complete"]


50 changes: 34 additions & 16 deletions source/actors/planet/planet_new_behavior.gd
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
extends Node2D

signal score_update(score)
signal energy_update(energy)
signal selected(pos)

var can_rank = true
var mouse_on = false
var is_selected = false
Expand All @@ -10,38 +14,54 @@ var current_rank = 1 setget set_rank

onready var shape = get_node("area/shape").get_shape()
onready var sprites = get_node("sprites")
onready var tapometer = get_node("tapometer")

export (float) var min_wait_time
export (float) var max_wait_time
export (int) var energy_consumption = 7
export (int) var score_potential = 10
var score_multiplier = 1
var current_timer = 0
var time_acc = 0

func _ready():
randomize()
var t = get_node("timer")
t.set_wait_time(rand_range(min_wait_time, max_wait_time))
t.start()
tapometer.set_hidden(true)
current_timer = rand_range(min_wait_time, max_wait_time)
set_process(true)

func _process(delta):
time_acc += delta
if time_acc >= current_timer:
time_acc = 0
current_timer = rand_range(min_wait_time, max_wait_time)
if current_rank < 5:
set_rank(current_rank + 1)
if can_rank:
tapometer.set_max(needed_tics)
tapometer.set_value(tics)

func set_tics(value):
tics = value
if tics >= needed_tics:
if current_rank > 1:
set_rank(current_rank - 1)
tics = 0

func set_rank(value):
if value > current_rank and can_rank:
increase_rank()
globals.energy -= energy_consumption
emit_signal("energy_update", -energy_consumption)
current_rank = value
score_multiplier += 1
tics = 0
elif value < current_rank and can_rank:
decrease_rank()
globals.energy += energy_consumption
globals.score += score_potential * score_multiplier
emit_signal("energy_update", energy_consumption)
emit_signal("score_update", score_potential * score_multiplier)
score_multiplier -= 1
current_rank = value
tics = 0

func increase_rank():
can_rank = false
var t = get_node("tween")
Expand All @@ -52,6 +72,7 @@ func increase_rank():
t.interpolate_property(sprites, "transform/scale", sprites.get_scale(),\
sprites.get_scale() * 1.1, 0.5, Tween.TRANS_ELASTIC, Tween.EASE_IN)
get_node("soundeffects").play("grow")

func decrease_rank():
can_rank = false
var t = get_node("tween")
Expand All @@ -62,24 +83,21 @@ func decrease_rank():
t.interpolate_property(sprites, "transform/scale", sprites.get_scale(),\
sprites.get_scale() * 0.9, 0.5, Tween.TRANS_ELASTIC, Tween.EASE_IN)
get_node("soundeffects").play("shrink")

func _on_area_mouse_enter():
mouse_on = true

func _on_area_mouse_exit():
mouse_on = false
is_selected = false
tapometer.set_hidden(true)

func _on_area_input_event( viewport, event, shape_idx ):
if event.is_action("tap") and mouse_on:
input_handler.emit_signal("tapped", self)
emit_signal("selected", get_global_pos())
set_tics(tics + 1)
is_selected = true

func _on_timer_timeout():
var t = get_node("timer")
t.set_wait_time(rand_range(min_wait_time, max_wait_time))
t.start()
if current_rank < 5:
set_rank(current_rank + 1)
tapometer.set_hidden(false)

func _on_tween_tween_complete( object, key ):
can_rank = true
6 changes: 5 additions & 1 deletion source/actors/planet/planet_one.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,14 @@ tracks/16/keys = {
[sub_resource type="CircleShape2D" id=2]

custom_solver_bias = 0.0
radius = 44.5086
radius = 80.0

[node name="planet" instance=ExtResource( 1 )]

[node name="sprites" parent="."]

transform/scale = Vector2( 1.9, 1.9 )

[node name="layer" type="Sprite" parent="sprites"]

transform/scale = Vector2( 0.182778, 0.182778 )
Expand Down
3 changes: 2 additions & 1 deletion source/actors/planet/tapometer_behavior.gd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ extends TextureProgress
# var b = "textvar"

func _ready():
set_process(true)
#set_process(true)
pass

func _process(delta):
set_hidden(!get_parent().is_selected)
Expand Down
5 changes: 0 additions & 5 deletions source/areas/level_0/star_bahavior.gd
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
extends Sprite

# class member variables go here, for example:
# var a = 2
# var b = "textvar"

func _ready():
randomize()
get_node("starAnimator").set_speed(rand_range(0.25,2))
Loading