Merge pull request #52 from rafaelcastrocouto/main

v0.3

prototype/buildings/castle.tscn

@@ -184,7 +184,7 @@ radius = 60.0
 radius = 250.0
 
 [node name="castle" instance=ExtResource( 1 )]
-hp = 4000
+hp = 2400
 regen = 10
 vision = 320
 type = "building"

prototype/controls/camera.gd

@@ -115,22 +115,19 @@ func focus_leader(index):
 
 func zoom_reset(): 
 	zoom = zoom_default
-	game.ui.show_all()
 	game.ui.minimap.corner_view()
 	game.unit.hud.hide_hpbars()
 
 
 func zoom_in(): 
 	zoom = Vector2(zoom_limit.x,zoom_limit.x)
-	game.ui.hide_all_keep_stats()
+	game.ui.minimap.corner_view()
 	game.unit.hud.show_hpbars()
 
 
 func zoom_out(): 
 	zoom = Vector2(zoom_limit.y, zoom_limit.y)
-	game.ui.hide_all_keep_stats()
 	game.ui.minimap.hide_view()
-	game.ui.get_node("top_mid").show()
 
 
 func process():

prototype/controls/controls.gd → prototype/controls/controls_menu.gd

@@ -1,7 +1,7 @@
 extends ItemList
 var game:Node
 
-# self = game.ui.controls
+# self = game.ui.controls_menu
 
 onready var controls_buttons = get_node("scroll_container/container/controls_buttons")
 

prototype/controls/orders/orders_window.gd → prototype/controls/orders_menu.gd

@@ -1,7 +1,7 @@
 extends ItemList
 var game:Node
 
-# self = game.ui.orders
+# self = game.ui.orders_menu
 
 var cleared = false
 
@@ -22,7 +22,7 @@ var camp:Array = []
 var outpost:Array = []
 
 
-var button_template:PackedScene = load("res://controls/orders/button/order_button.tscn")
+var button_template:PackedScene = load("res://ui/buttons/order_button.tscn")
 
 const order_types = {
 	"leader_tactics": ["retreat","defend","default","attack"],
@@ -121,6 +121,7 @@ func build_leaders():
 		container.add_child(orders_container.node)
 		leader_orders[leader.name+leader.team] = orders_container
 		setup_leader_buttons(orders_container)
+		game.unit.orders.build_leaders()
 
 
 func setup_leader_buttons(orders_container):

prototype/game.gd

@@ -45,6 +45,9 @@ var control_state = "selection"
 
 var built:bool = false
 var started:bool = false
+var ended:bool = false
+
+var victory:String
 
 
 func _ready():
@@ -75,7 +78,7 @@ func start():
 
 		rng.randomize()
 		maps.setup_lanes()
-		ui.orders.build()
+		ui.orders_menu.build()
 		unit.follow.setup_pathfind()
 		unit.spawn.choose_leaders()
 

prototype/items/inventories.gd

@@ -18,7 +18,7 @@ var enemy_leaders_inv = {}
 var enemy_deliveries = {}
 
 
-var item_button_preload = preload("res://items/button/item_button.tscn")
+var item_button_preload = preload("res://ui/buttons/item_button.tscn")
 var sell_button_margin = 40
 
 

prototype/items/shop.gd

@@ -3,7 +3,7 @@ var game:Node
 
 # self = game.ui.shop
 
-var item_button_preload = preload("res://items/button/item_button.tscn")
+var item_button_preload = preload("res://ui/buttons/item_button.tscn")
 var cleared =false
 
 onready var container = get_node("scroll_container/container")
@@ -101,28 +101,25 @@ func close_to_blacksmith(leader):
 	return false
 
 
-
 func update_buttons():
 	if visible:
 		var leader = game.selected_leader
-
-
 		# disable all buttons if no leader selected or if delivery in proccess
-		if not leader or game.ui.inventories.is_delivering(leader): 
+		if not leader or game.ui.inventories.is_delivering(leader):
 			disable_all()
 			return
 
-		# enable/disable all buttons on which leader don't have enough golds
+				# disable equip if leader is not close to shop
+		if not close_to_blacksmith(leader):
+			disable_equip()
+
+		# enable/disable buttons on which leader don't have enough golds
 		var inventory = game.ui.inventories.get_leader_inventory(leader)
 		if leader and inventory:
 			for item_button in equip_items.get_children() + consumable_items.get_children():
 				var item_price = item_button.item.price
 				item_button.disabled = (leader.gold < item_price)
 
-		# disable equip if leader is not close to shop
-		if not close_to_blacksmith(leader):
-			disable_equip()
-
 		# disable buttons if leader don't have empty slots for item
 		if leader and inventory:
 			if !game.ui.inventories.equip_items_has_slots(leader):

prototype/leaders/arthur.tscn

@@ -1,22 +1,9 @@
-[gd_scene load_steps=24 format=2]
+[gd_scene load_steps=20 format=2]
 
 [ext_resource path="res://unit/unit.tscn" type="PackedScene" id=1]
-[ext_resource path="res://map/tool/color_replace.tres" type="Shader" id=2]
 [ext_resource path="res://assets/leaders/arthur_blue.png" type="Texture" id=3]
 [ext_resource path="res://assets/leaders/arthur_red.png" type="Texture" id=4]
 
-[sub_resource type="ShaderMaterial" id=30]
-shader = ExtResource( 2 )
-shader_param/origin = Color( 0.305882, 0.388235, 0.52549, 1 )
-shader_param/origin2 = Color( 0.32549, 0.584314, 0.709804, 1 )
-shader_param/origin3 = Color( 0.47451, 0.803922, 0.819608, 1 )
-shader_param/origin4 = Color( 0.643137, 0.560784, 0.435294, 1 )
-shader_param/new = Color( 0.537255, 0.317647, 0.4, 1 )
-shader_param/new2 = Color( 0.843137, 0.396078, 0.396078, 1 )
-shader_param/new3 = Color( 0.929412, 0.627451, 0.568627, 1 )
-shader_param/new4 = Color( 0.521569, 0.462745, 0.376471, 1 )
-shader_param/tolerance = 0.1
-
 [sub_resource type="Animation" id=24]
 resource_name = "attack"
 length = 0.8
@@ -487,14 +474,6 @@ tracks/6/keys = {
 atlas = ExtResource( 3 )
 region = Rect2( 0, 0, 24, 24 )
 
-[sub_resource type="AtlasTexture" id=34]
-atlas = ExtResource( 3 )
-region = Rect2( 24, 0, 24, 24 )
-
-[sub_resource type="AtlasTexture" id=35]
-atlas = ExtResource( 3 )
-region = Rect2( 48, 0, 24, 24 )
-
 [sub_resource type="AtlasTexture" id=38]
 atlas = ExtResource( 4 )
 region = Rect2( 0, 0, 24, 24 )
@@ -509,7 +488,7 @@ region = Rect2( 48, 0, 24, 24 )
 
 [sub_resource type="SpriteFrames" id=36]
 animations = [ {
-"frames": [ SubResource( 37 ), SubResource( 34 ), SubResource( 35 ) ],
+"frames": [ SubResource( 37 ) ],
 "loop": true,
 "name": "default",
 "speed": 5.0
@@ -574,14 +553,22 @@ scale = Vector2( 10, 10 )
 visible = false
 scale = Vector2( 1.2, 1.2 )
 
-[node name="icon" type="Sprite" parent="symbol" index="1"]
-material = SubResource( 30 )
+[node name="icon_blue" type="Sprite" parent="symbol" index="1"]
+visible = false
 scale = Vector2( 0.4, 0.4 )
 texture = ExtResource( 3 )
 offset = Vector2( 0, -2 )
 region_enabled = true
 region_rect = Rect2( 31, 0, 14, 14 )
 
+[node name="icon_red" type="Sprite" parent="symbol" index="2"]
+visible = false
+scale = Vector2( 0.4, 0.4 )
+texture = ExtResource( 4 )
+offset = Vector2( 0, -2 )
+region_enabled = true
+region_rect = Rect2( 31, 0, 14, 14 )
+
 [node name="state" parent="hud" index="0"]
 margin_top = -38.0
 margin_bottom = -22.0
@@ -597,10 +584,7 @@ anims/move = SubResource( 26 )
 anims/stun = SubResource( 33 )
 
 [node name="body" parent="sprites" index="1"]
-visible = true
 frames = SubResource( 36 )
-animation = "default"
-frame = 2
 offset = Vector2( -2, -12 )
 
 [node name="weapon" type="AnimatedSprite" parent="sprites" index="2"]

prototype/leaders/bokuden.tscn

@@ -1,22 +1,9 @@
-[gd_scene load_steps=24 format=2]
+[gd_scene load_steps=22 format=2]
 
 [ext_resource path="res://unit/unit.tscn" type="PackedScene" id=1]
-[ext_resource path="res://map/tool/color_replace.tres" type="Shader" id=2]
 [ext_resource path="res://assets/leaders/bokuden_red.png" type="Texture" id=3]
 [ext_resource path="res://assets/leaders/bokuden_blue.png" type="Texture" id=4]
 
-[sub_resource type="ShaderMaterial" id=40]
-shader = ExtResource( 2 )
-shader_param/origin = Color( 0.305882, 0.388235, 0.52549, 1 )
-shader_param/origin2 = Color( 0.32549, 0.584314, 0.709804, 1 )
-shader_param/origin3 = Color( 0.47451, 0.803922, 0.819608, 1 )
-shader_param/origin4 = Color( 0.235294, 0.27451, 0.376471, 1 )
-shader_param/new = Color( 0.537255, 0.317647, 0.4, 1 )
-shader_param/new2 = Color( 0.756863, 0.360784, 0.360784, 1 )
-shader_param/new3 = Color( 0.929412, 0.627451, 0.568627, 1 )
-shader_param/new4 = Color( 0.796078, 0.286275, 0.360784, 1 )
-shader_param/tolerance = 0.1
-
 [sub_resource type="Animation" id=24]
 resource_name = "attack"
 length = 0.8
@@ -622,14 +609,22 @@ scale = Vector2( 10, 10 )
 [node name="symbol_border" parent="symbol" index="0"]
 visible = false
 
-[node name="icon" type="Sprite" parent="symbol" index="1"]
-material = SubResource( 40 )
+[node name="icon_blue" type="Sprite" parent="symbol" index="1"]
+visible = false
 scale = Vector2( 0.4, 0.4 )
 texture = ExtResource( 4 )
 offset = Vector2( 0, -4 )
 region_enabled = true
 region_rect = Rect2( 7, 5, 30, 19 )
 
+[node name="icon_red" type="Sprite" parent="symbol" index="2"]
+visible = false
+scale = Vector2( 0.4, 0.4 )
+texture = ExtResource( 3 )
+offset = Vector2( 0, -4 )
+region_enabled = true
+region_rect = Rect2( 7, 5, 30, 19 )
+
 [node name="animations" type="AnimationPlayer" parent="." index="3"]
 anims/attack = SubResource( 24 )
 anims/death = SubResource( 31 )
@@ -638,9 +633,7 @@ anims/move = SubResource( 26 )
 anims/stun = SubResource( 33 )
 
 [node name="body" parent="sprites" index="1"]
-visible = true
 frames = SubResource( 44 )
-animation = "default"
 frame = 2
 offset = Vector2( -3, -16 )
 

prototype/leaders/hongi.tscn

@@ -1,22 +1,9 @@
-[gd_scene load_steps=26 format=2]
+[gd_scene load_steps=24 format=2]
 
 [ext_resource path="res://unit/unit.tscn" type="PackedScene" id=1]
-[ext_resource path="res://map/tool/color_replace.tres" type="Shader" id=2]
 [ext_resource path="res://assets/leaders/hongi_blue.png" type="Texture" id=3]
 [ext_resource path="res://assets/leaders/hongi_red.png" type="Texture" id=4]
 
-[sub_resource type="ShaderMaterial" id=30]
-shader = ExtResource( 2 )
-shader_param/origin = Color( 0.305882, 0.388235, 0.52549, 1 )
-shader_param/origin2 = Color( 0.32549, 0.584314, 0.709804, 1 )
-shader_param/origin3 = Color( 0.47451, 0.803922, 0.819608, 1 )
-shader_param/origin4 = Color( 0.380392, 0.305882, 0.270588, 1 )
-shader_param/new = Color( 0.537255, 0.317647, 0.4, 1 )
-shader_param/new2 = Color( 0.843137, 0.396078, 0.396078, 1 )
-shader_param/new3 = Color( 0.835294, 0.556863, 0.501961, 1 )
-shader_param/new4 = Color( 0.32549, 0.262745, 0.262745, 1 )
-shader_param/tolerance = 0.1
-
 [sub_resource type="Animation" id=24]
 resource_name = "attack"
 length = 0.8
@@ -593,14 +580,25 @@ projectile_rotation = 20.0
 modulate = Color( 1, 1, 1, 1 )
 scale = Vector2( 10, 10 )
 
-[node name="icon" type="Sprite" parent="symbol" index="1"]
-material = SubResource( 30 )
+[node name="symbol_border" parent="symbol" index="0"]
+visible = false
+
+[node name="icon_blue" type="Sprite" parent="symbol" index="1"]
+visible = false
 scale = Vector2( 0.4, 0.4 )
 texture = ExtResource( 3 )
 offset = Vector2( -2, -2 )
 region_enabled = true
 region_rect = Rect2( 14, 4, 21, 18 )
 
+[node name="icon_red" type="Sprite" parent="symbol" index="2"]
+visible = false
+scale = Vector2( 0.4, 0.4 )
+texture = ExtResource( 4 )
+offset = Vector2( -2, -2 )
+region_enabled = true
+region_rect = Rect2( 14, 4, 21, 18 )
+
 [node name="state" parent="hud" index="0"]
 margin_top = -39.0
 
@@ -618,7 +616,6 @@ anims/stun = SubResource( 33 )
 position = Vector2( 0, 9 )
 
 [node name="body" parent="sprites" index="1"]
-visible = true
 frames = SubResource( 36 )
 animation = "red"
 offset = Vector2( -6, -15 )