Merge pull request #50 from rafaelcastrocouto/main

fog of war
spicylobstergames · Aug 7, 2022 · 5ca4339 · 5ca4339
2 parents da04ad9 + 57ab1d9
commit 5ca4339
Show file tree

Hide file tree

Showing 78 changed files with 1,393 additions and 916 deletions.
diff --git a/prototype/assets/buildings/buildings.png → ...otype/assets/buildings/buildings_blue.png b/prototype/assets/buildings/buildings.png → ...otype/assets/buildings/buildings_blue.png
diff --git a/prototype/assets/buildings/buildings_gray.png b/prototype/assets/buildings/buildings_gray.png
diff --git a/prototype/assets/buildings/buildings_red.png b/prototype/assets/buildings/buildings_red.png
diff --git a/prototype/assets/buildings/neutral.png → prototype/assets/buildings/neutral_blue.png b/prototype/assets/buildings/neutral.png → prototype/assets/buildings/neutral_blue.png
diff --git a/prototype/assets/buildings/neutral_gray.png b/prototype/assets/buildings/neutral_gray.png
diff --git a/prototype/assets/buildings/neutral_red.png b/prototype/assets/buildings/neutral_red.png
diff --git a/prototype/assets/leaders/arthur.png → prototype/assets/leaders/arthur_blue.png b/prototype/assets/leaders/arthur.png → prototype/assets/leaders/arthur_blue.png
diff --git a/prototype/assets/leaders/arthur_red.png b/prototype/assets/leaders/arthur_red.png
diff --git a/prototype/assets/leaders/bokuden.png → prototype/assets/leaders/bokuden_blue.png b/prototype/assets/leaders/bokuden.png → prototype/assets/leaders/bokuden_blue.png
diff --git a/prototype/assets/leaders/bokuden_red.png b/prototype/assets/leaders/bokuden_red.png
diff --git a/prototype/assets/leaders/hongi.png → prototype/assets/leaders/hongi_blue.png b/prototype/assets/leaders/hongi.png → prototype/assets/leaders/hongi_blue.png
diff --git a/prototype/assets/leaders/hongi_red.png b/prototype/assets/leaders/hongi_red.png
diff --git a/prototype/assets/leaders/lorne.png b/prototype/assets/leaders/lorne.png
diff --git a/prototype/assets/leaders/lorne_blue.png b/prototype/assets/leaders/lorne_blue.png
diff --git a/prototype/assets/leaders/lorne_red.png b/prototype/assets/leaders/lorne_red.png
diff --git a/prototype/assets/leaders/nagato.png → prototype/assets/leaders/nagato_blue.png b/prototype/assets/leaders/nagato.png → prototype/assets/leaders/nagato_blue.png
diff --git a/prototype/assets/leaders/nagato_red.png b/prototype/assets/leaders/nagato_red.png
diff --git a/prototype/assets/leaders/osman.png → prototype/assets/leaders/osman_blue.png b/prototype/assets/leaders/osman.png → prototype/assets/leaders/osman_blue.png
diff --git a/prototype/assets/leaders/osman_red.png b/prototype/assets/leaders/osman_red.png
diff --git a/prototype/assets/leaders/raja.png → prototype/assets/leaders/raja_blue.png b/prototype/assets/leaders/raja.png → prototype/assets/leaders/raja_blue.png
diff --git a/prototype/assets/leaders/raja_red.png b/prototype/assets/leaders/raja_red.png
diff --git a/prototype/assets/leaders/robin.png → prototype/assets/leaders/robin_blue.png b/prototype/assets/leaders/robin.png → prototype/assets/leaders/robin_blue.png
diff --git a/prototype/assets/leaders/robin_red.png b/prototype/assets/leaders/robin_red.png
diff --git a/prototype/assets/leaders/rollo.png → prototype/assets/leaders/rollo_blue.png b/prototype/assets/leaders/rollo.png → prototype/assets/leaders/rollo_blue.png
diff --git a/prototype/assets/leaders/rollo_red.png b/prototype/assets/leaders/rollo_red.png
diff --git a/prototype/assets/leaders/sida.png → prototype/assets/leaders/sida_blue.png b/prototype/assets/leaders/sida.png → prototype/assets/leaders/sida_blue.png
diff --git a/prototype/assets/leaders/sida_red.png b/prototype/assets/leaders/sida_red.png
diff --git a/prototype/assets/leaders/takoda.png → prototype/assets/leaders/takoda_blue.png b/prototype/assets/leaders/takoda.png → prototype/assets/leaders/takoda_blue.png
diff --git a/prototype/assets/leaders/takoda_red.png b/prototype/assets/leaders/takoda_red.png
diff --git a/prototype/assets/leaders/tomyris.png → prototype/assets/leaders/tomyris_blue.png b/prototype/assets/leaders/tomyris.png → prototype/assets/leaders/tomyris_blue.png
diff --git a/prototype/assets/leaders/tomyris_red.png b/prototype/assets/leaders/tomyris_red.png
diff --git a/prototype/assets/map/light.png b/prototype/assets/map/light.png
diff --git a/prototype/assets/pawns/archer.png → prototype/assets/pawns/archer_blue.png b/prototype/assets/pawns/archer.png → prototype/assets/pawns/archer_blue.png
diff --git a/prototype/assets/pawns/archer_red.png b/prototype/assets/pawns/archer_red.png
diff --git a/prototype/assets/pawns/infantry.png → prototype/assets/pawns/infantry_blue.png b/prototype/assets/pawns/infantry.png → prototype/assets/pawns/infantry_blue.png
diff --git a/prototype/assets/pawns/infantry_neutral.png b/prototype/assets/pawns/infantry_neutral.png
diff --git a/prototype/assets/pawns/infantry_red.png b/prototype/assets/pawns/infantry_red.png
diff --git a/prototype/assets/pawns/mounted.png → prototype/assets/pawns/mounted_blue.png b/prototype/assets/pawns/mounted.png → prototype/assets/pawns/mounted_blue.png
diff --git a/prototype/assets/pawns/mounted_red.png b/prototype/assets/pawns/mounted_red.png
diff --git a/prototype/assets/unit/lumberjack.png → prototype/assets/unit/lumberjack_blue.png b/prototype/assets/unit/lumberjack.png → prototype/assets/unit/lumberjack_blue.png
diff --git a/prototype/assets/unit/lumberjack_red.png b/prototype/assets/unit/lumberjack_red.png
diff --git a/prototype/buildings/barrack.tscn b/prototype/buildings/barrack.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=23 format=2]
 
 [ext_resource path="res://unit/unit.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/pawns/archer.png" type="Texture" id=2]
-[ext_resource path="res://assets/buildings/buildings.png" type="Texture" id=3]
+[ext_resource path="res://assets/pawns/archer_blue.png" type="Texture" id=2]
+[ext_resource path="res://assets/buildings/buildings_blue.png" type="Texture" id=3]
 [ext_resource path="res://buildings/decoration/flag.tscn" type="PackedScene" id=4]
-[ext_resource path="res://map/tool/color_replace.tres" type="Shader" id=5]
+[ext_resource path="res://assets/buildings/buildings_red.png" type="Texture" id=5]
+[ext_resource path="res://assets/buildings/buildings_gray.png" type="Texture" id=6]
 
 [sub_resource type="Animation" id=24]
 resource_name = "attack"
@@ -110,17 +111,35 @@ tracks/1/keys = {
 "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ) ]
 }
 
-[sub_resource type="ShaderMaterial" id=30]
-shader = ExtResource( 5 )
-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 = null
-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 = null
-shader_param/tolerance = 0.1
+[sub_resource type="AtlasTexture" id=43]
+atlas = ExtResource( 3 )
+region = Rect2( 128, 0, 64, 128 )
+
+[sub_resource type="AtlasTexture" id=44]
+atlas = ExtResource( 5 )
+region = Rect2( 128, 0, 64, 128 )
+
+[sub_resource type="AtlasTexture" id=45]
+atlas = ExtResource( 6 )
+region = Rect2( 128, 0, 64, 128 )
+
+[sub_resource type="SpriteFrames" id=46]
+animations = [ {
+"frames": [ SubResource( 43 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 44 ) ],
+"loop": true,
+"name": "red",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 45 ) ],
+"loop": true,
+"name": "neutral",
+"speed": 5.0
+} ]
 
 [sub_resource type="AtlasTexture" id=39]
 atlas = ExtResource( 2 )
@@ -205,22 +224,19 @@ anims/idle = SubResource( 25 )
 [node name="shadow" parent="sprites" index="0"]
 visible = false
 
-[node name="sprite" parent="sprites" index="1"]
-visible = false
+[node name="body" parent="sprites" index="1"]
+visible = true
+use_parent_material = false
+frames = SubResource( 46 )
+animation = "default"
+offset = Vector2( 0, -53 )
 
 [node name="flags" type="Node2D" parent="sprites" index="2"]
 
 [node name="flag" parent="sprites/flags" index="0" instance=ExtResource( 4 )]
 position = Vector2( 1, -80 )
 
-[node name="body" type="Sprite" parent="sprites" index="3"]
-material = SubResource( 30 )
-texture = ExtResource( 3 )
-offset = Vector2( 0, -40 )
-region_enabled = true
-region_rect = Rect2( 128, 16, 64, 104 )
-
-[node name="weapon" type="Node2D" parent="sprites" index="4"]
+[node name="weapon" type="Node2D" parent="sprites" index="3"]
 position = Vector2( 0, -43 )
 scale = Vector2( 1.0686, 1 )
 

diff --git a/prototype/buildings/blacksmith.tscn b/prototype/buildings/blacksmith.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=15 format=2]
+[gd_scene load_steps=19 format=2]
 
 [ext_resource path="res://unit/unit.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/pawns/archer.png" type="Texture" id=2]
-[ext_resource path="res://assets/buildings/neutral.png" type="Texture" id=3]
+[ext_resource path="res://assets/pawns/archer_blue.png" type="Texture" id=2]
+[ext_resource path="res://assets/buildings/neutral_blue.png" type="Texture" id=3]
 [ext_resource path="res://buildings/decoration/flag.tscn" type="PackedScene" id=4]
-[ext_resource path="res://map/tool/color_replace.tres" type="Shader" id=5]
+[ext_resource path="res://assets/buildings/neutral_red.png" type="Texture" id=5]
+[ext_resource path="res://assets/buildings/neutral_gray.png" type="Texture" id=6]
 
 [sub_resource type="Animation" id=24]
 resource_name = "attack"
@@ -110,17 +111,35 @@ tracks/1/keys = {
 "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ) ]
 }
 
-[sub_resource type="ShaderMaterial" id=30]
-shader = ExtResource( 5 )
-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.2, 0.266667, 0.380392, 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.462745, 0.219608, 0.294118, 1 )
-shader_param/tolerance = 0.1
+[sub_resource type="AtlasTexture" id=42]
+atlas = ExtResource( 3 )
+region = Rect2( 237, 20, 62, 68 )
+
+[sub_resource type="AtlasTexture" id=44]
+atlas = ExtResource( 6 )
+region = Rect2( 237, 20, 62, 68 )
+
+[sub_resource type="AtlasTexture" id=45]
+atlas = ExtResource( 5 )
+region = Rect2( 237, 20, 62, 68 )
+
+[sub_resource type="SpriteFrames" id=43]
+animations = [ {
+"frames": [ SubResource( 42 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 44 ) ],
+"loop": true,
+"name": "neutral",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 45 ) ],
+"loop": true,
+"name": "red",
+"speed": 5.0
+} ]
 
 [sub_resource type="AtlasTexture" id=39]
 atlas = ExtResource( 2 )
@@ -183,23 +202,20 @@ anims/idle = SubResource( 25 )
 [node name="shadow" parent="sprites" index="0"]
 visible = false
 
-[node name="sprite" parent="sprites" index="1"]
-visible = false
+[node name="body" parent="sprites" index="1"]
+visible = true
+use_parent_material = false
+frames = SubResource( 43 )
+animation = "default"
+offset = Vector2( 0, -30 )
 
 [node name="flags" type="Node2D" parent="sprites" index="2"]
 visible = false
 
 [node name="flag" parent="sprites/flags" index="0" instance=ExtResource( 4 )]
 position = Vector2( 1, -80 )
 
-[node name="body" type="Sprite" parent="sprites" index="3"]
-material = SubResource( 30 )
-texture = ExtResource( 3 )
-offset = Vector2( 0, -22 )
-region_enabled = true
-region_rect = Rect2( 237, 20, 62, 68 )
-
-[node name="weapon" type="Node2D" parent="sprites" index="4"]
+[node name="weapon" type="Node2D" parent="sprites" index="3"]
 position = Vector2( 0, -43 )
 scale = Vector2( 1.0686, 1 )
 

diff --git a/prototype/buildings/camp.tscn b/prototype/buildings/camp.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=20 format=2]
 
 [ext_resource path="res://unit/unit.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/pawns/archer.png" type="Texture" id=2]
-[ext_resource path="res://assets/buildings/neutral.png" type="Texture" id=3]
+[ext_resource path="res://assets/pawns/archer_blue.png" type="Texture" id=2]
+[ext_resource path="res://assets/buildings/neutral_blue.png" type="Texture" id=3]
 [ext_resource path="res://buildings/decoration/flag.tscn" type="PackedScene" id=4]
-[ext_resource path="res://map/tool/color_replace.tres" type="Shader" id=5]
+[ext_resource path="res://assets/buildings/neutral_red.png" type="Texture" id=5]
+[ext_resource path="res://assets/buildings/neutral_gray.png" type="Texture" id=6]
 
 [sub_resource type="Animation" id=24]
 resource_name = "attack"
@@ -110,17 +111,35 @@ tracks/1/keys = {
 "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ) ]
 }
 
-[sub_resource type="ShaderMaterial" id=30]
-shader = ExtResource( 5 )
-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.2, 0.266667, 0.380392, 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.4, 0.180392, 0.25098, 1 )
-shader_param/tolerance = 0.1
+[sub_resource type="AtlasTexture" id=43]
+atlas = ExtResource( 3 )
+region = Rect2( 64, 23, 75, 65 )
+
+[sub_resource type="AtlasTexture" id=44]
+atlas = ExtResource( 6 )
+region = Rect2( 64, 23, 75, 65 )
+
+[sub_resource type="AtlasTexture" id=45]
+atlas = ExtResource( 5 )
+region = Rect2( 64, 23, 75, 65 )
+
+[sub_resource type="SpriteFrames" id=46]
+animations = [ {
+"frames": [ SubResource( 43 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 44 ) ],
+"loop": true,
+"name": "neutral",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 45 ) ],
+"loop": true,
+"name": "red",
+"speed": 5.0
+} ]
 
 [sub_resource type="AtlasTexture" id=39]
 atlas = ExtResource( 2 )
@@ -190,23 +209,20 @@ anims/idle = SubResource( 25 )
 [node name="shadow" parent="sprites" index="0"]
 visible = false
 
-[node name="sprite" parent="sprites" index="1"]
-visible = false
+[node name="body" parent="sprites" index="1"]
+visible = true
+use_parent_material = false
+frames = SubResource( 46 )
+animation = "default"
+offset = Vector2( 0, -30 )
 
 [node name="flags" type="Node2D" parent="sprites" index="2"]
 visible = false
 
 [node name="flag" parent="sprites/flags" index="0" instance=ExtResource( 4 )]
 position = Vector2( 1, -80 )
 
-[node name="body" type="Sprite" parent="sprites" index="3"]
-material = SubResource( 30 )
-texture = ExtResource( 3 )
-offset = Vector2( 0, -22 )
-region_enabled = true
-region_rect = Rect2( 64, 23, 75, 65 )
-
-[node name="weapon" type="Node2D" parent="sprites" index="4"]
+[node name="weapon" type="Node2D" parent="sprites" index="3"]
 position = Vector2( -8, -27 )
 scale = Vector2( 1.0686, 1 )
 

diff --git a/prototype/buildings/castle.tscn b/prototype/buildings/castle.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=23 format=2]
 
 [ext_resource path="res://unit/unit.tscn" type="PackedScene" id=1]
 [ext_resource path="res://buildings/decoration/flag.tscn" type="PackedScene" id=2]
-[ext_resource path="res://assets/pawns/archer.png" type="Texture" id=3]
-[ext_resource path="res://map/tool/color_replace.tres" type="Shader" id=4]
-[ext_resource path="res://assets/buildings/buildings.png" type="Texture" id=5]
+[ext_resource path="res://assets/pawns/archer_blue.png" type="Texture" id=3]
+[ext_resource path="res://assets/buildings/buildings_red.png" type="Texture" id=4]
+[ext_resource path="res://assets/buildings/buildings_blue.png" type="Texture" id=5]
+[ext_resource path="res://assets/buildings/buildings_gray.png" type="Texture" id=6]
 
 [sub_resource type="Animation" id=24]
 resource_name = "attack"
@@ -40,6 +41,7 @@ tracks/1/keys = {
 [sub_resource type="Animation" id=31]
 resource_name = "death"
 length = 0.6
+loop = true
 tracks/0/type = "value"
 tracks/0/path = NodePath("sprites:scale")
 tracks/0/interp = 1
@@ -110,17 +112,35 @@ tracks/1/keys = {
 "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ) ]
 }
 
-[sub_resource type="ShaderMaterial" id=30]
-shader = ExtResource( 4 )
-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 = null
-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 = null
-shader_param/tolerance = 0.1
+[sub_resource type="AtlasTexture" id=43]
+atlas = ExtResource( 5 )
+region = Rect2( 0, 0, 96, 128 )
+
+[sub_resource type="AtlasTexture" id=45]
+atlas = ExtResource( 6 )
+region = Rect2( 0, 0, 96, 128 )
+
+[sub_resource type="AtlasTexture" id=44]
+atlas = ExtResource( 4 )
+region = Rect2( 0, 0, 96, 128 )
+
+[sub_resource type="SpriteFrames" id=46]
+animations = [ {
+"frames": [ SubResource( 43 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 45 ) ],
+"loop": true,
+"name": "neutral",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 44 ) ],
+"loop": true,
+"name": "red",
+"speed": 5.0
+} ]
 
 [sub_resource type="AtlasTexture" id=39]
 atlas = ExtResource( 3 )
@@ -204,8 +224,13 @@ anims/idle = SubResource( 25 )
 [node name="shadow" parent="sprites" index="0"]
 visible = false
 
-[node name="sprite" parent="sprites" index="1"]
-visible = false
+[node name="body" parent="sprites" index="1"]
+visible = true
+use_parent_material = false
+position = Vector2( 0, 11 )
+frames = SubResource( 46 )
+animation = "default"
+offset = Vector2( 0, -51 )
 
 [node name="flags" type="Node2D" parent="sprites" index="2"]
 
@@ -225,14 +250,7 @@ scale = Vector2( 0.8, 0.8 )
 position = Vector2( 24, -97.5 )
 scale = Vector2( 0.8, 0.8 )
 
-[node name="body" type="Sprite" parent="sprites" index="3"]
-material = SubResource( 30 )
-texture = ExtResource( 5 )
-offset = Vector2( 0, -44 )
-region_enabled = true
-region_rect = Rect2( 0, 0, 96, 120 )
-
-[node name="weapon" type="Node2D" parent="sprites" index="4"]
+[node name="weapon" type="Node2D" parent="sprites" index="3"]
 position = Vector2( 0, -37 )
 scale = Vector2( 1.0686, 1 )