Skip to content

Commit 717bbf1

Browse files
committed
hacky button fix
don't place tiles when clicking buttons
1 parent 39450ae commit 717bbf1

File tree

2 files changed

+39
-4
lines changed

2 files changed

+39
-4
lines changed

main scene.tscn

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,16 +361,28 @@ 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="TileMap2" method="_on_powerplantbutton_mouse_entered"]
365+
[connection signal="mouse_exited" from="Camera2D/Powerplantbutton" to="TileMap2" method="_on_powerplantbutton_mouse_exited"]
364366
[connection signal="pressed" from="Camera2D/Powerplantbutton" to="." method="_on_powerplantbutton_pressed"]
365367
[connection signal="pressed" from="Camera2D/Powerplantbutton" to="TileMap2" method="_on_powerplantbutton_pressed"]
366368
[connection signal="toggled" from="Camera2D/Powerplantbutton" to="TileMap2" method="_on_powerplantbutton_toggled"]
369+
[connection signal="mouse_entered" from="Camera2D/Waterpumpbutton" to="TileMap2" method="_on_waterpumpbutton_mouse_entered"]
370+
[connection signal="mouse_exited" from="Camera2D/Waterpumpbutton" to="TileMap2" method="_on_waterpumpbutton_mouse_exited"]
367371
[connection signal="pressed" from="Camera2D/Waterpumpbutton" to="." method="_on_waterpumpbutton_pressed"]
368372
[connection signal="pressed" from="Camera2D/Waterpumpbutton" to="TileMap2" method="_on_waterpumpbutton_pressed"]
373+
[connection signal="mouse_entered" from="Camera2D/Oilpumpbutton" to="TileMap2" method="_on_oilpumpbutton_mouse_entered"]
374+
[connection signal="mouse_exited" from="Camera2D/Oilpumpbutton" to="TileMap2" method="_on_oilpumpbutton_mouse_exited"]
369375
[connection signal="pressed" from="Camera2D/Oilpumpbutton" to="." method="_on_oilpumpbutton_pressed"]
370376
[connection signal="pressed" from="Camera2D/Oilpumpbutton" to="TileMap2" method="_on_oilpumpbutton_pressed"]
377+
[connection signal="mouse_entered" from="Camera2D/Recyclebutton" to="TileMap2" method="_on_recyclebutton_mouse_entered"]
378+
[connection signal="mouse_exited" from="Camera2D/Recyclebutton" to="TileMap2" method="_on_recyclebutton_mouse_exited"]
371379
[connection signal="pressed" from="Camera2D/Recyclebutton" to="." method="_on_recyclebutton_pressed"]
372380
[connection signal="pressed" from="Camera2D/Recyclebutton" to="TileMap2" method="_on_recyclebutton_pressed"]
381+
[connection signal="mouse_entered" from="Camera2D/Bankbutton" to="TileMap2" method="_on_bankbutton_mouse_entered"]
382+
[connection signal="mouse_exited" from="Camera2D/Bankbutton" to="TileMap2" method="_on_bankbutton_mouse_exited"]
373383
[connection signal="pressed" from="Camera2D/Bankbutton" to="." method="_on_bankbutton_pressed"]
374384
[connection signal="pressed" from="Camera2D/Bankbutton" to="TileMap2" method="_on_bankbutton_pressed"]
385+
[connection signal="mouse_entered" from="Camera2D/Coalminebutton" to="TileMap2" method="_on_coalminebutton_mouse_entered"]
386+
[connection signal="mouse_exited" from="Camera2D/Coalminebutton" to="TileMap2" method="_on_coalminebutton_mouse_exited"]
375387
[connection signal="pressed" from="Camera2D/Coalminebutton" to="." method="_on_coalminebutton_pressed"]
376388
[connection signal="pressed" from="Camera2D/Coalminebutton" to="TileMap2" method="_on_coalminebutton_pressed"]

place on tilemap.gd

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extends TileMap
22
var placingvalue = 0
3-
3+
var mouseontilemap = true
44

55

66
func _on_powerplantbutton_pressed():
@@ -24,8 +24,31 @@ func _on_coalminebutton_pressed():
2424
func _input(event):
2525
# Mouse in viewport coordinates.
2626

27-
if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_LEFT and event.is_pressed() == true:
27+
if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_LEFT and event.is_pressed() == true and mouseontilemap:
2828
set_cell(0, Vector2i(floor(get_local_mouse_position()/32)), placingvalue, Vector2i(0,0))
29-
print(ceil(get_local_mouse_position()/32))
30-
print(placingvalue)
3129

30+
31+
func _on_powerplantbutton_mouse_entered():
32+
mouseontilemap = false
33+
func _on_powerplantbutton_mouse_exited():
34+
mouseontilemap = true
35+
func _on_waterpumpbutton_mouse_entered():
36+
mouseontilemap = false
37+
func _on_waterpumpbutton_mouse_exited():
38+
mouseontilemap = true
39+
func _on_oilpumpbutton_mouse_entered():
40+
mouseontilemap = false
41+
func _on_oilpumpbutton_mouse_exited():
42+
mouseontilemap = true
43+
func _on_recyclebutton_mouse_entered():
44+
mouseontilemap = false
45+
func _on_recyclebutton_mouse_exited():
46+
mouseontilemap = true
47+
func _on_bankbutton_mouse_entered():
48+
mouseontilemap = false
49+
func _on_bankbutton_mouse_exited():
50+
mouseontilemap = true
51+
func _on_coalminebutton_mouse_entered():
52+
mouseontilemap = false
53+
func _on_coalminebutton_mouse_exited():
54+
mouseontilemap = true

0 commit comments

Comments
 (0)