top bar implemented

Author: nicolasbize

Constants.gd

@@ -1,6 +1,7 @@
 extends Node
 
 enum TileType {IRON, SILVER, SILICON, GOLD, BELT, LBELT, TBELT, FURNACE, CUTTER, FACTORY, ASSEMBLY, RESELLER}
+var TileCosts=[30,   30,     30,      30,   0,    0,     0,     80,      80,     100,     200,      200]
 
 enum Power {LOWEST, LOW, MEDIUM, HIGH, HIGHEST}
 
@@ -11,6 +12,14 @@ enum ObjectType {IRON_ORE, SILVER_ORE, SILICON_ORE, GOLD_ORE,
 				 DIODE, RELAY, BATTERY, CIRCUIT,
 				 FAN, CHIP, SPEAKER, MEMORY,
 				 PSU, CPU, GPU, MONITOR, RADIO, MOTHERBOARD, PHONE, COMPUTER }
+var ObjectPrices = [0, 0, 0, 0,
+					10, 10, 10, 10,
+					10, 10, 10, 10,
+					100, 120, 150, 180,
+					250, 300, 350, 400,
+					700, 900, 1200, 1300,
+					1500, 1750, 2000, 2500, 3000, 3600, 4500, 8000]
+
 
 var FurnaceOutputs = [
 	ObjectType.IRON_PLATE,

GameState.gd

@@ -3,7 +3,7 @@ extends Node
 const MAX_UPGRADES = 5
 
 # stats
-var money = 0
+var money = 100000
 var nb_extractors = 0
 var nb_burners = 0
 var nb_cutters = 0
@@ -28,6 +28,8 @@ var belt_power_upgrade = 0
 var assembly_power_upgrade = 0
 var factory_power_upgrade = 0
 
+signal money_change
+
 func boost_game():
 	max_extractors = 30
 	max_burners = 30
@@ -42,3 +44,7 @@ func boost_game():
 	belt_power_upgrade = 4
 	assembly_power_upgrade = 4
 	factory_power_upgrade = 4
+
+func income(cash):
+	money += cash
+	emit_signal("money_change")

Tiles/Belts/LBeltTile.tscn

@@ -41,7 +41,6 @@ tracks/0/keys = {
 
 [node name="LBeltTile" instance=ExtResource( 4 )]
 script = ExtResource( 2 )
-speed = 1.0
 
 [node name="Sprite" parent="." index="0"]
 texture = ExtResource( 1 )

Tiles/Equipment/VendorTile.gd

@@ -0,0 +1,13 @@
+extends "res://Tiles/OreProcessing/BaseOreTransformerTile.gd"
+
+func _on_TileTimer_timeout():
+	store_contents()
+
+func store_contents():
+	var items = storage_area.get_overlapping_areas()
+	for item in items:
+		if item != self:
+			# destroy non-ore items
+			if item.type != null:
+				GameState.income(Constants.ObjectPrices[item.type])
+			destroy_obj(item)

Tiles/Equipment/VendorTile.tscn

@@ -1,11 +1,15 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://UI/equipment.png" type="Texture" id=1]
-[ext_resource path="res://Tiles/Tile.tscn" type="PackedScene" id=2]
+[gd_scene load_steps=4 format=2]
 
+[ext_resource path="res://Tiles/Equipment/seller.png" type="Texture" id=1]
+[ext_resource path="res://Tiles/OreProcessing/BaseOreTransformerTile.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Tiles/Equipment/VendorTile.gd" type="Script" id=3]
 
 [node name="VendorTile" instance=ExtResource( 2 )]
+z_index = 1
+script = ExtResource( 3 )
 
 [node name="Sprite" parent="." index="0"]
 texture = ExtResource( 1 )
-frame = 2
+
+[node name="ValidArea" parent="." index="3"]
+polygon = PoolVector2Array( -4, -2, -1, -2, -1, 2, -4, 2, -4, -2 )

Tiles/Equipment/seller.png

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/seller.png-e9ae4208da71ca7804ca3b9dd325d2f3.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Equipment/seller.png"
+dest_files=[ "res://.import/seller.png-e9ae4208da71ca7804ca3b9dd325d2f3.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Tiles/Equipment/seller.png.import

@@ -102,9 +102,9 @@ func get_next_open_spot():
 	if direction == Facing.RIGHT:
 		spot = global_position + Vector2.RIGHT * 4
 	elif direction == Facing.LEFT:
-		spot = global_position + Vector2.LEFT * 4
+		spot = global_position + Vector2.LEFT * 5
 	elif direction == Facing.UP:
-		spot = global_position + Vector2.UP * 4
+		spot = global_position + Vector2.UP * 5
 	else:
 		spot = global_position + Vector2.DOWN * 4	
 	target_tile = WorldTiles.get_at(spot)

Tiles/OreProcessing/BaseOreTransformerTile.gd

@@ -44,7 +44,7 @@ func refresh_ui():
 	if is_disabled:
 		animation_player.play("Disabled")
 	else:
-		animation_player.play("Enabled")		
+		animation_player.play("Enabled")
 
 func _on_LeftButton_click(el):
 	current_type -= 1
@@ -54,6 +54,6 @@ func _on_LeftButton_click(el):
 
 func _on_RightButton_click(el):
 	current_type += 1
-	if current_type > Constants.TileType.keys().size():
+	if current_type > Constants.TileType.keys().size() - 1:
 		current_type = Constants.TileType.keys().size() - 1
 	refresh_ui()

UI/TileSelectorModal.gd

@@ -29,6 +29,8 @@ func set_tile(tile):
 	if tile != null:
 		tile.disconnect("storage_change", self, "_on_storage_change")
 	active_tile = tile
+	recipe_selector.visible = false
+	power_meter.visible = false	
 	if tile.is_upgradable():
 		tick.rect_position = Vector2(37, 6) + Vector2.RIGHT * 5 * tile.power
 		var upgraded = 0

UI/TileViewDialog.gd

@@ -0,0 +1,71 @@
+extends Control
+
+const SECS_BETWEEN_MONTHS = 5
+
+onready var money = $Money
+onready var money_trend = $MoneyTrend
+onready var date = $Date
+onready var timer = $GameTimer
+
+var current_month = 0
+var current_year = 70
+var months = ["JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"]
+var prev_tick_money = GameState.money
+
+signal game_tick
+
+func _ready():
+	timer.start(SECS_BETWEEN_MONTHS)
+	money.text = get_money_str(GameState.money)
+	GameState.connect("money_change", self, "refresh_money")
+
+func refresh_money():
+	money.text = get_money_str(GameState.money)
+
+func _on_GameTimer_timeout():
+	current_month += 1
+	if current_month == months.size():
+		current_month = 0
+		current_year += 1
+	if current_year == 100:
+		current_year = 0
+	date.text = months[current_month] + str(current_year)
+	pay_factory_cost()
+	update_money()
+	timer.start(SECS_BETWEEN_MONTHS)
+	emit_signal("game_tick")
+
+func update_money():
+	money_trend.visible = true
+	if GameState.money > prev_tick_money:
+		money_trend.frame = 0
+		money.set("custom_colors/font_color", Color("3eba42"))
+	elif GameState.money < prev_tick_money:
+		money_trend.frame = 1
+		money.set("custom_colors/font_color", Color("ba3e3e"))
+	else:
+		money_trend.visible = false	
+	refresh_money()
+	
+func get_money_str(amount):
+	amount = abs(float(amount))
+	if amount < 1e3:
+		return "$" + str(amount)
+	elif amount < 1e5:
+		return "$" + str(amount / 1e3).left(4) + "K"
+	elif amount < 1e6:
+		return "$" + str(amount / 1e3).left(3) + "K"
+	elif amount < 1e8:
+		return "$" + str(amount / 1e6).left(4) + "M"
+	elif amount < 1e9:
+		return "$" + str(amount / 1e6).left(3) + "M"
+	elif amount < 1e11:
+		return "$" + str(amount / 1e9).left(4) + "B"
+	elif amount < 1e12:
+		return "$" + str(amount / 1e9).left(3) + "B"
+
+func pay_factory_cost():
+	var cost = 0
+	for tile in WorldTiles.tiles.values():
+		cost += Constants.TileCosts[tile.type] * tile.speed
+	GameState.money -= cost

UI/TopBar.gd

@@ -0,0 +1,75 @@
+[gd_scene load_steps=8 format=2]
+
+[ext_resource path="res://UI/top-bar.png" type="Texture" id=1]
+[ext_resource path="res://Fonts/bitmap_font.tres" type="DynamicFont" id=2]
+[ext_resource path="res://UI/ClickableButton.tscn" type="PackedScene" id=3]
+[ext_resource path="res://UI/up-down-tick.png" type="Texture" id=4]
+[ext_resource path="res://UI/upgrade-btn.png" type="Texture" id=5]
+[ext_resource path="res://UI/options-btn.png" type="Texture" id=6]
+[ext_resource path="res://UI/TopBar.gd" type="Script" id=7]
+
+[node name="TopBar" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_bottom = -56.0
+script = ExtResource( 7 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Background" type="TextureRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+texture = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Date" type="Label" parent="."]
+margin_left = 44.0
+margin_right = 64.0
+margin_bottom = 7.0
+custom_fonts/font = ExtResource( 2 )
+custom_colors/font_color = Color( 0.560784, 0.662745, 0.741176, 1 )
+text = "JAN70"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Money" type="Label" parent="."]
+margin_left = 16.0
+margin_right = 38.0
+margin_bottom = 7.0
+custom_fonts/font = ExtResource( 2 )
+custom_colors/font_color = Color( 0.317647, 0.729412, 0.243137, 1 )
+text = "$2.34M"
+align = 2
+clip_text = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="MoneyTrend" type="Sprite" parent="."]
+visible = false
+position = Vector2( 38, 2 )
+texture = ExtResource( 4 )
+centered = false
+hframes = 2
+
+[node name="UpgradeButton" parent="." instance=ExtResource( 3 )]
+margin_left = 1.0
+margin_top = 1.0
+margin_right = 6.0
+margin_bottom = 6.0
+texture = ExtResource( 5 )
+
+[node name="OptionsButton" parent="." instance=ExtResource( 3 )]
+margin_left = 8.0
+margin_top = 1.0
+margin_right = 13.0
+margin_bottom = 6.0
+texture = ExtResource( 6 )
+
+[node name="GameTimer" type="Timer" parent="."]
+wait_time = 5.0
+[connection signal="timeout" from="GameTimer" to="." method="_on_GameTimer_timeout"]

UI/TopBar.tscn

@@ -1,5 +1,6 @@
-[gd_scene load_steps=12 format=2]
+[gd_scene load_steps=13 format=2]
 
+[ext_resource path="res://UI/TopBar.tscn" type="PackedScene" id=1]
 [ext_resource path="res://UI/TileSelectorModal.tscn" type="PackedScene" id=2]
 [ext_resource path="res://UI/CustomCursor.tscn" type="PackedScene" id=3]
 [ext_resource path="res://UI/TileViewDialog.tscn" type="PackedScene" id=4]
@@ -194,13 +195,7 @@ tracks/1/keys = {
 [node name="UI" type="CanvasLayer"]
 script = ExtResource( 6 )
 
-[node name="ColorRect" type="ColorRect" parent="."]
-margin_right = 64.0
-margin_bottom = 8.0
-color = Color( 0, 0, 0, 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
+[node name="TopBar" parent="." instance=ExtResource( 1 )]
 
 [node name="SelectorAnimationPlayer" type="AnimationPlayer" parent="."]
 autoplay = "Pending"
@@ -229,8 +224,8 @@ margin_bottom = 0.0
 [connection signal="click" from="TileSelectorModal/SelectionPanel/Panel/CloseButton" to="." method="_on_TileSelectorCloseButton_click"]
 [connection signal="click" from="TileSelectorModal/SelectionPanel/Panel/AcceptButton" to="." method="_on_TileSelectorAcceptButton_click"]
 [connection signal="click" from="TileViewDialog/InfoPanel/CloseButton" to="." method="_on_TileViewCloseButton_click"]
-[connection signal="click" from="TileViewDialog/InfoPanel/DestroyButton" to="TileViewDialog" method="_on_DestroyButton_click"]
 [connection signal="click" from="TileViewDialog/InfoPanel/DestroyButton" to="." method="_on_TileDestroyButton_click"]
+[connection signal="click" from="TileViewDialog/InfoPanel/DestroyButton" to="TileViewDialog" method="_on_DestroyButton_click"]
 [connection signal="click" from="TileViewDialog/InfoPanel/ClearButton" to="TileViewDialog" method="_on_ClearButton_click"]
 
 [editable path="TileSelectorModal"]

UI/UI.tscn

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/options-btn.png-29fb20061b37d6c4206eb6a1284f3497.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://UI/options-btn.png"
+dest_files=[ "res://.import/options-btn.png-29fb20061b37d6c4206eb6a1284f3497.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0