Skip to content

Commit e1e7af5

Browse files
UI improvements
1 parent 6e9123d commit e1e7af5

File tree

3 files changed

+49
-50
lines changed

3 files changed

+49
-50
lines changed

Buttonthemes.tres

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

main scene.gd

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,87 +28,75 @@ func _on_timer_timeout():
2828
$Camera2D/Climatechange.value += 1 #put multiplicaton from buildings here
2929
pass # Replace with function body.
3030

31-
32-
func _on_powerplantbutton_pressed():
31+
func _on_powerplantbutton_mouse_entered():
3332
var powerlabel = get_node("Camera2D/powerplanttext")
3433
var powerback = get_node("Camera2D/powerplantpanel")
3534
powerback.visible = true
3635
powerlabel.visible = true
37-
pass # Replace with function body.
38-
39-
40-
func _on_waterpumpbutton_pressed():
36+
37+
func _on_waterpumpbutton_mouse_entered():
4138
var waterlabel = get_node("Camera2D/waterplanttext")
4239
var waterback = get_node("Camera2D/waterplantpanel")
4340
waterback.visible = true
4441
waterlabel.visible = true
45-
pass # Replace with function body.
46-
47-
48-
func _on_oilpumpbutton_pressed():
42+
43+
func _on_oilpumpbutton_mouse_entered():
4944
var oillabel = get_node("Camera2D/oiltext")
5045
var oilback = get_node("Camera2D/oilpumppanel")
5146
oilback.visible = true
5247
oillabel.visible = true
5348

54-
pass # Replace with function body.
55-
56-
57-
func _on_recyclebutton_pressed():
49+
func _on_recyclebutton_mouse_entered():
5850
var recyclelabel = get_node("Camera2D/recycletext")
5951
var recycleback = get_node("Camera2D/recyclepanel")
6052
recycleback.visible = true
6153
recyclelabel.visible = true
62-
pass # Replace with function body.
6354

64-
func _on_bankbutton_pressed():
55+
func _on_bankbutton_mouse_entered():
6556
var banklabel = get_node("Camera2D/banktext")
6657
var bankback = get_node("Camera2D/bankpanel")
6758
bankback.visible = true
6859
banklabel.visible = true
69-
pass # Replace with function body.
7060

71-
func _on_coalminebutton_pressed():
61+
func _on_coalminebutton_mouse_entered():
7262
var coallabel = get_node("Camera2D/coalminetext")
7363
var coalback = get_node("Camera2D/coalminepanel")
7464
coalback.visible = true
7565
coallabel.visible = true
76-
pass # Replace with function body.
77-
78-
func _on_timer_for_ui_timeout():
79-
var oillabel = get_node("Camera2D/oiltext")
80-
var oilback = get_node("Camera2D/oilpumppanel")
81-
oilback.visible = false
82-
oillabel.visible = false
8366

67+
68+
func _on_powerplantbutton_mouse_exited():
8469
var powerlabel = get_node("Camera2D/powerplanttext")
8570
var powerback = get_node("Camera2D/powerplantpanel")
8671
powerback.visible = false
8772
powerlabel.visible = false
88-
73+
func _on_waterpumpbutton_mouse_exited():
8974
var waterlabel = get_node("Camera2D/waterplanttext")
9075
var waterback = get_node("Camera2D/waterplantpanel")
9176
waterback.visible = false
9277
waterlabel.visible = false
9378

79+
func _on_oilpumpbutton_mouse_exited():
80+
var oillabel = get_node("Camera2D/oiltext")
81+
var oilback = get_node("Camera2D/oilpumppanel")
82+
oilback.visible = false
83+
oillabel.visible = false
84+
85+
func _on_recyclebutton_mouse_exited():
9486
var recyclelabel = get_node("Camera2D/recycletext")
9587
var recycleback = get_node("Camera2D/recyclepanel")
9688
recycleback.visible = false
9789
recyclelabel.visible = false
98-
90+
91+
func _on_bankbutton_mouse_exited():
9992
var banklabel = get_node("Camera2D/banktext")
10093
var bankback = get_node("Camera2D/bankpanel")
10194
bankback.visible = false
10295
banklabel.visible = false
103-
96+
97+
func _on_coalminebutton_mouse_exited():
10498
var coallabel = get_node("Camera2D/coalminetext")
10599
var coalback = get_node("Camera2D/coalminepanel")
106100
coalback.visible = false
107101
coallabel.visible = false
108-
pass # Replace with function body.
109-
110-
111-
112-
113-
114-
102+

main scene.tscn

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,28 +361,39 @@ Low Carbon generation
361361

362362
[connection signal="timeout" from="timer for climatechange" to="." method="_on_timer_timeout"]
363363
[connection signal="timeout" from="timer for ui" to="." method="_on_timer_for_ui_timeout"]
364+
[connection signal="mouse_entered" from="Camera2D/Powerplantbutton" to="." method="_on_powerplantbutton_mouse_entered"]
364365
[connection signal="mouse_entered" from="Camera2D/Powerplantbutton" to="TileMap2" method="_on_powerplantbutton_mouse_entered"]
366+
[connection signal="mouse_exited" from="Camera2D/Powerplantbutton" to="." method="_on_powerplantbutton_mouse_exited"]
365367
[connection signal="mouse_exited" from="Camera2D/Powerplantbutton" to="TileMap2" method="_on_powerplantbutton_mouse_exited"]
366-
[connection signal="pressed" from="Camera2D/Powerplantbutton" to="." method="_on_powerplantbutton_pressed"]
367368
[connection signal="pressed" from="Camera2D/Powerplantbutton" to="TileMap2" method="_on_powerplantbutton_pressed"]
368369
[connection signal="toggled" from="Camera2D/Powerplantbutton" to="TileMap2" method="_on_powerplantbutton_toggled"]
370+
[connection signal="mouse_entered" from="Camera2D/Waterpumpbutton" to="." method="_on_waterpumpbutton_mouse_entered"]
369371
[connection signal="mouse_entered" from="Camera2D/Waterpumpbutton" to="TileMap2" method="_on_waterpumpbutton_mouse_entered"]
372+
[connection signal="mouse_exited" from="Camera2D/Waterpumpbutton" to="." method="_on_waterpumpbutton_mouse_exited"]
370373
[connection signal="mouse_exited" from="Camera2D/Waterpumpbutton" to="TileMap2" method="_on_waterpumpbutton_mouse_exited"]
371374
[connection signal="pressed" from="Camera2D/Waterpumpbutton" to="." method="_on_waterpumpbutton_pressed"]
372375
[connection signal="pressed" from="Camera2D/Waterpumpbutton" to="TileMap2" method="_on_waterpumpbutton_pressed"]
376+
[connection signal="mouse_entered" from="Camera2D/Oilpumpbutton" to="." method="_on_oilpumpbutton_mouse_entered"]
373377
[connection signal="mouse_entered" from="Camera2D/Oilpumpbutton" to="TileMap2" method="_on_oilpumpbutton_mouse_entered"]
378+
[connection signal="mouse_exited" from="Camera2D/Oilpumpbutton" to="." method="_on_oilpumpbutton_mouse_exited"]
374379
[connection signal="mouse_exited" from="Camera2D/Oilpumpbutton" to="TileMap2" method="_on_oilpumpbutton_mouse_exited"]
375380
[connection signal="pressed" from="Camera2D/Oilpumpbutton" to="." method="_on_oilpumpbutton_pressed"]
376381
[connection signal="pressed" from="Camera2D/Oilpumpbutton" to="TileMap2" method="_on_oilpumpbutton_pressed"]
382+
[connection signal="mouse_entered" from="Camera2D/Recyclebutton" to="." method="_on_recyclebutton_mouse_entered"]
377383
[connection signal="mouse_entered" from="Camera2D/Recyclebutton" to="TileMap2" method="_on_recyclebutton_mouse_entered"]
384+
[connection signal="mouse_exited" from="Camera2D/Recyclebutton" to="." method="_on_recyclebutton_mouse_exited"]
378385
[connection signal="mouse_exited" from="Camera2D/Recyclebutton" to="TileMap2" method="_on_recyclebutton_mouse_exited"]
379386
[connection signal="pressed" from="Camera2D/Recyclebutton" to="." method="_on_recyclebutton_pressed"]
380387
[connection signal="pressed" from="Camera2D/Recyclebutton" to="TileMap2" method="_on_recyclebutton_pressed"]
388+
[connection signal="mouse_entered" from="Camera2D/Bankbutton" to="." method="_on_bankbutton_mouse_entered"]
381389
[connection signal="mouse_entered" from="Camera2D/Bankbutton" to="TileMap2" method="_on_bankbutton_mouse_entered"]
390+
[connection signal="mouse_exited" from="Camera2D/Bankbutton" to="." method="_on_bankbutton_mouse_exited"]
382391
[connection signal="mouse_exited" from="Camera2D/Bankbutton" to="TileMap2" method="_on_bankbutton_mouse_exited"]
383392
[connection signal="pressed" from="Camera2D/Bankbutton" to="." method="_on_bankbutton_pressed"]
384393
[connection signal="pressed" from="Camera2D/Bankbutton" to="TileMap2" method="_on_bankbutton_pressed"]
394+
[connection signal="mouse_entered" from="Camera2D/Coalminebutton" to="." method="_on_coalminebutton_mouse_entered"]
385395
[connection signal="mouse_entered" from="Camera2D/Coalminebutton" to="TileMap2" method="_on_coalminebutton_mouse_entered"]
396+
[connection signal="mouse_exited" from="Camera2D/Coalminebutton" to="." method="_on_coalminebutton_mouse_exited"]
386397
[connection signal="mouse_exited" from="Camera2D/Coalminebutton" to="TileMap2" method="_on_coalminebutton_mouse_exited"]
387398
[connection signal="pressed" from="Camera2D/Coalminebutton" to="." method="_on_coalminebutton_pressed"]
388399
[connection signal="pressed" from="Camera2D/Coalminebutton" to="TileMap2" method="_on_coalminebutton_pressed"]

0 commit comments

Comments
 (0)