← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands/frisians into lp:widelands

 

I'm on the wrong computer right now, so some string fixes as diff comments in-line.

I'd still like to look at the Lua code and the scenario texts. Scenario texts can be done later though, because I can control when I add them to Transifex. The introductions need to be ready though.

At first glance, I noticed that you used CamelCase for variable and function names. We use under_scores instead, so it's important that we fix those for code style consistency. It will make the code easier to read.

Diff comments:

> === modified file 'data/campaigns/campaigns.conf'
> --- data/campaigns/campaigns.conf	2018-01-21 10:14:16 +0000
> +++ data/campaigns/campaigns.conf	2018-02-23 07:19:41 +0000
> @@ -48,6 +48,15 @@
>  campdesc2=_"When their God lost faith in the Atlanteans and drowned their island, one woman’s struggle for justice and a second chance for her people would become the stuff of legends. Leading the remaining Atlanteans into a new future in a new part of the World, Jundlina became the most powerful human of her time, but at a high cost: her humanity and soul."
>  campvisi2=0
>  cnewvisi2=empiretut01
> +# Frisian Introduction
> +campname3=_"From Water to Ice"
> +campsect3=frisians
> +camptribe3=_"Frisians"
> +campdiff3=3
> +campdiffdescr3=_"For advanced players. Introduces the Frisians"
> +campdesc3=_"Living from the ocean is a constant struggle, and even more so for the inhabitants of the Frisian North Sea shore. Was the last stormflood, the most devastating one in human memory, really nothing more than yet another example for the hardships all Frisians have to face – or a sign from the gods that a tribe that only just settled here must seek out an entirely new home?"

Living off the ocean is a constant struggle, and even more so for the inhabitants of the Frisian North Sea shore. Was the last storm flood, the most devastating one in human memory, really nothing more than yet another example for the hardships all Frisians have to face – or a sign from the gods that a tribe that only just settled here must seek out an entirely new home?

> +campvisi3=0
> +cnewvisi3=atlanteans01
>  
>  
>  
> === added file 'data/campaigns/fri01.wmf/elemental'
> --- data/campaigns/fri01.wmf/elemental	1970-01-01 00:00:00 +0000
> +++ data/campaigns/fri01.wmf/elemental	2018-02-23 07:19:41 +0000
> @@ -0,0 +1,13 @@
> +# Automatically created by Widelands bzr8485[frisians] (Release)
> +
> +[global]
> +packet_version="1"
> +map_w="224"
> +map_h="128"
> +nr_players="2"
> +name="De Grote Mandrenke"

Please reserve this title for the German translation and think up an English name. https://en.wikipedia.org/wiki/Saint_Marcellus%27_flood

Also, we need localization markers for name, descr and hint.

> +author="Nordfriese"
> +descr="In 1362, the quiet, peaceful life of the inhabitants of the Northern Frisian Islands was disrupted by one of the greatest stormfloods in human memory: Saint Marcellus´ Flood. Is it really nothing more than yet another storm, or a sign from the Gods that the Frisian community on the island of Langeneß is not wanted here?"

In 1362, the quiet, peaceful life of the inhabitants of the Northern Frisian Islands was disrupted by one of the greatest storm floods in human memory: Saint Marcellus’ Flood. Is it really nothing more than yet another storm, or a sign from the Gods that the Frisian community on the island of Langeness is not wanted here?

> +hint="This scenario is set in a historical context, but most of the storyline is fiction."

This scenario is set in a historical context, but most of the story line is fiction.

> +background="campaigns/fri01.wmf/pics/background.jpg"
> +tags="seafaring"
> === added file 'data/campaigns/fri02.wmf/elemental'
> --- data/campaigns/fri02.wmf/elemental	1970-01-01 00:00:00 +0000
> +++ data/campaigns/fri02.wmf/elemental	2018-02-23 07:19:41 +0000
> @@ -0,0 +1,13 @@
> +# Automatically created by Widelands bzr8439[frisians] (Release)
> +
> +[global]
> +packet_version="1"
> +map_w="208"
> +map_h="208"
> +nr_players="3"
> +name="An Icy Welcome"

Add localization markers
name=_"An Icy Welcome"

> +author="Nordfriese"
> +descr="Reebaud and his tribe have arrived in the North. But their arrival between the frozen steppes and the snow-covered mountains is less than welcome…"
> +hint=
> +background="campaigns/fri02.wmf/pics/background.jpg"
> +tags="unbalanced"


-- 
https://code.launchpad.net/~widelands-dev/widelands/frisians/+merge/336910
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisians.


References