levels OK with game state

Author: nicolasbize

GameState.gd

@@ -25,9 +25,10 @@ var max_burners_upgrade = 0
 var max_cutters_upgrade = 0
 var max_factories_upgrade = 0
 var max_assemblies_upgrade = 0
-var extractor_speed_upgrade = 0
-var burner_speed_upgrade = 0
-var cutter_speed_upgrade = 0
-var factories_speed_upgrade = 0
-var assemblies_speed_upgrade = 0
-var belt_speed_upgrade = 0
+
+var extractor_power_upgrade = 0
+var burner_power_upgrade = 0
+var cutter_power_upgrade = 0
+var factories_power_upgrade = 0
+var assemblies_power_upgrade = 0
+var belt_power_upgrade = 0

Tiles/Extractors/ExtractorTile.gd

@@ -11,6 +11,7 @@ func _process(delta):
 	animationPlayer.play("Enabled")
 
 func _on_TileTimer_timeout():
+	tile_timer.start(speed)
 	var target_tile = null
 	if direction == Facing.RIGHT:
 		target_tile = WorldTiles.get_at(global_position + Vector2(8, 0))
@@ -19,39 +20,32 @@ func _on_TileTimer_timeout():
 			for y in range(-2, 2):
 				spots.append(global_position + Vector2(4, y))
 			spots.shuffle()
-			spots = spots.slice(0, efficiency - 1)
-			for pos in spots:
-				attempt_send_ore(target_tile, pos)
+			attempt_send_ore(target_tile, spots[0])
+				
 	elif direction == Facing.LEFT:
 		target_tile = WorldTiles.get_at(global_position + Vector2(-8, 0))
 		if target_tile != null:
 			var spots = []
 			for y in range(-2, 2):
 				spots.append(global_position + Vector2(-4, y))
 			spots.shuffle()
-			spots = spots.slice(0, efficiency - 1)
-			for pos in spots:
-				attempt_send_ore(target_tile, pos)
+			attempt_send_ore(target_tile, spots[0])
 	elif direction == Facing.UP:
 		target_tile = WorldTiles.get_at(global_position + Vector2(0, -8))
 		if target_tile != null:
 			var spots = []
 			for x in range(-2, 2):
 				spots.append(global_position + Vector2(x, -5))
 			spots.shuffle()
-			spots = spots.slice(0, efficiency - 1)
-			for pos in spots:
-				attempt_send_ore(target_tile, pos)
+			attempt_send_ore(target_tile, spots[0])
 	elif direction == Facing.DOWN:
 		target_tile = WorldTiles.get_at(global_position + Vector2(0, 8))
 		if target_tile != null:
 			var spots = []
 			for x in range(-2, 2):
 				spots.append(global_position + Vector2(x, 4))
 			spots.shuffle()
-			spots = spots.slice(0, efficiency - 1)
-			for pos in spots:
-				attempt_send_ore(target_tile, pos)
+			attempt_send_ore(target_tile, spots[0])
 
 
 func attempt_send_ore(tile, pos):

Tiles/Tile.gd

@@ -47,3 +47,18 @@ func destroy():
 	var tile = WorldTiles.get_at(global_position)
 	WorldTiles.destroy(tile)
 	queue_free()
+
+func set_power(pwr):
+	power = pwr
+	match power:
+		Constants.Power.LOWEST:
+			speed = 1
+		Constants.Power.LOW:
+			speed = 0.8
+		Constants.Power.MEDIUM:
+			speed = 0.6
+		Constants.Power.HIGH:
+			speed = 0.4
+		Constants.Power.HIGHEST:
+			speed = 0.2
+	print("speed set to " + str(speed))

UI.gd

@@ -15,6 +15,7 @@ func set_active(value):
 # Selector
 func show_selector_modal():
 	set_active(true)
+	tile_selector_modal.refresh_ui()
 	selector_animator.play("SlideUp")
 
 func _on_selector_slide_up_complete():
@@ -31,8 +32,9 @@ func _on_TileSelectorCloseButton_click(el):
 	selector_animator.play("SlideDown")
 
 func _on_TileSelectorAcceptButton_click(el):
-	selector_animator.play("SlideDown")
-	emit_signal("create_tile", tile_selector_modal.current_type)
+	if not tile_selector_modal.is_disabled:
+		selector_animator.play("SlideDown")
+		emit_signal("create_tile", tile_selector_modal.current_type)
 
 # View modal
 func show_view_modal(tile):

UI/ClickableButton.gd

@@ -4,9 +4,24 @@ enum {DEFAULT, HOVER, PRESS}
 var state = DEFAULT
 
 export (bool) var move_on_click = true
+export (bool) var disabled = false
 
 signal click(el)
 
+func _ready():
+	if disabled:
+		disable()
+		
+func disable():
+	var mat = get_material()
+	mat.set_shader_param("grayscale", true)
+	disabled = true
+
+func enable():
+	var mat = get_material()
+	mat.set_shader_param("grayscale", false)
+	disabled = false
+
 func _on_ClickableButton_gui_input(event):
 	if event is InputEventMouseButton:
 		if event.pressed and state == HOVER:
@@ -17,12 +32,13 @@ func _on_ClickableButton_gui_input(event):
 			if move_on_click:
 				rect_global_position.y -= 1
 			state = HOVER
-			emit_signal("click", self)
+			if not disabled:
+				emit_signal("click", self)
 
 func _on_ClickableButton_mouse_entered():
 	state = HOVER
 
 func _on_ClickableButton_mouse_exited():
-	if state == PRESS and move_on_click:
+	if state == PRESS and move_on_click and not disabled:
 		rect_global_position.y -= 1
 	state = DEFAULT

UI/ClickableButton.tscn

@@ -1,8 +1,14 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://UI/ClickableButton.gd" type="Script" id=1]
+[ext_resource path="res://UI/Grayscale.shader" type="Shader" id=2]
+
+[sub_resource type="ShaderMaterial" id=1]
+shader = ExtResource( 2 )
+shader_param/grayscale = false
 
 [node name="ClickableButton" type="TextureRect"]
+material = SubResource( 1 )
 margin_right = 40.0
 margin_bottom = 40.0
 script = ExtResource( 1 )

UI/Grayscale.shader

@@ -0,0 +1,13 @@
+shader_type canvas_item;
+
+uniform bool grayscale = false;
+
+void fragment() {
+	if (grayscale) {
+		COLOR = texture(TEXTURE, UV);
+		float lumi = (COLOR.r + COLOR.g + COLOR.b) / 3.0;
+		COLOR.rgb = vec3(lumi);
+	} else {
+		COLOR = texture(TEXTURE, UV);
+	}
+}

UI/TileSelectorModal.gd

@@ -8,6 +8,9 @@ onready var tile_sprite = $SelectionPanel/Panel/TileSprite
 onready var visual_queue = $SelectionPanel/Panel/VisualQueue
 onready var quantity_label = $SelectionPanel/Panel/QuantityLabel
 onready var selection_panel = $SelectionPanel
+onready var animation_player = $AnimationPlayer
+
+var is_disabled = false
 
 func _ready():
 	refresh_ui()
@@ -16,21 +19,32 @@ func refresh_ui():
 	tile_sprite.frame = current_type
 	visual_queue.frame = current_type
 	quantity_label.visible = true
+	is_disabled = false
 	match current_type:
-		Constants.TileType.BELT:
+		Constants.TileType.BELT, Constants.TileType.LBELT, Constants.TileType.TBELT:
 			quantity_label.visible = false
 		Constants.TileType.ASSEMBLY:
 			quantity_label.text = "%d/%d" % [GameState.nb_assemblies, GameState.max_assemblies]
+			is_disabled = GameState.nb_assemblies == GameState.max_assemblies
 		Constants.TileType.CUTTER:
 			quantity_label.text = "%d/%d" % [GameState.nb_cutters, GameState.max_cutters]
+			is_disabled = GameState.nb_cutters == GameState.max_cutters
 		Constants.TileType.FACTORY:
 			quantity_label.text = "%d/%d" % [GameState.nb_factories, GameState.max_factories]
+			is_disabled = GameState.nb_factories == GameState.max_factories
 		Constants.TileType.FURNACE:
 			quantity_label.text = "%d/%d" % [GameState.nb_burners, GameState.max_burners]
-		Constants.TileType.GOLD, Constants.TileType.IRON, Constants.TileType.SILICON, Constants.TileType.GOLD:
+			is_disabled = GameState.nb_burners == GameState.max_burners
+		Constants.TileType.GOLD, Constants.TileType.IRON, Constants.TileType.SILICON, Constants.TileType.SILVER:
 			quantity_label.text = "%d/%d" % [GameState.nb_extractors, GameState.max_extractors]
+			is_disabled = GameState.nb_extractors == GameState.max_extractors
 		Constants.TileType.RESELLER:
 			quantity_label.text = "%d/%d" % [GameState.nb_sellers, GameState.max_sellers]
+			is_disabled = GameState.nb_sellers == GameState.max_sellers
+	if is_disabled:
+		animation_player.play("Disabled")
+	else:
+		animation_player.play("Enabled")		
 
 func _on_LeftButton_click(el):
 	current_type -= 1

UI/TileSelectorModal.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://UI/right-button.png" type="Texture" id=1]
 [ext_resource path="res://UI/TileSelectorModal.gd" type="Script" id=2]
@@ -7,14 +7,98 @@
 [ext_resource path="res://UI/left-button.png" type="Texture" id=5]
 [ext_resource path="res://UI/close-button.png" type="Texture" id=6]
 [ext_resource path="res://UI/buy-button.png" type="Texture" id=7]
+[ext_resource path="res://UI/Grayscale.shader" type="Shader" id=8]
 [ext_resource path="res://UI/ClickableButton.tscn" type="PackedScene" id=9]
 [ext_resource path="res://UI/equipment.png" type="Texture" id=10]
 [ext_resource path="res://UI/visual-queue.png" type="Texture" id=11]
 
 [sub_resource type="Theme" id=1]
 
-[sub_resource type="StreamTexture" id=2]
-load_path = "res://.import/disabled-button.png-c0385e3c98043f2caa4e495b905f703a.stex"
+[sub_resource type="ShaderMaterial" id=3]
+shader = ExtResource( 8 )
+shader_param/grayscale = false
+
+[sub_resource type="Animation" id=5]
+resource_name = "Disabled"
+length = 0.1
+loop = true
+tracks/0/type = "value"
+tracks/0/path = NodePath("SelectionPanel/Panel/AcceptButton:move_on_click")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("SelectionPanel/Panel/AcceptButton:material:shader_param/grayscale")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("SelectionPanel/Panel/AcceptButton/ItemPrice:modulate")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ Color( 0.662745, 0.662745, 0.662745, 1 ) ]
+}
+
+[sub_resource type="Animation" id=4]
+resource_name = "Enabled"
+length = 0.1
+loop = true
+tracks/0/type = "value"
+tracks/0/path = NodePath("SelectionPanel/Panel/AcceptButton:material:shader_param/grayscale")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("SelectionPanel/Panel/AcceptButton/ItemPrice:modulate")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ Color( 1, 1, 1, 1 ) ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("SelectionPanel/Panel/AcceptButton:move_on_click")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
 
 [node name="TileSelectorModal" type="Control"]
 anchor_right = 1.0
@@ -89,6 +173,7 @@ margin_bottom = 14.0
 texture = ExtResource( 1 )
 
 [node name="AcceptButton" parent="SelectionPanel/Panel" instance=ExtResource( 9 )]
+material = SubResource( 3 )
 margin_left = 37.0
 margin_top = 16.0
 margin_right = 61.0
@@ -109,30 +194,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="DisabledButton" type="TextureRect" parent="SelectionPanel/Panel"]
-visible = false
-margin_left = 34.0
-margin_top = 37.0
-margin_right = 58.0
-margin_bottom = 50.0
-texture = SubResource( 2 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="ItemPrice" type="Label" parent="SelectionPanel/Panel/DisabledButton"]
-margin_left = -1.0
-margin_top = -2.0
-margin_right = 25.0
-margin_bottom = 15.0
-custom_colors/font_color = Color( 0.882353, 0.882353, 0.882353, 1 )
-text = "$200"
-align = 1
-uppercase = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
 [node name="QuantityLabel" type="Label" parent="SelectionPanel/Panel"]
 margin_left = 38.0
 margin_right = 60.0
@@ -142,5 +203,9 @@ align = 1
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+anims/Disabled = SubResource( 5 )
+anims/Enabled = SubResource( 4 )
 [connection signal="click" from="SelectionPanel/Panel/LeftButton" to="." method="_on_LeftButton_click"]
 [connection signal="click" from="SelectionPanel/Panel/RightButton" to="." method="_on_RightButton_click"]