793 Commits

Author SHA1 Message Date
Severin Glöckner
8a90f814ba ANL worker: converting to flatland is not the same as creating a farm
Farms have a multi turn cycle:
1) crate farm (converts to Re)
2) end turn on the filed to harvest (Re has been automatically converted)
3) convert to grasland [othrwise the fields remains unusable for building]

Step 3 was labeled the same as step 1.

[ci skip]

(cherry-picked from commit 1867274d25993d465c74dda528381895e79de7ae)
2018-10-07 03:24:23 +00:00
Severin Glöckner
27f6be9a37 use & to denote team setup in MP
code it as & to avoid a pango warning in stderr
3ec26df changed it previously to '+' to work around that warning
also change it for the untranslatable strings in the credits
[ci skip]

(cherry-picked from commit cd5b3f785e137f66f9d282c8348a6ad877e48d2f)
2018-10-07 03:24:07 +00:00
Iris Morelle
31aaabb92e Fix excessive dots in ellipses in several mainline scenarios
[ci skip]

(cherry-picked from commit de8d468b14119d7486bbbb782a2aabce1b650991)
2018-10-07 03:23:15 +00:00
Severin Glöckner
40dc80f02f slight text edits
- missing dots in some MP strings
- superfluous space in some MP strings
-ran wmlinden on UtBS scenarios

[ci skip]

(cherry-picked from commit 5bd6221c44d1523b210bf9eaa5cf693cde350221)
2018-10-07 03:23:13 +00:00
Severin Glöckner
9cacb51351 Replace deprecated macro with terrain code in MP: Tombs of Kesorak
[ci skip]

(cherry-picked from commit 2a5ea00ad04f5b879ab316aae9578c29378eabb8)
2018-10-07 03:23:13 +00:00
Severin Glöckner
8508964935 Change campfire timezones in MP: Tombs of Kesorak
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

For the always dark one exists no immage, uses one from after the fall,
with slightly adjusted ToD shifting as it looked to weak.

The 1 hex small campfires look best with dusk.

part of #3056

[ci skip]

(cherry-picked from commit f5890c10a21451b0477ca13956bb6f9124ce621e)
2018-10-07 03:23:13 +00:00
mattsc
f48f566afd Lua code: replace deprecated helper.[gs]et_variable_array() calls
(cherry-picked from commit 3c792fc7d774c96ef467847a6267a71a2f731f96)
2018-10-07 03:21:09 +00:00
mattsc
4586e04eca Lua code: replace deprecated helper.child_range() calls
(cherry-picked from commit 7c137e1a336559acdd6f797192a9516135480b2e)
2018-10-07 03:21:09 +00:00
mattsc
0e017d9f7c Lua code: replace deprecated wesnoth.set_variable() calls
(cherry-picked from commit ce7faae4f41f23f1d1f61d2b4f5ca95d4ce4f89a)
2018-10-07 03:21:07 +00:00
mattsc
05d5afa6a9 Lua code: replace deprecated wesnoth.get_variable() calls
(cherry-picked from commit f1764d182fe33c4e29c6bd42761be2e946cd0c94)
2018-10-07 03:21:06 +00:00
gfgtdf
bbe817086c fix lua error in 2p_Dark_Forecast 2
(cherry-picked from commit 438ca7bc1ee0e2c6e6b1dd6c97e409b2785f380b)
2018-10-07 03:19:51 +00:00
Severin Glöckner
5621fbb643 Dark Forecast: fix untranslatable string by
reusing the one from the Campaign Selection Menu

[ci skip]

(cherry-picked from commit 8657fdb9a39f6556fb236d45e451a91c547852af)
2018-10-07 03:19:40 +00:00
Charles Dang
20493dc07c ANL: removed unused macro (closes #2878)
[ci skip]

(cherry-picked from commit 90d45dcf074aaf6e2f118abba81103999a17521a)
2018-10-07 03:19:09 +00:00
Severin Glöckner
28c58d0e21 remove unneded keys
[ci skip]

(cherry-picked from commit 533c7e9822b097fd8cc7502d8362d0345b29d022)
2018-10-07 03:19:08 +00:00
Iris Morelle
d7db76308e Add team colouring to some Aethermaw props missing it
[ci skip]

(cherry-picked from commit 8c97458a76b1a7303e23c2008cb069b0ffdd6724)
2018-10-07 03:19:07 +00:00
ln-zookeeper
8b4032436c ANL: Fixed scenario brokenness stemming from force_lock_settings=yes
[ci skip]

(cherry-picked from commit d0a2fde239d86d9d539846e001f96f342383ad0d)
2018-10-07 03:18:41 +00:00
Celtic Minstrel
1123c8a707 Remove some uses of set_wml_tag_metatable
(cherry-picked from commit 3939c332b908e9c9a4672688b4e0ef8095fc66ca)
2018-10-07 03:18:29 +00:00
Severin Glöckner
733f40f40f correct side names in on of the new MP maps (the last of them)
closes #2453 [ci_skip]
2018-03-12 03:54:08 +01:00
Charles Dang
471c9e876a Addressed a large chunk of the whitespace issues from #2613
[ci skip]
2018-03-09 11:37:00 +11:00
sigurdfdragon
e22330056f MP: Remove accidental inclusion of incorrect unit as leader option
[ci_skip]

Saree were never a leader option to begin with.
2018-02-28 19:11:47 -05:00
catagent101
ff6fcb803d Fix 2p - Clearing Gushes team names
On this map, side 1 starts at the bottom, while side 2 starts at the top. The naming of the teams assumed the opposite. Another check mark on issue #2453.
2018-02-10 01:58:52 +11:00
Charles Dang
fc57178aaf ANL: used Off-Map terrain instead of the massive expanse of ice
[ci skip]
2018-02-08 10:31:42 +11:00
Severin Glöckner
7bf479817e MP: refactor time schedules in Tombs_of_Kesorak
[ci skip]
2018-02-06 22:30:37 +01:00
Severin Glöckner
3eb2ccac53 MP: fix the recently added map Tombs_of_Kesorak
[ci skip]
2018-02-06 22:30:31 +01:00
Matthias Krüger
b11d3fdcbe fix a bunch of typos found by codespell in data directory.
https://github.com/lucasdemarchi/codespell
2018-02-06 23:03:06 +11:00
Severin Glöckner
4c8b3edd6d MP: 2p Silverhead Crossing - minor adjustments
- after the change to the tentacle, adjust HP to match 500 again
- let the teamname more sound like an easter egg
- apply the same lock settings as to similar scenarios

[ci skip]
2018-02-05 21:26:30 +01:00
Severin Glöckner
1ff652a1fe MP 6p Team Survival: lock teams in standard gameplay
Because there are just two, and nobody should join the AI team
When playing without default settings all kind of team combinations are possible

[ci skip]
2018-02-05 20:32:26 +01:00
Severin Glöckner
ae17a8d38e MP: add alot of xxx_lock setting
In these cases they have only in limited situations an effect:
In normal play the sides are hidden, if not using map settings they are ignored,
so this mostly only has an effect if starting the game in debug mode an using map
settings.

Other ones revert acidental changes caused by force_lock_settings.
fore_lock_settings does not only disallow the player to modify the settings,
but does also serve as default value for all the other lock settings.
2018-02-05 20:32:26 +01:00
Charles Dang
4f68df28ff ANL: added team and enemy leader names (fixes #2442)
[ci skip]

Also made side 9 hidden. Sevu/shiki's nicknames used with permission.
2018-02-05 16:44:55 +11:00
Severin Glöckner
12039f3bfc MP: added some keys to scenarios with AI sides
Namely disallow_observers and user_team_name which is displayed in debug mode

The prisoners in ANL are now allied with the player

[ci skip]
2018-02-05 00:57:28 +01:00
Severin Glöckner
9cdd0242d5 ANL: disallow observers for AI sides
[ci skip]
2018-02-05 00:05:22 +01:00
Severin Glöckner
e260fe9543 6p Team Survival: fix terrain mask
This one has been overlooked in an earlier change

(closes #2440)

[ci skip]
2018-02-04 23:02:30 +01:00
Charles Dang
36bd8dba8a Multiplayer: wmlindent run
[ci skip]
2018-02-05 04:00:09 +11:00
Charles Dang
1b79cb65f2 ANL: removed a bunch of duplicate allow_player= keys
[ci skip]
2018-02-05 04:00:08 +11:00
Severin Glöckner
02c79cf176 Dark Forecast: lock team selection
[ci skip]
2018-02-04 16:27:17 +01:00
Severin Glöckner
762ec56e06 Dark Forcast: reanable solo playmode
force_lock_settings did also force controller_lock=yes

[ci skip]
2018-02-04 02:40:21 +01:00
pentarctagon
dc21c42683 Renames the Dunefolk(formerly Khalifate) units based on forum discussions.
See this thread, along with a few linked within:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47704

The purpose of this is both to:
a) Make the unit names more descriptive, so new players especially will have an easier time learning them and knowing what they do.
b) Make them eligible for translation, like the units of other factions are.

This commit only renames the files, along with the faction/AoH faction and wmllint.
2018-02-04 11:46:50 +11:00
sigurdfdragon
e288be9302 MP: Simplify Dunefolk faction and era description
Other factions lack magic users, so mentioning here it is superfluous
information. Also associated with the previous identity of the faction.
2018-01-30 10:16:27 +11:00
pentarctagon
5b31b87f6a MP: Renames the Khalifate to Dunefolk.
Part of an effort to make the faction better fit into Wesnoth. See:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47643
https://forums.wesnoth.org/viewtopic.php?f=12&t=47703
2018-01-19 17:28:40 -05:00
ln-zookeeper
34c6fcd0fd Dark Forecast: Fix broken leader/faction/color selection, fixes #2147 2017-11-13 21:09:52 +02:00
Charles Dang
5f0bdb4c28 Made Hornshark Island Lua file an actual Lua file
[ci skip]

Also simplified the Lua contained within. No need to create a local function just to immediately invoke it.
2017-10-31 09:35:27 +11:00
Alexander van Gessel
523f61c6e7 Set a fallback color
It will be used only if there are no sides, which shouldn't happen, but can.
See issue #2063.
2017-10-04 14:24:46 +02:00
sigurdfdragon
3e9515c1d4 MP Silverhead Crossing: Fix issue #1666 2017-09-07 23:01:31 -04:00
sigurdfdragon
5c4d4896c2 MP Silverhead Crossing: Fix image not found error 2017-09-07 23:00:04 -04:00
gfgtdf
304f480813 update mainline for #1846 2017-07-26 16:43:49 +02:00
ln-zookeeper
0c92fbd10b Added force_lock_settings=yes to "A New Land" and "Dark Forecast"
Without it, it was possible to uncheck "Use Map Settings" and make choices (such as factions, teams, turn limits) which can break the scenarios.
2017-07-04 15:02:26 +03:00
Matthias Krüger
3ec26df495 multiplayer maps: descriptions: cleanup
don't include mape size in the description since map selection screen already displays map size by itself.
canonicalize "XvsY" and "X vs Y" to "X vs. Y".
work around pango_text::set_markup_helper warnings about unescaped ampersands.
2017-05-10 11:11:51 +11:00
Celtic Minstrel
8d4cf3cf62 Shorten requires where possible 2017-05-03 02:42:25 -04:00
ln-zookeeper
3f308b2f4b Used fake map border instead of void for the edges 2017-03-16 13:59:09 +02:00
ln-zookeeper
6ee43d496c Used fake map edge for the borders and thinned the cavewalls a bit
As a result, the map size has been reduced from 40x40 to 39x38.
2017-03-16 13:53:42 +02:00