From df906cbd205e47ad4ac6633f1d4649311fd74ffe Mon Sep 17 00:00:00 2001 From: William Tumeo Date: Sun, 15 Oct 2017 13:50:51 -0200 Subject: [PATCH] Remove some useless code and singletons --- source/actors/hand/hand_behavior.gd | 9 +- source/actors/planet/planet.tscn | 21 ++-- source/actors/planet/planet_new_behavior.gd | 50 ++++++--- source/actors/planet/planet_one.tscn | 6 +- source/actors/planet/tapometer_behavior.gd | 3 +- source/areas/level_0/star_bahavior.gd | 5 - source/areas/level_0/starsLayer.tscn | 113 ++++---------------- source/areas/playground/playground.gd | 28 +++++ source/areas/playground/playground.tscn | 35 +++--- source/engine.cfg | 5 - source/globals.gd | 10 +- source/globals.tscn | 1 + source/input_behavior.gd | 2 +- source/screens/GUI/GUI_new.tscn | 20 ++-- source/screens/GUI/GUI_new_behavior.gd | 5 +- source/screens/game_over/game_over.gd | 3 - source/screens/game_over/game_over.tscn | 62 ++++++++++- source/screens/main_menu/main_menu.tscn | 74 ++++++++++++- 18 files changed, 271 insertions(+), 181 deletions(-) create mode 100644 source/areas/playground/playground.gd diff --git a/source/actors/hand/hand_behavior.gd b/source/actors/hand/hand_behavior.gd index 38a7a1b..ea50125 100644 --- a/source/actors/hand/hand_behavior.gd +++ b/source/actors/hand/hand_behavior.gd @@ -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 diff --git a/source/actors/planet/planet.tscn b/source/actors/planet/planet.tscn index fed112b..05e7896 100644 --- a/source/actors/planet/planet.tscn +++ b/source/actors/planet/planet.tscn @@ -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] @@ -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 @@ -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="."] @@ -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 @@ -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"] @@ -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"] diff --git a/source/actors/planet/planet_new_behavior.gd b/source/actors/planet/planet_new_behavior.gd index c239324..38175c0 100644 --- a/source/actors/planet/planet_new_behavior.gd +++ b/source/actors/planet/planet_new_behavior.gd @@ -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 @@ -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") @@ -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") @@ -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 diff --git a/source/actors/planet/planet_one.tscn b/source/actors/planet/planet_one.tscn index 0104147..acb77a8 100644 --- a/source/actors/planet/planet_one.tscn +++ b/source/actors/planet/planet_one.tscn @@ -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 ) diff --git a/source/actors/planet/tapometer_behavior.gd b/source/actors/planet/tapometer_behavior.gd index 472eeef..d0fe219 100644 --- a/source/actors/planet/tapometer_behavior.gd +++ b/source/actors/planet/tapometer_behavior.gd @@ -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) diff --git a/source/areas/level_0/star_bahavior.gd b/source/areas/level_0/star_bahavior.gd index ddc2a25..f1a6dba 100644 --- a/source/areas/level_0/star_bahavior.gd +++ b/source/areas/level_0/star_bahavior.gd @@ -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)) diff --git a/source/areas/level_0/starsLayer.tscn b/source/areas/level_0/starsLayer.tscn index 434b499..e0ba056 100644 --- a/source/areas/level_0/starsLayer.tscn +++ b/source/areas/level_0/starsLayer.tscn @@ -1,12 +1,9 @@ -[gd_scene load_steps=4 format=1] +[gd_scene load_steps=2 format=1] [ext_resource path="res://areas/level_0/star.tscn" type="PackedScene" id=1] -[ext_resource path="res://areas/level_0/star.png" type="Texture" id=2] -[ext_resource path="res://areas/level_0/star_bahavior.gd" type="Script" id=3] [node name="starsLayer" type="CanvasLayer"] -editor/display_folded = true layer = -3 offset = Vector2( 0, 0 ) rotation = 0.0 @@ -14,183 +11,119 @@ scale = Vector2( 1, 1 ) [node name="stars" type="Node2D" parent="."] -editor/display_folded = true transform/scale = Vector2( 0.440828, 0.440828 ) -[node name="star" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1858.93, 951.704 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star19" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star19" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2504.92, 1118.63 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star20" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star20" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2084.37, 429.078 ) transform/rot = 89.2039 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star21" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star21" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2724.67, 720.812 ) transform/rot = 89.2039 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star22" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star22" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1436.49, 1406.58 ) transform/rot = 89.2039 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star17" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star17" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2431.83, 1065.78 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star16" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star16" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2457.07, 1195.37 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star15" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star15" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2516.21, 1020.78 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star14" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star14" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1385.1, 1098.81 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star13" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star13" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1302.81, 1118.63 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star12" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star12" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1238.94, 1150.19 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star11" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star11" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1718.74, 897.44 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star10" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star10" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2549.36, 429.02 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star9" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star9" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1401.32, 284.055 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star8" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star8" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1139.04, 353.393 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star7" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star7" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 140.686, 662.249 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star6" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star6" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 392.736, 1481.47 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star5" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star5" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 572.438, 647.395 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star4" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star4" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1647.01, 395.598 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star3" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star3" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1644.43, 1478.42 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star2" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star2" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 1036.92, 883.049 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) -[node name="star1" type="Sprite" parent="stars" instance=ExtResource( 1 )] +[node name="star1" parent="stars" instance=ExtResource( 1 )] transform/pos = Vector2( 2561.04, 1086.02 ) -transform/rot = 128.336 transform/scale = Vector2( 0.414436, 0.414436 ) -texture = ExtResource( 2 ) -script/script = ExtResource( 3 ) diff --git a/source/areas/playground/playground.gd b/source/areas/playground/playground.gd new file mode 100644 index 0000000..9230459 --- /dev/null +++ b/source/areas/playground/playground.gd @@ -0,0 +1,28 @@ +extends Node + +onready var gui = get_node("GUI_new") +var score = 0 +var energy = 100 + +func _ready(): + for planet in get_tree().get_nodes_in_group('planet'): + planet.connect('energy_update', self, '_planet_energy_update') + planet.connect('score_update', self, '_planet_score_update') + planet.connect('selected', self, '_planet_selected') + +func _planet_energy_update(d_energy): + energy += d_energy + energy = min(100, energy) + if energy <= 0: + get_tree().change_scene("res://screens/game_over/game_over.tscn") + gui.get_node("energy").set_val(energy) + +func _planet_score_update(d_score): + score += d_score + gui.get_node("score").set_text("Score: %s" % score) + +func _planet_selected(planet_pos): + if planet_pos.x > OS.get_window_size().x/2: + get_node("hand_right").move_to(planet_pos) + else: + get_node("hand_left").move_to(planet_pos) diff --git a/source/areas/playground/playground.tscn b/source/areas/playground/playground.tscn index d2761fc..afd8d48 100644 --- a/source/areas/playground/playground.tscn +++ b/source/areas/playground/playground.tscn @@ -1,19 +1,22 @@ -[gd_scene load_steps=9 format=1] +[gd_scene load_steps=10 format=1] -[ext_resource path="res://areas/level_0/starsLayer.tscn" type="PackedScene" id=1] -[ext_resource path="res://actors/planet/planet_one.tscn" type="PackedScene" id=2] -[ext_resource path="res://actors/hand/hand.tscn" type="PackedScene" id=3] -[ext_resource path="res://screens/GUI/GUI_new.tscn" type="PackedScene" id=4] +[ext_resource path="res://areas/playground/playground.gd" type="Script" id=1] +[ext_resource path="res://areas/level_0/starsLayer.tscn" type="PackedScene" id=2] +[ext_resource path="res://actors/planet/planet_one.tscn" type="PackedScene" id=3] +[ext_resource path="res://actors/hand/hand.tscn" type="PackedScene" id=4] [ext_resource path="res://actors/planet/planet_two.tscn" type="PackedScene" id=5] [ext_resource path="res://actors/planet/planet_three.tscn" type="PackedScene" id=6] [ext_resource path="res://actors/planet/planet_four.tscn" type="PackedScene" id=7] [ext_resource path="res://actors/planet/planet_five.tscn" type="PackedScene" id=8] +[ext_resource path="res://screens/GUI/GUI_new.tscn" type="PackedScene" id=9] [node name="playground" type="Node"] -[node name="starsLayer" parent="." instance=ExtResource( 1 )] +script/script = ExtResource( 1 ) -[node name="planet" parent="." instance=ExtResource( 2 )] +[node name="starsLayer" parent="." instance=ExtResource( 2 )] + +[node name="planet" parent="." instance=ExtResource( 3 )] transform/pos = Vector2( 334.822, 539.422 ) z/z = -2 @@ -22,25 +25,18 @@ min_wait_time = 1.0 energy_consumption = 15 score_potential = 5 -[node name="hand_left" parent="." instance=ExtResource( 3 )] +[node name="hand_left" parent="." instance=ExtResource( 4 )] transform/pos = Vector2( 208.944, 637.606 ) transform/scale = Vector2( 0.314693, 0.314693 ) z/z = 3 -[node name="hand_right" parent="." instance=ExtResource( 3 )] +[node name="hand_right" parent="." instance=ExtResource( 4 )] transform/pos = Vector2( 1042.25, 637.606 ) transform/scale = Vector2( -0.314693, 0.314693 ) z/z = 3 -[node name="GUI_new" parent="." instance=ExtResource( 4 )] - -margin/left = 10.822 -margin/top = 14.422 -margin/right = 50.822 -margin/bottom = 54.422 - [node name="planet 2" parent="." instance=ExtResource( 5 )] transform/pos = Vector2( 921.718, 290.313 ) @@ -61,4 +57,11 @@ z/z = -2 transform/pos = Vector2( 500.499, 315.418 ) z/z = -2 +[node name="GUI_new" parent="." instance=ExtResource( 9 )] + +margin/left = 10.822 +margin/top = 14.422 +margin/right = 50.822 +margin/bottom = 54.422 + diff --git a/source/engine.cfg b/source/engine.cfg index bab6ff0..bec8dbe 100644 --- a/source/engine.cfg +++ b/source/engine.cfg @@ -7,7 +7,6 @@ icon="res://icon.png" [autoload] globals="*res://globals.tscn" -input_handler="*res://input_handler.tscn" [display] @@ -25,7 +24,3 @@ repeat=false [input] tap=[mbutton(0, 1), key(Space)] - -[render] - -default_clear_color=#ff000516 diff --git a/source/globals.gd b/source/globals.gd index 4b49012..bc92607 100644 --- a/source/globals.gd +++ b/source/globals.gd @@ -1,10 +1,6 @@ extends Node -var score = 0 -var energy = 100 setget set_energy +export(Color) var clear_color = Color('000516') -func set_energy(value): - if energy < 0: - get_tree().change_scene("res://screens/game_over/game_over.tscn") - if energy <= 100: - energy = value \ No newline at end of file +func _ready(): + VisualServer.set_default_clear_color(clear_color) diff --git a/source/globals.tscn b/source/globals.tscn index e588818..b8d0abb 100644 --- a/source/globals.tscn +++ b/source/globals.tscn @@ -6,6 +6,7 @@ [node name="globals" type="Node"] script/script = ExtResource( 1 ) +clear_color = Color( 0, 0.0196078, 0.0862745, 1 ) [node name="background_music" type="StreamPlayer" parent="."] diff --git a/source/input_behavior.gd b/source/input_behavior.gd index bd32633..9b2da1b 100644 --- a/source/input_behavior.gd +++ b/source/input_behavior.gd @@ -9,4 +9,4 @@ func _on_input_handler_tapped( selected_planet ): if s.get_global_pos().x > OS.get_window_size().x/2: right.move_to(s.get_pos()) else: - left.move_to(s.get_pos()) \ No newline at end of file + left.move_to(s.get_pos()) diff --git a/source/screens/GUI/GUI_new.tscn b/source/screens/GUI/GUI_new.tscn index f4de039..eac1fab 100644 --- a/source/screens/GUI/GUI_new.tscn +++ b/source/screens/GUI/GUI_new.tscn @@ -1,16 +1,15 @@ -[gd_scene load_steps=6 format=1] +[gd_scene load_steps=5 format=1] -[ext_resource path="res://screens/GUI/GUI_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/over.png" type="Texture" id=3] -[ext_resource path="res://screens/GUI/GaroaHackerClubeBold.otf" type="DynamicFontData" id=4] +[ext_resource path="res://screens/GUI/under.png" type="Texture" id=1] +[ext_resource path="res://screens/GUI/over.png" type="Texture" id=2] +[ext_resource path="res://screens/GUI/GaroaHackerClubeBold.otf" type="DynamicFontData" id=3] [sub_resource type="DynamicFont" id=1] font/size = 60 font/use_mipmaps = false font/use_filter = false -font/font = ExtResource( 4 ) +font/font = ExtResource( 3 ) [node name="GUI_new" type="Control"] @@ -22,7 +21,6 @@ margin/left = 0.0 margin/top = 0.0 margin/right = 40.0 margin/bottom = 40.0 -script/script = ExtResource( 1 ) [node name="energy" type="TextureProgress" parent="."] @@ -39,12 +37,12 @@ range/min = 0.0 range/max = 100.0 range/step = 1.0 range/page = 0.0 -range/value = 50.0 +range/value = 100.0 range/exp_edit = false range/rounded = false -texture/under = ExtResource( 2 ) +texture/under = ExtResource( 1 ) texture/over = null -texture/progress = ExtResource( 3 ) +texture/progress = ExtResource( 2 ) radial_fill/fill_degrees = 360.0 radial_fill/center_offset = Vector2( 0, 0 ) @@ -59,7 +57,7 @@ margin/top = 43.0 margin/right = 1031.0 margin/bottom = 103.0 custom_fonts/font = SubResource( 1 ) -text = "score" +text = "score: 0" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 diff --git a/source/screens/GUI/GUI_new_behavior.gd b/source/screens/GUI/GUI_new_behavior.gd index 585bf35..56f528d 100644 --- a/source/screens/GUI/GUI_new_behavior.gd +++ b/source/screens/GUI/GUI_new_behavior.gd @@ -3,8 +3,9 @@ extends Control onready var e = get_node("energy") onready var s = get_node("score") func _ready(): - set_process(true) - + #set_process(true) + pass + func _process(delta): e.set_val(globals.energy) s.set_text("Score: " + str(globals.score)) diff --git a/source/screens/game_over/game_over.gd b/source/screens/game_over/game_over.gd index 824c1a1..036b0b1 100644 --- a/source/screens/game_over/game_over.gd +++ b/source/screens/game_over/game_over.gd @@ -3,9 +3,6 @@ extends Node func _on_retry_button_up(): get_tree().change_scene("res://areas/playground/playground.tscn") - globals.score = 0 - globals.energy = 100 - func _on_quit_button_up(): get_tree().quit() diff --git a/source/screens/game_over/game_over.tscn b/source/screens/game_over/game_over.tscn index d400bd1..3b306b5 100644 --- a/source/screens/game_over/game_over.tscn +++ b/source/screens/game_over/game_over.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=1] +[gd_scene load_steps=14 format=1] [ext_resource path="res://screens/game_over/game_over.gd" type="Script" id=1] [ext_resource path="res://areas/level_0/starsLayer.tscn" type="PackedScene" id=2] @@ -173,7 +173,49 @@ tracks/15/keys = { "values": [ Vector2( 521.392, 770.217 ), Vector2( 443.743, 770.217 ) ] } -[sub_resource type="DynamicFont" id=2] +[sub_resource type="StyleBoxEmpty" id=2] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=3] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=4] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=5] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=6] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=7] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="DynamicFont" id=8] font/size = 60 font/use_mipmaps = false @@ -323,7 +365,14 @@ margin/left = 589.0 margin/top = 358.0 margin/right = 681.0 margin/bottom = 395.0 +custom_styles/hover = SubResource( 2 ) +custom_styles/pressed = SubResource( 3 ) +custom_styles/focus = SubResource( 4 ) custom_fonts/font = ExtResource( 4 ) +custom_colors/font_color_disabled = Color( 1, 0.0546875, 0.0546875, 1 ) +custom_colors/font_color = Color( 0.533081, 0.296875, 1, 1 ) +custom_colors/font_color_hover = Color( 0.947815, 0.648438, 1, 1 ) +custom_colors/font_color_pressed = Color( 0.367188, 0.11618, 0.345617, 1 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null @@ -340,7 +389,14 @@ margin/left = 592.0 margin/top = 404.0 margin/right = 671.0 margin/bottom = 441.0 +custom_styles/hover = SubResource( 5 ) +custom_styles/pressed = SubResource( 6 ) +custom_styles/focus = SubResource( 7 ) custom_fonts/font = ExtResource( 4 ) +custom_colors/font_color_disabled = Color( 1, 0.0546875, 0.0546875, 1 ) +custom_colors/font_color = Color( 0.533081, 0.296875, 1, 1 ) +custom_colors/font_color_hover = Color( 0.947815, 0.648438, 1, 1 ) +custom_colors/font_color_pressed = Color( 0.367188, 0.11618, 0.345617, 1 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null @@ -357,7 +413,7 @@ margin/left = 473.0 margin/top = 266.0 margin/right = 795.0 margin/bottom = 326.0 -custom_fonts/font = SubResource( 2 ) +custom_fonts/font = SubResource( 8 ) custom_colors/font_color = Color( 0.256348, 0.78125, 0.399876, 1 ) text = "Game Over" percent_visible = 1.0 diff --git a/source/screens/main_menu/main_menu.tscn b/source/screens/main_menu/main_menu.tscn index 4cd674e..9689d1a 100644 --- a/source/screens/main_menu/main_menu.tscn +++ b/source/screens/main_menu/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=1] +[gd_scene load_steps=27 format=1] [ext_resource path="res://screens/main_menu/main_menu.gd" type="Script" id=1] [ext_resource path="res://screens/GUI/GaroaHackerClubeBold.otf" type="DynamicFontData" id=2] @@ -394,6 +394,69 @@ WindowDialog/icons/close = null WindowDialog/icons/close_hilite = null WindowDialog/styles/panel = null +[sub_resource type="StyleBoxEmpty" id=10] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=11] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=12] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=13] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=14] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=15] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=16] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=17] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + +[sub_resource type="StyleBoxEmpty" id=18] + +content_margin/left = -1.0 +content_margin/right = -1.0 +content_margin/top = -1.0 +content_margin/bottom = -1.0 + [sub_resource type="Animation" id=3] length = 4.0 @@ -2148,6 +2211,9 @@ margin/left = 0.0 margin/top = 0.0 margin/right = 204.0 margin/bottom = 26.0 +custom_styles/hover = SubResource( 10 ) +custom_styles/pressed = SubResource( 11 ) +custom_styles/focus = SubResource( 12 ) custom_colors/font_color_disabled = Color( 1, 0.0546875, 0.0546875, 1 ) custom_colors/font_color = Color( 0.533081, 0.296875, 1, 1 ) custom_colors/font_color_hover = Color( 0.947815, 0.648438, 1, 1 ) @@ -2168,6 +2234,9 @@ margin/left = 0.0 margin/top = 52.0 margin/right = 204.0 margin/bottom = 78.0 +custom_styles/hover = SubResource( 13 ) +custom_styles/pressed = SubResource( 14 ) +custom_styles/focus = SubResource( 15 ) custom_colors/font_color_disabled = Color( 1, 0.0546875, 0.0546875, 1 ) custom_colors/font_color = Color( 0.533081, 0.296875, 1, 1 ) custom_colors/font_color_hover = Color( 0.947815, 0.648438, 1, 1 ) @@ -2188,6 +2257,9 @@ margin/left = 0.0 margin/top = 104.0 margin/right = 204.0 margin/bottom = 130.0 +custom_styles/hover = SubResource( 16 ) +custom_styles/pressed = SubResource( 17 ) +custom_styles/focus = SubResource( 18 ) custom_colors/font_color = Color( 0.533081, 0.296875, 1, 1 ) custom_colors/font_color_hover = Color( 0.947815, 0.648438, 1, 1 ) custom_colors/font_color_pressed = Color( 0.367188, 0.11618, 0.345617, 1 )