Automated server sync

widelands · Aug 3, 2024 · 4cf4795 · 4cf4795
1 parent 6418790
commit 4cf4795
Show file tree

Hide file tree

Showing 135 changed files with 19,209 additions and 17,971 deletions.
diff --git a/addons/europeans_agricultur.wad/addon b/addons/europeans_agricultur.wad/addon
@@ -2,7 +2,7 @@
 name=_"Europeans tribe (Agricultur Addon)"
 description=_"Adds some additional agricultur wares, workers and buildings to Europeans tribes economy for more complexity. Not recommended for sea travel, because the terraformer converts ocean segments to land and can therefore lock up ships and ports, which can cause the game to crash."
 author="MarkMcWire"
-version="1.7.0"
+version="1.7.1"
 category="tribes"
 requires="europeans_base.wad"
 sync_safe="true"
diff --git a/addons/europeans_agricultur.wad/productionsites_craft/manufactory_advanced/init.lua b/addons/europeans_agricultur.wad/productionsites_craft/manufactory_advanced/init.lua
diff --git a/addons/europeans_agricultur.wad/productionsites_craft/manufactory_normal/init.lua b/addons/europeans_agricultur.wad/productionsites_craft/manufactory_normal/init.lua
@@ -50,7 +50,7 @@ wl.Descriptions():new_productionsite_type {
     },
 
     inputs = {
-        { name = "log", amount = 16 },
+        { name = "blackwood", amount = 16 },
         { name = "reed", amount = 12 },
         { name = "cotton", amount = 12 },
         { name = "wool", amount = 12 },
@@ -65,16 +65,16 @@ wl.Descriptions():new_productionsite_type {
             actions = {
                 "call=processing_metal_alloy",
                 "call=processing_reed_cotton_wool",
-                "call=processing_log",
+                "call=processing_blackwood",
                 "call=processing_metal_alloy",
                 "call=processing_reed_cotton_wool",
-                "call=processing_log",
+                "call=processing_blackwood",
                 "return=skipped"
             }
         },
-        processing_log = {
-            -- TRANSLATORS: Completed/Skipped/Did not start processing log for input wares because ...
-            descname = pgettext("europeans_building", "processing log to create tools and weapons"),
+        processing_blackwood = {
+            -- TRANSLATORS: Completed/Skipped/Did not start processing blackwood for input wares because ...
+            descname = pgettext("europeans_building", "processing blackwood to create tools and weapons"),
             actions = {
                 "call=producing_armor_wooden",
                 "call=producing_boots_wooden",
@@ -98,13 +98,13 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start making a wooden armor because ...
             descname = pgettext("europeans_building", "making a wooden armor"),
             actions = {
-                "return=skipped when economy needs log and not economy needs armor_wooden",
+                "return=skipped when economy needs blackwood and not economy needs armor_wooden",
                 "return=skipped when economy needs blackwood and not economy needs armor_wooden",
                 "return=skipped when economy needs planks and not economy needs armor_wooden",
                 "return=skipped when economy needs boots_wooden and not economy needs armor_wooden",
                 "return=skipped when economy needs helmet_wooden and not economy needs armor_wooden",
                 "return=skipped when economy needs spear_wooden and not economy needs armor_wooden",
-                "consume=log",
+                "consume=blackwood",
                 "playsound=sound/atlanteans/saw/benchsaw priority:50% allow_multiple",
                 "animate=working duration:5m",
                 "playsound=sound/smiths/sharpening priority:90%",
@@ -115,13 +115,13 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start making a wooden boots because ...
             descname = pgettext("europeans_building", "making a pair of wooden boots"),
             actions = {
-                "return=skipped when economy needs log and not economy needs boots_wooden",
+                "return=skipped when economy needs blackwood and not economy needs boots_wooden",
                 "return=skipped when economy needs blackwood and not economy needs boots_wooden",
                 "return=skipped when economy needs planks and not economy needs boots_wooden",
                 "return=skipped when economy needs armor_wooden and not economy needs boots_wooden",
                 "return=skipped when economy needs helmet_wooden and not economy needs boots_wooden",
                 "return=skipped when economy needs spear_wooden and not economy needs boots_wooden",
-                "consume=log",
+                "consume=blackwood",
                 "playsound=sound/atlanteans/saw/benchsaw priority:50% allow_multiple",
                 "animate=working duration:5m",
                 "playsound=sound/smiths/sharpening priority:90%",
@@ -132,13 +132,13 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start making a wooden helmet because ...
             descname = pgettext("europeans_building", "making a wooden helmet"),
             actions = {
-                "return=skipped when economy needs log and not economy needs helmet_wooden",
+                "return=skipped when economy needs blackwood and not economy needs helmet_wooden",
                 "return=skipped when economy needs blackwood and not economy needs helmet_wooden",
                 "return=skipped when economy needs planks and not economy needs helmet_wooden",
                 "return=skipped when economy needs armor_wooden and not economy needs helmet_wooden",
                 "return=skipped when economy needs boots_wooden and not economy needs helmet_wooden",
                 "return=skipped when economy needs spear_wooden and not economy needs helmet_wooden",
-                "consume=log",
+                "consume=blackwood",
                 "playsound=sound/atlanteans/saw/benchsaw priority:50% allow_multiple",
                 "animate=working duration:5m",
                 "playsound=sound/smiths/sharpening priority:90%",
@@ -149,13 +149,13 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start forging a wooden spear because ...
             descname = pgettext("europeans_building", "forging a wooden spear"),
             actions = {
-                "return=skipped when economy needs log and not economy needs spear_wooden",
+                "return=skipped when economy needs blackwood and not economy needs spear_wooden",
                 "return=skipped when economy needs blackwood and not economy needs spear_wooden",
                 "return=skipped when economy needs planks and not economy needs spear_wooden",
                 "return=skipped when economy needs armor_wooden and not economy needs spear_wooden",
                 "return=skipped when economy needs boots_wooden and not economy needs spear_wooden",
                 "return=skipped when economy needs helmet_wooden and not economy needs spear_wooden",
-                "consume=log",
+                "consume=blackwood",
                 "playsound=sound/atlanteans/saw/benchsaw priority:50% allow_multiple",
                 "animate=working duration:5m",
                 "playsound=sound/smiths/sharpening priority:90%",
@@ -216,14 +216,14 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start making study boots because ...
             descname = pgettext("europeans_building", "making study boots"),
             actions = {
-                "return=skipped when economy needs log and not economy needs boots_sturdy",
+                "return=skipped when economy needs blackwood and not economy needs boots_sturdy",
                 "return=skipped when economy needs cotton and not economy needs boots_sturdy",
                 "return=skipped when economy needs cloth and not economy needs boots_sturdy",
                 "return=skipped when economy needs armor and not economy needs boots_sturdy",
                 "return=skipped when economy needs armor_processed and not economy needs boots_sturdy",
                 "return=skipped when economy needs armor_compressed and not economy needs boots_sturdy",
                 "return=skipped when economy needs boots_swift and not economy needs boots_sturdy",
-                "consume=log cotton,wool:2",
+                "consume=blackwood cotton,wool:2",
                 "playsound=sound/mill/weaving priority:90%",
                 "animate=working duration:5m",
                 "produce=boots_sturdy:2"
@@ -233,14 +233,14 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start making swift boots because ...
             descname = pgettext("europeans_building", "making swift boots"),
             actions = {
-                "return=skipped when economy needs log and not economy needs boots_swift",
+                "return=skipped when economy needs blackwood and not economy needs boots_swift",
                 "return=skipped when economy needs cotton and not economy needs boots_swift",
                 "return=skipped when economy needs cloth and not economy needs boots_swift",
                 "return=skipped when economy needs armor and not economy needs boots_swift",
                 "return=skipped when economy needs armor_processed and not economy needs boots_swift",
                 "return=skipped when economy needs armor_compressed and not economy needs boots_swift",
                 "return=skipped when economy needs boots_sturdy and not economy needs boots_swift",
-                "consume=log cotton,wool:2",
+                "consume=blackwood cotton,wool:2",
                 "playsound=sound/mill/weaving priority:90%",
                 "animate=working duration:5m",
                 "produce=boots_swift:2"
@@ -269,7 +269,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making baskets"),
             actions = {
                 "return=skipped unless economy needs basket",
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=basket:2"
@@ -280,7 +280,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making buckets"),
             actions = {
                 "return=skipped unless economy needs buckets", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=buckets:2"
@@ -291,7 +291,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making felling axes"),
             actions = {
                 "return=skipped unless economy needs felling_ax", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=felling_ax:2"
@@ -302,7 +302,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making hammers"),
             actions = {
                 "return=skipped unless economy needs hammer", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=hammer:2"
@@ -313,7 +313,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making picks"),
             actions = {
                 "return=skipped unless economy needs pick", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=pick:2"
@@ -324,7 +324,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making saws"),
             actions = {
                 "return=skipped unless economy needs saw", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=saw:2"
@@ -335,7 +335,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making sycthes"),
             actions = {
                 "return=skipped unless economy needs scythe", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=scythe:2"
@@ -346,7 +346,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "making shovels"),
             actions = {
                 "return=skipped unless economy needs shovel", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/toolsmith priority:50% allow_multiple",
                 "animate=working duration:3m",
                 "produce=shovel:2"
@@ -379,7 +379,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "forging an advanced spear"),
             actions = {
                 "return=skipped unless economy needs spear_advanced", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/smith priority:50% allow_multiple",
                 "animate=working duration:5m",
                 "playsound=sound/smiths/sharpening priority:90%",
@@ -391,7 +391,7 @@ wl.Descriptions():new_productionsite_type {
             descname = pgettext("europeans_building", "forging a broad ax"),
             actions = {
                 "return=skipped unless economy needs ax_broad", 
-                "consume=log coal metal_alloy",
+                "consume=blackwood coal metal_alloy",
                 "playsound=sound/smiths/smith priority:50% allow_multiple",
                 "animate=working duration:5m",
                 "playsound=sound/smiths/sharpening priority:90%",

diff --git a/addons/europeans_agricultur.wad/tribes/initialization/units.lua b/addons/europeans_agricultur.wad/tribes/initialization/units.lua
@@ -555,7 +555,7 @@ wl.Descriptions():new_tribe {
             -- Tools
             {
                 name = "buckets",
-                default_target_quantity = 4,
+                default_target_quantity = 16,
                 preciousness = 1,
                 helptexts = {
                     purpose = {
@@ -568,7 +568,7 @@ wl.Descriptions():new_tribe {
             },
             {
                 name = "basket",
-                default_target_quantity = 4,
+                default_target_quantity = 16,
                 preciousness = 1,
                  helptexts = {
                     purpose = {
@@ -581,7 +581,7 @@ wl.Descriptions():new_tribe {
             },
             {
                 name = "scythe",
-                default_target_quantity = 4,
+                default_target_quantity = 8,
                 preciousness = 1,
                 helptexts = {
                     purpose = {
@@ -594,7 +594,7 @@ wl.Descriptions():new_tribe {
             },
             {
                 name = "felling_ax",
-                default_target_quantity = 4,
+                default_target_quantity = 8,
                 preciousness = 1,
                 helptexts = {
                     purpose = {
@@ -607,7 +607,7 @@ wl.Descriptions():new_tribe {
             },
             {
                 name = "shovel",
-                default_target_quantity = 4,
+                default_target_quantity = 8,
                 preciousness = 1,
                 helptexts = {
                     purpose = {
@@ -620,7 +620,7 @@ wl.Descriptions():new_tribe {
             },
             {
                 name = "pick",
-                default_target_quantity = 2,
+                default_target_quantity = 8,
                 preciousness = 1,
                 helptexts = {
                     purpose = {
@@ -633,7 +633,7 @@ wl.Descriptions():new_tribe {
             },
             {
                 name = "hammer",
-                default_target_quantity = 2,
+                default_target_quantity = 8,
                 preciousness = 1,
                 helptexts = {
                     purpose = {
@@ -646,7 +646,7 @@ wl.Descriptions():new_tribe {
             },
             {
                 name = "saw",
-                default_target_quantity = 2,
+                default_target_quantity = 8,
                 preciousness = 1,
                 helptexts = {
                     purpose = {
@@ -1989,6 +1989,13 @@ wl.Descriptions():new_tribe {
                 purpose = pgettext("europeans_building", "Serves as a base for overseas colonization and trade. Also stores your soldiers, wares and tools.")
             }
         },
+        {
+            name = "europeans_port_big",
+            helptexts = {
+                -- TRANSLATORS: Purpose helptext for an Europeans warehouse: Port
+                purpose = pgettext("europeans_building", "Serves as a base for overseas colonization and trade. Also stores your soldiers, wares and tools.")
+            }
+        },
 
         -- Small
         {

diff --git a/addons/europeans_agricultur.wad/tribes/scripting/starting_conditions.lua b/addons/europeans_agricultur.wad/tribes/scripting/starting_conditions.lua
@@ -320,6 +320,24 @@ function forbid_advanced_productionsites(player)
     end
 end
 
+function allow_terraformer(player)
+    local game = wl.Game()
+    local tribe = player.tribe
+
+    if tribe.name == "europeans" then
+        player:allow_buildings{"europeans_terraformers_house_basic", "europeans_terraformers_house_normal", "europeans_terraformers_house_advanced"}
+    end
+end
+
+function forbid_terraformer(player)
+    local game = wl.Game()
+    local tribe = player.tribe
+
+    if tribe.name == "europeans" then
+        player:forbid_buildings{"europeans_terraformers_house_basic", "europeans_terraformers_house_normal", "europeans_terraformers_house_advanced"}
+    end
+end
+
 function allow_warehouses(player)
     local game = wl.Game()
     local map = wl.Game().map
@@ -384,24 +402,6 @@ function forbid_barracks(player)
     end
 end
 
-function allow_terraformer(player)
-    local game = wl.Game()
-    local tribe = player.tribe
-
-    if tribe.name == "europeans" then
-        player:allow_buildings{"europeans_terraformers_house_basic", "europeans_terraformers_house_normal", "europeans_terraformers_house_advanced"}
-    end
-end
-
-function forbid_terraformer(player)
-    local game = wl.Game()
-    local tribe = player.tribe
-
-    if tribe.name == "europeans" then
-        player:forbid_buildings{"europeans_terraformers_house_basic", "europeans_terraformers_house_normal", "europeans_terraformers_house_advanced"}
-    end
-end
-
 function allow_scout(player)
     local game = wl.Game()
     local tribe = player.tribe
@@ -644,6 +644,7 @@ function doing_ai_stuff(player, increment)
     end
     if (increment == 16) then
         allow_normal_productionsites(player)
+        allow_terraformer(player)
         player:allow_buildings{"europeans_trainingscamp_normal", "europeans_battlearena_level_1", }
     end
     if (increment == 32) then

diff --git a/addons/europeans_base.wad/addon b/addons/europeans_base.wad/addon
@@ -2,7 +2,7 @@
 name=_"Europeans Tribe (Base Addon)"
 description=_"Contains basic object definitions and graphics for the Europeans and their other addons. It uses buildings, workers and some wares from other tribes, until own graphics are available. It must be in front of the main addon in the list and must be activated for the other addons to work!"
 author="MarkMcWire"
-version="1.7.0"
+version="1.7.1"
 category="tribes"
 requires=
 sync_safe="true"
diff --git a/addons/europeans_base.wad/militarysites/headquarters/init.lua b/addons/europeans_base.wad/militarysites/headquarters/init.lua
@@ -19,7 +19,7 @@ wl.Descriptions():new_warehouse_type {
     },
 
     size = "big",
-    destructible = true,
+    destructible = false,
 
     buildcost = {
         blackwood = 4,
@@ -49,7 +49,7 @@ wl.Descriptions():new_warehouse_type {
     vision_range = 24,
     heal_per_second = 320,
     conquers = 20,
-    max_garrison = 32,
+    max_garrison = 48,
 }
 
 pop_textdomain()