Merge branch 'master' into scoped_vars

wesnoth · Feb 16, 2021 · 526c996 · 526c996
2 parents 95c565e + a2d676e
commit 526c996
Show file tree

Hide file tree

Showing 63 changed files with 1,045 additions and 234 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,11 +1,17 @@
 ## Version 1.15.9+dev
  ### Add-ons client
  ### Add-ons server
+   * Fixed undefined behavior when servicing requests to downgrade add-ons.
  ### Campaigns
+   * The Rise of Wesnoth
+     * Adjust campaign difficulty
  ### Editor
  ### Multiplayer
+   * The Delay Advancements modification has been removed in favor of adding the Plan Unit Advance modification to mainline. Enabling this modification allows each player to choose what their units will level up into in case the advancement happens on an enemy player's turn in an online multiplayer game.
+   * Unit advancement that happens on an enemy's turn in online multiplayer games are no longer randomized. Instead, the first advancement listed for the unit is always used.
  ### Lua API
    * Upgrade to Lua 5.4.2.
+   * Added the wesnoth.as_text(...) function as a way to more easily view the contents of a lua table. This is intended as a debugging aid and nothing more.
  ### Packaging
  ### Terrain
  ### Translations
@@ -15,8 +21,10 @@
    * north-facing frames for dunefolk skirmisher, loyalist bowman, and troll whelp
  ### User interface
    * Added a "disengaged" orb, shown instead of the partially-moved orb for units that can move but can't attack.
+   * Added information about the build's (not runtime) target CPU architecture to the game version info dialog and --report.
  ### WML Engine
  ### Miscellaneous and Bug Fixes
+   * Fixed display zoom not being taken into account when using the `x`, `y`, `directional_x` and `directional_y` attributes in unit animations.
 
 ## Version 1.15.9
  ### Add-ons server

diff --git a/data/campaigns/Descent_Into_Darkness/_main.cfg b/data/campaigns/Descent_Into_Darkness/_main.cfg
@@ -9,7 +9,7 @@
     rank=100
     year="389 YW"
     icon="data/campaigns/Descent_Into_Darkness/images/units/dark-mage.png~RC(magenta>red)"
-    image="data/campaigns/Descent_Into_Darkness/images/campaign_image.png"
+    background="data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_03.jpg"
     name= _ "Descent into Darkness"
     abbrev= _ "DiD"
     define=CAMPAIGN_DESCENT

diff --git a/data/campaigns/Liberty/_main.cfg b/data/campaigns/Liberty/_main.cfg
@@ -14,7 +14,7 @@
     first_scenario=01_The_Raid
     define=CAMPAIGN_LIBERTY
     icon="units/human-outlaws/fugitive.png~RC(magenta>red)"
-    image="data/campaigns/Liberty/images/campaign_image.png"
+    background="data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_intro_02.jpg"
 
     {CAMPAIGN_DIFFICULTY EASY   "units/human-peasants/peasant.png~RC(magenta>red)" ( _ "Peasant") ( _ "Easy")} {DEFAULT_DIFFICULTY}
     {CAMPAIGN_DIFFICULTY NORMAL "units/human-outlaws/outlaw.png~RC(magenta>red)" ( _ "Outlaw") ( _ "Normal")}

diff --git a/data/campaigns/Northern_Rebirth/_main.cfg b/data/campaigns/Northern_Rebirth/_main.cfg
@@ -22,7 +22,7 @@
 
 " + _"(Expert level, 13 scenarios.)"
     icon="scenery/dwarven-doors-closed.png"
-    image="data/campaigns/Northern_Rebirth/images/campaign_image.png"
+    background="data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_02-The_Fall.jpg"
 
     [about]
         title = _ "Campaign Design"

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg b/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
@@ -11,7 +11,7 @@
     end_year="1 YW"
     name= _ "The Rise of Wesnoth"
     icon="data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-lord.png"
-    image="data/campaigns/The_Rise_Of_Wesnoth/images/campaign_image.png"
+    background="data/campaigns/The_Rise_Of_Wesnoth/images/story/trow_story_04b-The_Midlands.jpg"
     abbrev= _ "TRoW"
     define=CAMPAIGN_THE_RISE_OF_WESNOTH
     first_scenario=01_A_Summer_of_Storms

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
@@ -4,7 +4,7 @@
     name= _ "A Summer of Storms"
     next_scenario=02_The_Fall
     map_file=01_A_Summer_of_Storms.map
-    {TURNS 31 28 25}
+    {TURNS 29 27 25}
     {DEFAULT_SCHEDULE}
 
     # Music for this scenario is handled in the intro and an event below
@@ -76,7 +76,7 @@
         id=Prince Haldric
         name= _ "Prince Haldric"
         profile=portraits/haldric.png
-        {GOLD 125 100 100}
+        {GOLD 140 120 100}
         unrenamable=yes
         side=1
         canrecruit=yes
@@ -97,7 +97,7 @@
         profile="portraits/lady_outlaw.png"
         side=2
         canrecruit=yes
-        {GOLD 70 120 170}
+        {GOLD 140 160 180}
         recruit=Footpad, Poacher, Thief, Thug
         team_name=wesfolk
         user_team_name=_"Wesfolk"

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
@@ -28,7 +28,7 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        gold=100
+        {GOLD 140 120 100}
         controller=human
         team_name=Haldric
         user_team_name=_"Stormvale"
@@ -54,7 +54,7 @@
             passive_leader=yes
             grouping=defensive
         [/ai]
-        {GOLD 90 130 170}
+        {GOLD 90 120 150}
         team_name=wesfolk
         user_team_name=_"Wesfolk"
         {FLAG_VARIANT6 ragged}
@@ -70,7 +70,8 @@
         side=3
         canrecruit=yes
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Goblin Spearman
-        {GOLD 180 260 350}
+        {GOLD 120 160 200}
+        {INCOME 6 9 12}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]
@@ -93,7 +94,8 @@
         side=4
         canrecruit=yes
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Goblin Spearman
-        {GOLD 160 220 310}
+        {GOLD 160 200 240}
+        {INCOME 4 6 8}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
@@ -4,7 +4,7 @@
     name= _ "A Harrowing Escape"
     map_file=03_A_Harrowing_Escape.map
     next_scenario=04a_The_Swamp_of_Esten
-    {TURNS 48 45 42}
+    {TURNS 42 39 36}
     {DEFAULT_SCHEDULE}
 
     {SCENARIO_MUSIC the_king_is_dead.ogg}
@@ -22,7 +22,7 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        gold=100
+        {GOLD 140 120 100}
         controller=human
         team_name=Haldric
         user_team_name=_"Refugees"
@@ -36,7 +36,8 @@
         profile=portraits/orcs/grunt.png
         side=2
         canrecruit=yes
-        {GOLD 80 140 200}
+        {GOLD 100 150 200}
+        {INCOME 1 2 3}
         team_name=orcs
         user_team_name=_"Orcs"
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Goblin Spearman
@@ -60,7 +61,8 @@
         profile=portraits/orcs/grunt-2.png
         side=3
         canrecruit=yes
-        {GOLD 80 140 200}
+        {GOLD 100 150 200}
+        {INCOME 1 2 3}
         team_name=orcs
         user_team_name=_"Orcs"
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Goblin Spearman
@@ -332,7 +334,7 @@ SW — The Midlands."
             [then]
                 [gold]
                     side=3
-                    amount={ON_DIFFICULTY 60 80 90}
+                    amount={ON_DIFFICULTY 70 80 90}
                 [/gold]
 
                 [message]

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_Swamp_of_Esten.cfg
@@ -35,7 +35,7 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        gold=100
+        {GOLD 160 140 120}
         controller=human
         team_name=Haldric
         user_team_name=_"Refugees"

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
@@ -4,7 +4,7 @@
     name= _ "The Midlands"
     next_scenario=05_The_Oldwood
     map_file=04b_The_Midlands.map
-    {TURNS 45 42 39}
+    {TURNS 36 33 30}
     {DEFAULT_SCHEDULE}
 
     {SCENARIO_MUSIC wanderer.ogg}
@@ -35,15 +35,15 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        gold=100
+        {GOLD 160 140 120}
         controller=human
         team_name=Haldric
         user_team_name=_"Refugees"
         {FLAG_VARIANT loyalist}
     [/side]
 
     [side]
-        type=Orcish Warlord
+        type=Orcish Warrior
         id=Tan-Vrodis
         name= _ "Tan-Vrodis"
         #This is the nearest enemy, make him softer.
@@ -54,7 +54,7 @@
             {NO_SCOUTS}
             recruitment_pattern=scout,fighter,fighter,mixed fighter,archer
         [/ai]
-        {GOLD 70 110 160}
+        {GOLD 80 100 120}
         user_team_name=_"Orcs"
         team_name=orcs
     [/side]
@@ -66,7 +66,8 @@
         profile="portraits/orcs/grunt-3.png"
         side=3
         canrecruit=yes
-        {GOLD 110 150 190}
+        {GOLD 100 140 180}
+        {INCOME 1 2 3}
         [ai]
             {NO_SCOUTS}
             recruitment_pattern=scout,fighter,fighter,mixed fighter,archer
@@ -99,7 +100,8 @@
         profile="portraits/orcs/grunt-2.png"
         side=4
         canrecruit=yes
-        {GOLD 110 150 190}
+        {GOLD 100 140 180}
+        {INCOME 1 2 3}
         [ai]
             {NO_SCOUTS}
             recruitment_pattern=scout,fighter,fighter,mixed fighter,archer
@@ -321,7 +323,7 @@
 
         [gold]
             side=4
-            amount=80
+            amount={ON_DIFFICULTY 60 70 80}
         [/gold]
     [/event]
 
@@ -338,7 +340,7 @@
 
         [gold]
             side=3
-            amount=80
+            amount={ON_DIFFICULTY 60 70 80}
         [/gold]
     [/event]
 

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
@@ -22,7 +22,7 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        gold=100
+        {GOLD 160 140 120}
         controller=human
         team_name=Haldric
         user_team_name=_"Refugees"
@@ -100,8 +100,8 @@
         profile="portraits/rithrandil.png"
         canrecruit=yes
         recruit=Wose Sapling
-        {GOLD 160 100 60}
-        {INCOME 10 5 3}
+        {GOLD 160 130 100}
+        {INCOME 7 5 3}
         team_name=Haldric
         user_team_name=_"Refugees"
     [/side]

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_in_the_Deep.cfg
@@ -29,7 +29,7 @@
         name= _ "Prince Haldric"
         unrenamable=yes
         canrecruit=yes
-        gold=100
+        {GOLD 160 140 120}
         controller=human
         shroud=yes
         team_name=Haldric
@@ -44,7 +44,7 @@
         name= _ "Lich-Lord Lenvan"
         canrecruit=yes
         recruit=Revenant,Deathblade,Bone Shooter,Skeleton,Skeleton Archer
-        {GOLD 160 280 400}
+        {GOLD 240 300 360}
         {INCOME 6 10 14}
         team_name=undead
         user_team_name=_"Undead"

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
@@ -25,7 +25,7 @@
         name= _ "Prince Haldric"
         unrenamable=yes
         canrecruit=yes
-        gold=200
+        {GOLD 220 200 180}
         controller=human
         team_name=Haldric
         user_team_name=_"Humans"
@@ -40,7 +40,7 @@
         profile="portraits/aethyr-first.png"
         canrecruit=yes
         recruit=Peasant, Bowman, Horseman, Mage, Spearman
-        {GOLD 220 160 120}
+        {GOLD 220 180 140}
         [ai]
             aggression=-0.5
             {NO_SCOUTS}
@@ -78,7 +78,7 @@
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Orcish Warrior, Goblin Knight, Goblin Pillager, Orcish Slayer, Goblin Spearman, Goblin Impaler
 #endif
 
-        {GOLD 190 230 290}
+        {GOLD 190 230 270}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]
@@ -91,7 +91,7 @@
             caution=0.0
             grouping=no
         [/ai]
-        {INCOME 4 8 12}
+        {INCOME 5 7 9}
     [/side]
 
     [side]
@@ -112,7 +112,7 @@
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Orcish Warrior, Goblin Knight, Goblin Pillager, Orcish Slayer, Goblin Spearman, Goblin Impaler
 #endif
 
-        {GOLD 190 230 290}
+        {GOLD 190 230 270}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]
@@ -125,7 +125,7 @@
             caution=0.0
             grouping=no
         [/ai]
-        {INCOME 4 8 12}
+        {INCOME 5 7 9}
     [/side]
 
     [side]
@@ -148,7 +148,7 @@
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Orcish Warrior, Goblin Knight, Goblin Pillager, Orcish Slayer, Goblin Spearman, Goblin Impaler
 #endif
 
-        {GOLD 260 300 360}
+        {GOLD 240 300 360}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]
@@ -161,7 +161,7 @@
             caution=0.0
             grouping=no
         [/ai]
-        {INCOME 5 10 15}
+        {INCOME 8 12 16}
     [/side]
 
     [event]

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
@@ -5,7 +5,7 @@
     next_scenario=10_Sewer_of_Southbay
     victory_when_enemies_defeated=no
     map_file=09_Fallen_Lich_Point.map
-    {TURNS 39 36 33}
+    {TURNS 36 33 30}
     {DEFAULT_SCHEDULE}
 
     {SCENARIO_MUSIC breaking_the_chains.ogg}
@@ -23,7 +23,7 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        gold=200
+        {GOLD 220 200 180}
         controller=human
         team_name=Haldric
         user_team_name=_"Refugees"
@@ -114,7 +114,7 @@
         name= _ "Lich-Lord Caror"
         canrecruit=yes
         recruit=Skeleton, Skeleton Archer, Ghost, Ghoul, Walking Corpse
-        {GOLD 0 150 190}
+        {GOLD 100 130 160}
         team_name=undead
         user_team_name=_"Undead"
         scroll_to_leader=no