Skip to content

Commit

Permalink
Forigu normala modo
Browse files Browse the repository at this point in the history
  • Loading branch information
HassanHeydariNasab committed Feb 17, 2018
1 parent f7449c2 commit 7dbdd72
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 170 deletions.
8 changes: 0 additions & 8 deletions Celo.gd

This file was deleted.

45 changes: 0 additions & 45 deletions Celo.tscn

This file was deleted.

8 changes: 1 addition & 7 deletions Menuo.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
extends Control

onready var Senfina = get_node("Senfina")
onready var Rugxa = get_node("Rugxa")
onready var Ambra = get_node("Ambra")
onready var Verda = get_node("Verda")
Expand All @@ -18,12 +17,7 @@ func _ready():
get_node("Enveno_sono").set("stream/play", T.Agordejo.get_value("Agordoj", "Sonoj", true))
get_node(T.Agordejo.get_value("Koloro", "koloro", "Nigra")).set_pressed(true)

func _on_Normala_pressed():
T.modo = 1
get_tree().change_scene("res://Radiko.tscn")

func _on_Senfina_pressed():
T.modo = 0
func _on_Ludu_pressed():
get_tree().change_scene("res://Radiko.tscn")

func _on_Lingvo_pressed():
Expand Down
31 changes: 2 additions & 29 deletions Menuo.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -253,32 +253,7 @@ margin/right = 40.0
margin/bottom = 40.0
script/script = ExtResource( 1 )

[node name="Normala" type="Button" parent="."]

visibility/visible = false
rect/scale = Vector2( 0.8, 0.8 )
focus/ignore_mouse = false
focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 2
margin/left = 60.0
margin/top = 20.0
margin/right = 660.0
margin/bottom = 145.0
custom_styles/hover = ExtResource( 2 )
custom_styles/pressed = ExtResource( 3 )
custom_styles/normal = ExtResource( 4 )
custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 1, 1, 1, 1 )
custom_colors/font_color_hover = Color( 0, 0, 0, 1 )
custom_colors/font_color_pressed = Color( 0, 0, 0, 1 )
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
text = "Normala"
flat = false

[node name="Senfina" type="Button" parent="."]
[node name="Ludu" type="Button" parent="."]

rect/scale = Vector2( 0.8, 0.8 )
focus/ignore_mouse = false
Expand Down Expand Up @@ -541,9 +516,7 @@ stream/paused = false
stream/loop_restart_time = 0.0
stream/buffering_ms = 500

[connection signal="pressed" from="Normala" to="." method="_on_Normala_pressed"]

[connection signal="pressed" from="Senfina" to="." method="_on_Senfina_pressed"]
[connection signal="pressed" from="Ludu" to="." method="_on_Ludu_pressed"]

[connection signal="pressed" from="Rugxa" to="." method="_on_Rugxa_pressed"]

Expand Down
129 changes: 52 additions & 77 deletions Radiko.gd
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ onready var Materialo5_sono = get_node("Materialo5_sono")
#onready var FPS = get_node("Kanvaso/FPS")
onready var Parto = preload("res://Parto.tscn")
onready var Materialo = preload("res://Materialo.tscn")
onready var Celo = preload("res://Celo.tscn")
onready var Rektangulo = preload("res://Rektangulo.tscn")
onready var Ebeno = preload("res://Ebeno.tscn")

Expand All @@ -52,20 +51,19 @@ var alto = 0 setget set_alto
func set_alto(valoro):
if valoro*0.1186 >= alto:
alto = round(valoro*0.1186)
if T.modo == 0:
V_rulumilo.set_value(-valoro-100)
vido_Alto.set_text(str(alto)+"m")
if alto > T.Agordejo.get_value("Rekordo", "rekordo",0):
Fonmuziko.set_volume_db(5)
T.Agordejo.set_value("Rekordo", "rekordo", alto)
T.Agordejo.save(T.agordejo)
vido_Rekordo.set_text(
str(T.Agordejo.get_value("Rekordo", "rekordo",0))+"m"
)
vido_Rekordo_Brili.seek(0)
vido_Rekordo_Brili.resume_all()
else:
Fonmuziko.set_volume_db(0)
V_rulumilo.set_value(-valoro-100)
vido_Alto.set_text(str(alto)+"m")
if alto > T.Agordejo.get_value("Rekordo", "rekordo",0):
Fonmuziko.set_volume_db(5)
T.Agordejo.set_value("Rekordo", "rekordo", alto)
T.Agordejo.save(T.agordejo)
vido_Rekordo.set_text(
str(T.Agordejo.get_value("Rekordo", "rekordo",0))+"m"
)
vido_Rekordo_Brili.seek(0)
vido_Rekordo_Brili.resume_all()
else:
Fonmuziko.set_volume_db(0)

var materialo setget set_materialo
func set_materialo(valoro):
Expand All @@ -88,65 +86,42 @@ func _ready():
T.Radiko = self
self.materialo = 100
self.alto = 0
if T.modo == 0:
vido_Rekordo.set_text(
str(T.Agordejo.get_value("Rekordo", "rekordo","0"))+"m"
)
Fono.set_color(
koloroj[T.Agordejo.get_value("Koloro", "koloro", "Nigra")]
vido_Rekordo.set_text(
str(T.Agordejo.get_value("Rekordo", "rekordo","0"))+"m"
)
Fono.set_color(
koloroj[T.Agordejo.get_value("Koloro", "koloro", "Nigra")]
)
var Senfinfino = get_node("Senfinfino")
Senfinfino.set_global_pos(Vector2(0,-101300))
Senfinfino.show()
V_rulumilo.set_min(-101000)
for i in range(-101000, -500, 700):
randomize()
var Rektangulo_ = Rektangulo.instance()
Rektangulo_.set_global_pos(
Vector2(rand_range(100,500),
i
))
Rektanguloj.add_child(Rektangulo_)
for i in range(-101000, 0, 250):
randomize()
var Materialo_ = Materialo.instance()
var materialo_ = int(rand_range(50,200))
Materialo_.materialo = materialo_/2.5
Materialo_.set_scale(Vector2(materialo_/50, materialo_/50))
Materialo_.set_global_pos(
Vector2(rand_range(300-materialo_,300+materialo_),
i
))
Materialoj.add_child(Materialo_)
for i in range(-101000, 8000, 13000):
randomize()
var Ebeno_ = Ebeno.instance()
Ebeno_.set_global_pos(
Vector2(300, i+rand_range(-4000,4000))
)
var Senfinfino = get_node("Senfinfino")
Senfinfino.set_global_pos(Vector2(0,-101300))
Senfinfino.show()
V_rulumilo.set_min(-101000)
for i in range(-101000, -500, 700):
randomize()
var Rektangulo_ = Rektangulo.instance()
Rektangulo_.set_global_pos(
Vector2(rand_range(100,500),
i
))
Rektanguloj.add_child(Rektangulo_)
for i in range(-101000, 0, 250):
randomize()
var Materialo_ = Materialo.instance()
var materialo_ = int(rand_range(50,200))
Materialo_.materialo = materialo_/2.5
Materialo_.set_scale(Vector2(materialo_/50, materialo_/50))
Materialo_.set_global_pos(
Vector2(rand_range(300-materialo_,300+materialo_),
i
))
Materialoj.add_child(Materialo_)
for i in range(-101000, 6000, 13000):
randomize()
var Ebeno_ = Ebeno.instance()
Ebeno_.set_global_pos(
Vector2(300, i+rand_range(-4000,4000))
)
Ebenoj.add_child(Ebeno_)
else:
V_rulumilo.hide()
vido_Rekordo.hide()
vido_Alto.hide()
Kamero.set_offset(Vector2(Kamero.get_offset().x,-600))
Fono.set_global_pos(Kamero.get_offset()+Vector2(-300,-500))
Fono.set_color(fonkoloroj[T.nivelo%6])
Celo_ = Celo.instance()
Celo_.set_global_pos(Vector2(300,-950))
add_child(Celo_)
for i in range(-800, -200, 50):
for j in range(2):
randomize()
var Materialo_ = Materialo.instance()
var materialo_ = int(rand_range(50,100))
Materialo_.materialo = materialo_/2.5
Materialo_.set_scale(Vector2(materialo_/50, materialo_/50))
Materialo_.set_global_pos(
Vector2(rand_range(300-materialo_,300+materialo_),
i+rand_range(0,100)
))
Materialoj.add_child(Materialo_)
Ebenoj.add_child(Ebeno_)
Fonmuziko.set("stream/play", T.Agordejo.get_value("Agordoj", "Muzikoj", true))
vido_Rekordo_Brili.interpolate_property(vido_Rekordo,
"custom_colors/font_color", Color("ffffff"), Color("D500F9"), 0.25,
Expand All @@ -163,7 +138,7 @@ func _ready():
func _input(evento):
if evento.type == InputEvent.MOUSE_BUTTON:
if evento.button_index == BUTTON_LEFT:
if evento.pos.y > 70 and (T.modo == 1 or evento.pos.x < 570):
if evento.pos.y > 70 and evento.pos.x < 570:
if evento.is_pressed() and materialo > 0:
PreParto.set_scale(Vector2(1,1))
PreParto.set_global_pos(get_global_mouse_pos())
Expand Down Expand Up @@ -205,12 +180,12 @@ func _input(evento):
Partoj.add_child(Parto_)
Parto_.Aspekto.set_scale(PreParto.get_scale())

elif evento.button_index == BUTTON_WHEEL_UP and T.modo == 0:
elif evento.button_index == BUTTON_WHEEL_UP:
V_rulumilo.set_value(V_rulumilo.get_value()-100)
elif evento.button_index == BUTTON_WHEEL_DOWN and T.modo == 0:
elif evento.button_index == BUTTON_WHEEL_DOWN:
V_rulumilo.set_value(V_rulumilo.get_value()+100)
elif evento.type == InputEvent.MOUSE_MOTION:
if evento.pos.y > 70 and (T.modo == 1 or evento.pos.x < 570):
if evento.pos.y > 70 and evento.pos.x < 570:
PreParto.set_global_pos(get_global_mouse_pos())

func _fixed_process(delta):
Expand Down
4 changes: 0 additions & 4 deletions Tutmonda.gd
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ var lingvo_elektita = false

var Radiko = null

# modo 0: senfina, modo 1: nivela
var modo = 0
var nivelo = 0

func _notification(what):
if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
if get_tree().get_current_scene().get_name() == "Menuo":
Expand Down

0 comments on commit 7dbdd72

Please sign in to comment.