Automated server sync

- Updated europeans_military_extension.wad from 2.1.9 to 2.2.0 - Updated europeans_tribe.wad from 2.1.9 to 2.2.0 - Updated translations for europeans_tribe.wad
widelands · Jan 26, 2025 · 010862d · 010862d
1 parent a46d392
commit 010862d
Show file tree

Hide file tree

Showing 116 changed files with 13,627 additions and 13,244 deletions.
diff --git a/addons/europeans_military_extension.wad/9_militarysites/barrier_basic/init.lua b/addons/europeans_military_extension.wad/9_militarysites/barrier_basic/init.lua
@@ -60,8 +60,9 @@ wl.Descriptions():new_militarysite_type {
     },
 
     aihints = {
-        expansion = true,
-        fighting = true
+        expansion = false,
+        fighting = true,
+        mountain_conqueror = false
     },
 
     max_soldiers = 4,

diff --git a/addons/europeans_military_extension.wad/9_militarysites/castle_basic/init.lua b/addons/europeans_military_extension.wad/9_militarysites/castle_basic/init.lua
@@ -59,7 +59,9 @@ wl.Descriptions():new_militarysite_type {
     },
 
     aihints = {
-        fighting = true
+        expansion = true,
+        fighting = true,
+        mountain_conqueror = true
     },
 
     max_soldiers = 8,

diff --git a/addons/europeans_military_extension.wad/9_militarysites/sentry_basic/init.lua b/addons/europeans_military_extension.wad/9_militarysites/sentry_basic/init.lua
@@ -61,7 +61,8 @@ wl.Descriptions():new_militarysite_type {
 
     aihints = {
         expansion = true,
-        mountain_conqueror = true
+        fighting = false,
+        mountain_conqueror = false
     },
 
     max_soldiers = 2,

diff --git a/addons/europeans_military_extension.wad/9_militarysites/tower_basic/init.lua b/addons/europeans_military_extension.wad/9_militarysites/tower_basic/init.lua
@@ -61,6 +61,7 @@ wl.Descriptions():new_militarysite_type {
 
     aihints = {
         expansion = true,
+        fighting = false,
         mountain_conqueror = true
     },
 

diff --git a/addons/europeans_military_extension.wad/addon b/addons/europeans_military_extension.wad/addon
@@ -2,7 +2,7 @@
 name=_"Europeans Tribe (Military Extension)"
 description=_"Adds additional buildings and trainingsites to the base definitions. This makes all military buildings expandable and the europeans soldiers as heroes slightly stronger."
 author="MarkMcWire"
-version="2.1.9"
+version="2.2.0"
 category="tribes"
 requires="europeans_tribe.wad"
 sync_safe="true"
diff --git a/addons/europeans_military_extension.wad/tribes/initialization/units.lua b/addons/europeans_military_extension.wad/tribes/initialization/units.lua
@@ -35,25 +35,25 @@ wl.Descriptions():new_tribe {
         { ware = "quartz", points = 1 },
         { ware = "diamond", points = 1 },
         { ware = "gold", points = 2 },
-        { ware = "coin_copper", points = 4 },
-        { ware = "coin_silver", points = 6 },
-        { ware = "coin_gold", points = 8 },
-        { ware = "armor_wooden", points = 2 },
-        { ware = "boots_wooden", points = 2 },
-        { ware = "spear_wooden", points = 2 },
-        { ware = "helmet_wooden", points = 2 },
-        { ware = "armor_processed", points = 4 },
-        { ware = "boots_sturdy", points = 4 },
-        { ware = "spear_advanced", points = 4 },
-        { ware = "helmet_mask", points = 4 },
-        { ware = "armor_compressed", points = 6 },
-        { ware = "boots_swift", points = 6 },
-        { ware = "ax_broad", points = 6 },
-        { ware = "shield_steel", points = 6 },
-        { ware = "armor_advanced", points = 8 },
-        { ware = "boots_advanced", points = 8 },
-        { ware = "sword_broad", points = 8 },
-        { ware = "shield_advanced", points = 8 },
+        { ware = "coin_copper", points = 3 },
+        { ware = "coin_silver", points = 4 },
+        { ware = "coin_gold", points = 6 },
+        { ware = "armor_wooden", points = 1 },
+        { ware = "boots_wooden", points = 1 },
+        { ware = "spear_wooden", points = 1 },
+        { ware = "helmet_wooden", points = 1 },
+        { ware = "armor_processed", points = 2 },
+        { ware = "boots_sturdy", points = 2 },
+        { ware = "spear_advanced", points = 2 },
+        { ware = "helmet_mask", points = 2 },
+        { ware = "armor_compressed", points = 3 },
+        { ware = "boots_swift", points = 3 },
+        { ware = "ax_broad", points = 3 },
+        { ware = "shield_steel", points = 3 },
+        { ware = "armor_advanced", points = 4 },
+        { ware = "boots_advanced", points = 4 },
+        { ware = "sword_broad", points = 4 },
+        { ware = "shield_advanced", points = 4 },
     },
 
     -- Image file paths for this tribe's road and waterway textures
@@ -2806,6 +2806,15 @@ wl.Descriptions():new_tribe {
                 note = pgettext("europeans_building", "If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.")
             }
         },
+        {
+            name = "europeans_sentry_mountain",
+            helptexts = {
+                -- TRANSLATORS: Purpose helptext for an Europeans military site: Sentry
+                purpose = pgettext("europeans_building", "Garrisons soldiers to expand your territory."),
+                -- TRANSLATORS: Note helptext for an Europeans military site: Blockhouse
+                note = pgettext("europeans_building", "Modified version which can placed on mountains.")
+            }
+        },
         {
             name = "europeans_barrier_basic",
             helptexts = {

diff --git a/addons/europeans_military_extension.wad/tribes/scripting/starting_conditions.lua b/addons/europeans_military_extension.wad/tribes/scripting/starting_conditions.lua
@@ -416,7 +416,7 @@ end
 
 function allow_all_militarysites(player)
     if player.tribe.name == "europeans" then
-        player:allow_buildings{"europeans_sentry_basic", "europeans_barrier_basic", "europeans_tower_basic", "europeans_castle_basic",}
+        player:allow_buildings{"europeans_sentry_basic", "europeans_sentry_mountain", "europeans_barrier_basic", "europeans_tower_basic", "europeans_castle_basic",}
         player:allow_buildings{"europeans_sentry_level_1", "europeans_barrier_level_1", "europeans_tower_level_1", "europeans_castle_level_1",}
         player:allow_buildings{"europeans_sentry_level_2", "europeans_barrier_level_2", "europeans_tower_level_2", "europeans_castle_level_2",}
         player:allow_buildings{"europeans_sentry_level_3", "europeans_barrier_level_3", "europeans_tower_level_3", "europeans_castle_level_3",}
@@ -425,7 +425,7 @@ end
 
 function forbid_all_militarysites(player)
     if player.tribe.name == "europeans" then
-        player:forbid_buildings{"europeans_sentry_basic", "europeans_barrier_basic", "europeans_tower_basic", "europeans_castle_basic",}
+        player:forbid_buildings{"europeans_sentry_basic", "europeans_sentry_mountain", "europeans_barrier_basic", "europeans_tower_basic", "europeans_castle_basic",}
         player:forbid_buildings{"europeans_sentry_level_1", "europeans_barrier_level_1", "europeans_tower_level_1", "europeans_castle_level_1",}
         player:forbid_buildings{"europeans_sentry_level_2", "europeans_barrier_level_2", "europeans_tower_level_2", "europeans_castle_level_2",}
         player:forbid_buildings{"europeans_sentry_level_3", "europeans_barrier_level_3", "europeans_tower_level_3", "europeans_castle_level_3",}

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_basic/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_basic/init.lua
@@ -36,15 +36,16 @@ wl.Descriptions():new_productionsite_type {
     enhancement = {
         name = "europeans_coalmine_level_1",
         enhancement_cost = {
-            log = 4
+            planks = 4
         },
         enhancement_return_on_dismantle = {
             scrap_wood = 2,
             granite = 1
         }
     },
     buildcost = {
-        log = 6
+        log = 6,
+        reed = 6
     },
     return_on_dismantle = {
         scrap_wood = 4,

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_level_1/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_level_1/init.lua
@@ -36,7 +36,7 @@ wl.Descriptions():new_productionsite_type {
     enhancement = {
         name = "europeans_coalmine_level_2",
         enhancement_cost = {
-            log = 4
+            planks = 4
         },
         enhancement_return_on_dismantle = {
             scrap_wood = 2,
@@ -51,27 +51,27 @@ wl.Descriptions():new_productionsite_type {
     },
 
     inputs = {
-        { name = "log", amount = 6 }
+        { name = "blackwood", amount = 6 }
     },
 
     programs = {
         main = {
             -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
             descname = pgettext("europeans_building", "mining"),
             actions = {
-                "return=skipped when economy needs log and not economy needs granite and not economy needs diamond and not economy needs coal",
-                "return=skipped unless site has log:3",
-                "consume=log",
+                "return=skipped when economy needs blackwood and not economy needs granite and not economy needs diamond and not economy needs coal",
+                "return=skipped unless site has blackwood:3",
+                "consume=blackwood",
                 "call=mine_stone",
                 "call=mine_coal",
                 "call=mine_coal",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_stone",
                 "call=mine_coal",
                 "call=mine_coal",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_stone",
                 "call=mine_coal",
                 "call=mine_diamond",
@@ -105,7 +105,7 @@ wl.Descriptions():new_productionsite_type {
             -- just a dummy program to fix encyclopedia
             descname = "encyclopedia",
             actions = {
-                "consume=log:3",
+                "consume=blackwood:3",
                 "produce=coal:5 granite:3 diamond",
             }
         },

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_level_2/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_level_2/init.lua
@@ -52,29 +52,29 @@ wl.Descriptions():new_productionsite_type {
     },
 
     inputs = {
-        { name = "log", amount = 8 }
+        { name = "blackwood", amount = 6 }
     },
 
     programs = {
         main = {
             -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
             descname = pgettext("europeans_building", "mining"),
             actions = {
-                "return=skipped when economy needs log and not economy needs granite and not economy needs diamond and not economy needs coal",
-                "return=skipped unless site has log:4",
-                "consume=log:2",
+                "return=skipped when economy needs blackwood and not economy needs granite and not economy needs diamond and not economy needs coal",
+                "return=skipped unless site has blackwood:3",
+                "consume=blackwood",
                 "call=mine_stone",
                 "call=mine_coal",
                 "call=mine_coal",
                 "call=mine_coal",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_stone",
                 "call=mine_coal",
                 "call=mine_coal",
                 "call=mine_coal",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_stone",
                 "call=mine_coal",
                 "call=mine_coal",
@@ -109,7 +109,7 @@ wl.Descriptions():new_productionsite_type {
             -- just a dummy program to fix encyclopedia
             descname = "encyclopedia",
             actions = {
-                "consume=log:4",
+                "consume=blackwood:3",
                 "produce=coal:8 granite:6 diamond",
             }
         },

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_level_3/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/coalmine_level_3/init.lua
@@ -51,7 +51,7 @@ wl.Descriptions():new_productionsite_type {
     },
 
     inputs = {
-        { name = "blackwood", amount = 6 }
+        { name = "blackwood", amount = 8 }
     },
 
     programs = {

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_basic/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_basic/init.lua
@@ -36,7 +36,7 @@ wl.Descriptions():new_productionsite_type {
     enhancement = {
         name = "europeans_goldmine_level_1",
         enhancement_cost = {
-            log = 4
+            planks = 4
         },
         enhancement_return_on_dismantle = {
             scrap_wood = 2,
@@ -45,7 +45,8 @@ wl.Descriptions():new_productionsite_type {
         }
     },
     buildcost = {
-        log = 6
+        log = 6,
+        reed = 6
     },
     return_on_dismantle = {
         scrap_wood = 4,

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_level_1/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_level_1/init.lua
@@ -36,7 +36,7 @@ wl.Descriptions():new_productionsite_type {
     enhancement = {
         name = "europeans_goldmine_level_2",
         enhancement_cost = {
-            log = 4
+            planks = 4
         },
         enhancement_return_on_dismantle = {
             scrap_wood = 2,
@@ -52,27 +52,27 @@ wl.Descriptions():new_productionsite_type {
     },
 
     inputs = {
-        { name = "log", amount = 6 }
+        { name = "blackwood", amount = 6 }
     },
 
     programs = {
         main = {
             -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
             descname = pgettext("europeans_building", "mining"),
             actions = {
-                "return=skipped when economy needs log and not economy needs granite and not economy needs marble and not economy needs quartz and not economy needs ore",
-                "return=skipped unless site has log:3",
-                "consume=log",
+                "return=skipped when economy needs blackwood and not economy needs granite and not economy needs marble and not economy needs quartz and not economy needs ore",
+                "return=skipped unless site has blackwood:3",
+                "consume=blackwood",
                 "call=mine_granite",
                 "call=mine_marble",
                 "call=mine_ore",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_granite",
                 "call=mine_marble",
                 "call=mine_quartz",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_granite",
                 "call=mine_marble",
                 "call=mine_ore",
@@ -114,7 +114,7 @@ wl.Descriptions():new_productionsite_type {
             -- just a dummy program to fix encyclopedia
             descname = "encyclopedia",
             actions = {
-                "consume=log:3",
+                "consume=blackwood:3",
                 "produce=granite:3 marble:3 quartz ore:2",
             }
         },

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_level_2/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_level_2/init.lua
@@ -53,27 +53,27 @@ wl.Descriptions():new_productionsite_type {
     },
 
     inputs = {
-        { name = "log", amount = 8 }
+        { name = "blackwood", amount = 6 }
     },
 
     programs = {
         main = {
             -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
             descname = pgettext("europeans_building", "mining"),
             actions = {
-                "return=skipped when economy needs log and not economy needs granite and not economy needs marble and not economy needs quartz and not economy needs ore",
-                "return=skipped unless site has log:3",
-                "consume=log",
+                "return=skipped when economy needs blackwood and not economy needs granite and not economy needs marble and not economy needs quartz and not economy needs ore",
+                "return=skipped unless site has blackwood:3",
+                "consume=blackwood",
                 "call=mine_granite",
                 "call=mine_marble",
                 "call=mine_ore",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_granite",
                 "call=mine_marble",
                 "call=mine_quartz",
                 "sleep=duration:5s",
-                "consume=log",
+                "consume=blackwood",
                 "call=mine_granite",
                 "call=mine_marble",
                 "call=mine_ore",
@@ -115,7 +115,7 @@ wl.Descriptions():new_productionsite_type {
             -- just a dummy program to fix encyclopedia
             descname = "encyclopedia",
             actions = {
-                "consume=log:4",
+                "consume=blackwood:3",
                 "produce=granite:3 marble:3 quartz ore:2",
             }
         },

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_level_3/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/goldmine_level_3/init.lua
@@ -52,7 +52,7 @@ wl.Descriptions():new_productionsite_type {
     },
 
     inputs = {
-        { name = "blackwood", amount = 6 }
+        { name = "blackwood", amount = 8 }
     },
 
     programs = {

diff --git a/addons/europeans_tribe.wad/4_productionsites_mining_general/ironmine_basic/init.lua b/addons/europeans_tribe.wad/4_productionsites_mining_general/ironmine_basic/init.lua
@@ -36,7 +36,7 @@ wl.Descriptions():new_productionsite_type {
     enhancement = {
         name = "europeans_ironmine_level_1",
         enhancement_cost = {
-            log = 4
+            planks = 4
         },
         enhancement_return_on_dismantle = {
             scrap_wood = 2,
@@ -45,7 +45,8 @@ wl.Descriptions():new_productionsite_type {
         }
     },
     buildcost = {
-        log = 6
+        log = 6,
+        reed = 6
     },
     return_on_dismantle = {
         scrap_wood = 4,