Merge lp:~chuckw20/widelands/New_frontier_markers_with_playercolor into lp:widelands

[Chuck Wilder]

Redeisgned frontier markers for atlantean, barbarian, and empire tribes. Added playercolor masks and removed old playercolor code from their conf files.

[Chuck Wilder (chuckw20)]

Please test this in a Windows multiplayer environment before merging. When testing it in multiplayer mode with build 15 under Windows, I encountered an error referring to a missing [initializations] section in the modified atlantean conf file. There is no such section in the old conf files and the error did not occur in single player mode.

The error did not occur in any of my linux testing.

[SirVer (sirver)]

The [initializations] vanished with the win-conditions merge lately. Could it be that your windows version is a little dated?

I have the following suggestions for the frontiers: I like the barbarian ones, but the empire and atlanteans look too similar. I suggest a marble stone/sign for the empire as they use marble so much. Also the playercolor areas are not shaded which gives them a bit of a dull look.

review: Needs Fixing

[Chuck Wilder (chuckw20)]

On Wed, Apr 28, 2010 at 5:35 AM, SirVer <email address hidden> wrote:

> Review: Needs Fixing
> The [initializations] vanished with the win-conditions merge lately. Could
> it be that your windows version is a little dated?
>
> If the win-conditions merge was post-build15, then yes. I still haven't
successfully installed a Windows compiler, so I was using the most current
Windows build I could find which was the build15 release.

I have the following suggestions for the frontiers: I like the barbarian
> ones, but the empire and atlanteans look too similar. I suggest a marble
> stone/sign for the empire as they use marble so much. Also the playercolor
> areas are not shaded which gives them a bit of a dull look.
>
> I wanted to attempt an imperial frontier that resembled a Roman legion
regimental standard, but I guess yours is the better idea. Again, the scale
required by the engine must be taken into account.

I did use shading on the atlantean frontiers, borrowing the same object used
to represent the pile of crystals in the crystal mine building. It just
didn't seem to translate that well. I'll see what I can do.

For now, I'm keeping them static images, but we may want to consider some
animation in the future. I'm thinking chevrons or animal pelts or maybe
even "blue fire". ;)

=== modified file 'tribes/atlanteans/conf' (properties changed: -x to +x)
--- tribes/atlanteans/conf	2010-04-17 11:39:28 +0000
+++ tribes/atlanteans/conf	2010-04-28 16:03:43 +0000
@@ -1,19 +1,5 @@
 # Comments are for graphic designers some ideas
 
-[defaults]
-plrclr0_r=2
-plrclr0_g=2
-plrclr0_b=74
-plrclr1_r=2
-plrclr1_g=2
-plrclr1_b=112
-plrclr2_r=2
-plrclr2_g=2
-plrclr2_b=149
-plrclr3_r=2
-plrclr3_g=2
-plrclr3_b=198
-
 [tribe]
 author=_ The Widelands Development Team
 name=_ Atlanteans
@@ -27,6 +13,7 @@
 name=frontier
 pics=pics/frontier_??.png
 hotspot=3 12
+playercolor=true
 
 # Not just a plain color, maybe a cross or some stribes
 [flag]

=== modified file 'tribes/atlanteans/pics/frontier_00.png' (properties changed: -x to +x)
Binary files tribes/atlanteans/pics/frontier_00.png	2009-11-11 19:21:34 +0000 and tribes/atlanteans/pics/frontier_00.png	2010-04-28 16:03:43 +0000 differ
=== added file 'tribes/atlanteans/pics/frontier_00_pc.png'
Binary files tribes/atlanteans/pics/frontier_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/atlanteans/pics/frontier_00_pc.png	2010-04-28 16:03:43 +0000 differ
=== modified file 'tribes/barbarians/conf' (properties changed: -x to +x)
--- tribes/barbarians/conf	2010-04-17 11:49:40 +0000
+++ tribes/barbarians/conf	2010-04-28 16:03:43 +0000
@@ -1,23 +1,9 @@
 # Comments are for graphic designers some ideas
 
-[defaults]
-plrclr0_r=2
-plrclr0_g=2
-plrclr0_b=74
-plrclr1_r=2
-plrclr1_g=2
-plrclr1_b=112
-plrclr2_r=2
-plrclr2_g=2
-plrclr2_b=149
-plrclr3_r=2
-plrclr3_g=2
-plrclr3_b=198
-
 [tribe]
 author=_The Widelands Development Team
 name=_Barbarians
-descr=_The mighty tribes of the eastern lands!
+descr=_The mighty tribes of the east-lands!
 bob_vision_range=2
 uiposition=10
 carrier2=ox
@@ -27,6 +13,7 @@
 name=frontier
 pics=pics/frontier_??.png
 hotspot=1 19
+playercolor=true
 
 # Not just a plain color, maybe a cross or some stribes
 [flag]
@@ -218,6 +205,10 @@
 scouts_hut=_"Scout's Hut"
 cattlefarm=_Cattle Farm
 
+[initializations]
+headquarters_medium=_Headquarters medium
+castle_village=_Citadel village
+
 [military_data]
 retreat_interval=0-80
 retreat=20

=== modified file 'tribes/barbarians/pics/frontier_00.png' (properties changed: -x to +x)
Binary files tribes/barbarians/pics/frontier_00.png	2005-12-29 01:10:07 +0000 and tribes/barbarians/pics/frontier_00.png	2010-04-28 16:03:43 +0000 differ
=== added file 'tribes/barbarians/pics/frontier_00_pc.png'
Binary files tribes/barbarians/pics/frontier_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/pics/frontier_00_pc.png	2010-04-28 16:03:43 +0000 differ
=== modified file 'tribes/empire/conf' (properties changed: -x to +x)
--- tribes/empire/conf	2010-04-17 11:39:28 +0000
+++ tribes/empire/conf	2010-04-28 16:03:43 +0000
@@ -1,19 +1,5 @@
 # Comments are for graphic designers some ideas
 
-[defaults]
-plrclr0_r=2
-plrclr0_g=2
-plrclr0_b=74
-plrclr1_r=2
-plrclr1_g=2
-plrclr1_b=112
-plrclr2_r=2
-plrclr2_g=2
-plrclr2_b=149
-plrclr3_r=2
-plrclr3_g=2
-plrclr3_b=198
-
 [tribe]
 author=_The Widelands Development Team
 name=_Empire
@@ -27,6 +13,7 @@
 name=frontier
 pics=pics/frontier_??.png
 hotspot=1 19
+playercolor=true
 
 # Not just a plain color, maybe a cross or some stribes
 [flag]
@@ -212,6 +199,10 @@
 scouts_house=_"Scout's House"
 donkeyfarm=_Donkeyfarm
 
+[initializations]
+headquarters_medium=_Headquarters medium
+castle_village=_Castle village
+
 [military_data]
 retreat_interval=10-90
 retreat=50

=== modified file 'tribes/empire/pics/frontier_00.png' (properties changed: -x to +x)
Binary files tribes/empire/pics/frontier_00.png	2009-11-12 11:55:09 +0000 and tribes/empire/pics/frontier_00.png	2010-04-28 16:03:43 +0000 differ
=== added file 'tribes/empire/pics/frontier_00_pc.png'
Binary files tribes/empire/pics/frontier_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/empire/pics/frontier_00_pc.png	2010-04-28 16:03:43 +0000 differ