Automated server sync

addons/europeans_agricultur.wad/addon

@@ -2,7 +2,7 @@
 name=_"Europeans tribe (Agricultur Addon)"
 description=_"Adds additional agricultur wares, workers and buildings to Europeans tribes economy for more complexity."
 author="MarkMcWire"
-version="1.9.2.2"
+version="1.9.3"
 category="tribes"
 requires="europeans_base.wad"
 sync_safe="true"

addons/europeans_agricultur.wad/productionsites_agricultur/farm_small_advanced/init.lua

@@ -96,7 +96,7 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start digging clay because ...
             descname = pgettext("europeans_building", "digging clay"),
             actions = {
-                "return=skipped unless economy needs clay",
+                "return=skipped unless economy needs clay or economy needs brick",
                 "callworker=dig",
                 "return=skipped unless site has water",
                 "consume=water",

addons/europeans_agricultur.wad/productionsites_agricultur/farm_small_basic/init.lua

@@ -121,7 +121,7 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start digging clay because ...
             descname = pgettext("europeans_building", "digging clay"),
             actions = {
-                "return=skipped unless economy needs clay",
+                "return=skipped unless economy needs clay or economy needs brick",
                 "callworker=dig",
                 "return=skipped unless site has water",
                 "consume=water",

addons/europeans_agricultur.wad/tribes/initialization/units.lua

@@ -2598,7 +2598,7 @@ wl.Descriptions():new_tribe {
 
         -- Seafaring/Ferry Sites - these are only displayed on seafaring/ferry maps
         {
-            name = "europeans_ferry_yard",
+            name = "europeans_shipyard_basic",
             helptexts = {
                 -- TRANSLATORS: Purpose helptext for an Europeans production site: Ferry Yard
                 purpose = pgettext("europeans_building", "Builds ferries."),
@@ -2607,7 +2607,7 @@ wl.Descriptions():new_tribe {
             }
         },
         {
-            name = "europeans_shipyard",
+            name = "europeans_shipyard_advanced",
             helptexts = {
                 -- TRANSLATORS: Purpose helptext for an Europeans production site: Shipyard
                 purpose = pgettext("europeans_building", "Constructs ships that are used for overseas colonization and for trading between ports.")
@@ -2847,8 +2847,8 @@ wl.Descriptions():new_tribe {
       tool_smithy = "europeans_manufactory_basic",
       weapon_smithy = "europeans_manufactory_basic",
       armor_smithy = "europeans_manufactory_basic",
-      shipyard = "europeans_shipyard",
-      ferry_yard = "europeans_ferry_yard",
+      shipyard = "europeans_shipyard_basic",
+      ferry_yard = "europeans_shipyard_advanced",
       scout = "europeans_scouts_house_basic",
       barracks = "europeans_trainingscamp_basic",
       second_carrier = "europeans_animal_farm_advanced",

addons/europeans_agricultur.wad/tribes/scripting/starting_conditions.lua

@@ -344,12 +344,12 @@ function allow_productionsites_per_input(player)
         enough_input_wares = true
         if (tbuilding.type_name == "productionsite") and tbuilding.inputs then
             for k, ware in pairs(tbuilding.inputs) do
-                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (16 + ware_economy:target_quantity(ware.name)))
+                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (1.25 * ware_economy:target_quantity(ware.name)))
             end
         end
         if (tbuilding.type_name == "trainingsite") and tbuilding.inputs then
             for k, ware in pairs(tbuilding.inputs) do
-                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (4 + ware_economy:target_quantity(ware.name)))
+                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (1.10 * ware_economy:target_quantity(ware.name)))
             end
         end
         if ((tbuilding.type_name == "productionsite") or (tbuilding.type_name == "trainingsite")) and enough_input_wares then
@@ -381,7 +381,7 @@ function allow_warehouses_per_ware_amount(player)
     if (enough_ware_amount) then
         player:allow_buildings{"europeans_warehouse", "europeans_headquarters"}
     end
-    local number_shipyard = #player:get_buildings("europeans_shipyard")
+    local number_shipyard = #player:get_buildings("europeans_shipyard_basic")
     if ((enough_ware_amount) or (number_shipyard > 0)) and ((map.allows_seafaring == true) and (map.number_of_port_spaces > 0)) then
         player:allow_buildings{"europeans_port", "europeans_port_big"}
     end

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.9.2.2"
+version="1.9.3"
 category="tribes"
 requires=
 sync_safe="true"

addons/europeans_base.wad/recruitementsites/yard_ships_advanced/init.lua

@@ -3,9 +3,9 @@ push_textdomain("europeans_tribe.wad", true)
 dirname = path.dirname(__file__)
 
 wl.Descriptions():new_productionsite_type {
-    name = "europeans_shipyard",
+    name = "europeans_shipyard_advanced",
     -- TRANSLATORS: This is a building name used in lists of buildings
-    descname = pgettext("europeans_building", "Shipyard"),
+    descname = pgettext("europeans_building", "Combined Ferry- and Shipyard"),
     icon = dirname .. "menu.png",
 
     animation_directory = dirname,
@@ -49,7 +49,7 @@ wl.Descriptions():new_productionsite_type {
     },
 
     working_positions = {
-        europeans_shipwright_advanced = 1
+        europeans_shipwright_advanced = 2
     },
 
     inputs = {

addons/europeans_base.wad/recruitementsites/yard_ships_advanced/register.lua

@@ -1,3 +1,3 @@
 return {
-   europeans_shipyard = {"__replace_if_exists"},
+   europeans_shipyard_advanced = {"__replace_if_exists"},
 }

addons/europeans_base.wad/recruitementsites/yard_ships_basic/init.lua

@@ -3,9 +3,9 @@ push_textdomain("europeans_tribe.wad", true)
 dirname = path.dirname(__file__)
 
 wl.Descriptions():new_productionsite_type {
-    name = "europeans_ferry_yard",
+    name = "europeans_shipyard_basic",
     -- TRANSLATORS: This is a building name used in lists of buildings
-    descname = pgettext("europeans_building", "Ferry Yard"),
+    descname = pgettext("europeans_building", "Basic Ship Yard"),
     icon = dirname .. "menu.png",
 
     animation_directory = dirname,
@@ -23,10 +23,10 @@ wl.Descriptions():new_productionsite_type {
 
     size = "medium",
     destructible = true,
-    map_check = {"seafaring", "waterways"},
+    map_check = {"seafaring"},
 
     enhancement = {
-        name = "europeans_shipyard",
+        name = "europeans_shipyard_advanced",
         enhancement_cost = {
             brick = 2,
             grout = 2,
@@ -67,7 +67,7 @@ wl.Descriptions():new_productionsite_type {
     },
 
     working_positions = {
-        europeans_shipwright_basic = 1
+        europeans_shipwright_basic = 2
     },
 
     inputs = {
@@ -82,25 +82,10 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start working because ...
             descname = _"working",
             actions = {
-                "call=ferry_construction",
-                "sleep=duration:30s",
                 "call=ship_construction",
                 "return=completed"
             }
         },
-        ferry_construction = {
-            -- TRANSLATORS: Completed/Skipped/Did not start constructing a ferry because ...
-            descname = pgettext("europeans_building", "constructing a ferry"),
-            actions = {
-                "return=skipped when economy needs planks and not economy needs europeans_ferry",
-                "return=skipped when economy needs rubber and not economy needs europeans_ferry",
-                "return=skipped when not site has planks:2",
-                "return=skipped when not site has rubber",
-                "callworker=buildferry_1",
-                "consume=planks:2 rubber",
-                "callworker=buildferry_2"
-            }
-        },
         ship_construction = {
             -- TRANSLATORS: Completed/Skipped/Did not start constructing a ship because ...
             descname = pgettext("europeans_building", "constructing a ship"),

addons/europeans_base.wad/recruitementsites/yard_ships_basic/register.lua

@@ -1,3 +1,3 @@
 return {
-   europeans_ferry_yard = {"__replace_if_exists"},
+   europeans_shipyard_basic = {"__replace_if_exists"},
 }

addons/europeans_main.wad/addon

@@ -2,7 +2,7 @@
 name=_"Europeans Tribe (Main Addon)"
 description=_"Adds a new tribe named ‘Europeans’. This addon provides the minimum amount of workers, buildings and wares to have a playable economy and fast military expansion."
 author="MarkMcWire"
-version="1.9.2.1"
+version="1.9.3"
 category="tribes"
 requires="europeans_base.wad"
 sync_safe="true"

addons/europeans_main.wad/tribes/initialization/units.lua

@@ -1875,7 +1875,7 @@ wl.Descriptions():new_tribe {
 
         -- Seafaring/Ferry Sites - these are only displayed on seafaring/ferry maps
         {
-            name = "europeans_ferry_yard",
+            name = "europeans_shipyard_basic",
             helptexts = {
                 -- TRANSLATORS: Purpose helptext for an Europeans production site: Ferry Yard
                 purpose = pgettext("europeans_building", "Builds ferries."),
@@ -1884,7 +1884,7 @@ wl.Descriptions():new_tribe {
             }
         },
         {
-            name = "europeans_shipyard",
+            name = "europeans_shipyard_advanced",
             helptexts = {
                 -- TRANSLATORS: Purpose helptext for an Europeans production site: Shipyard
                 purpose = pgettext("europeans_building", "Constructs ships that are used for overseas colonization and for trading between ports.")
@@ -2109,8 +2109,8 @@ wl.Descriptions():new_tribe {
       tool_manufactory = "europeans_manufactory_basic",
       weapon_manufactory = "europeans_manufactory_basic",
       armor_manufactory = "europeans_manufactory_basic",
-      shipyard = "europeans_shipyard",
-      ferry_yard = "europeans_ferry_yard",
+      shipyard = "europeans_shipyard_basic",
+      ferry_yard = "europeans_shipyard_advanced",
       scout = "europeans_scouts_house_basic",
       barracks = "europeans_trainingscamp_basic",
       industry_supporter = "europeans_smelting_works_basic",

addons/europeans_main.wad/tribes/scripting/starting_conditions.lua

@@ -344,12 +344,12 @@ function allow_productionsites_per_input(player)
         enough_input_wares = true
         if (tbuilding.type_name == "productionsite") and tbuilding.inputs then
             for k, ware in pairs(tbuilding.inputs) do
-                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (16 + ware_economy:target_quantity(ware.name)))
+                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (1.25 * ware_economy:target_quantity(ware.name)))
             end
         end
         if (tbuilding.type_name == "trainingsite") and tbuilding.inputs then
             for k, ware in pairs(tbuilding.inputs) do
-                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (16 + ware_economy:target_quantity(ware.name)))
+                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (1.10 * ware_economy:target_quantity(ware.name)))
             end
         end
         if ((tbuilding.type_name == "productionsite") or (tbuilding.type_name == "trainingsite")) and enough_input_wares then
@@ -381,7 +381,7 @@ function allow_warehouses_per_ware_amount(player)
     if (enough_ware_amount) then
         player:allow_buildings{"europeans_warehouse", "europeans_headquarters"}
     end
-    local number_shipyard = #player:get_buildings("europeans_shipyard")
+    local number_shipyard = #player:get_buildings("europeans_shipyard_basic")
     if ((enough_ware_amount) or (number_shipyard > 0)) and ((map.allows_seafaring == true) and (map.number_of_port_spaces > 0)) then
         player:allow_buildings{"europeans_port", "europeans_port_big"}
     end

addons/europeans_trading.wad/addon

@@ -2,7 +2,7 @@
 name=_"Trading addon for Europeans tribe"
 description=_"Adds some additional trading buildings, traders and coins to Europeans tribes."
 author="MarkMcWire"
-version="1.9.2.2"
+version="1.9.3"
 category="tribes"
 requires="europeans_base.wad"
 sync_safe="true"

addons/europeans_trading.wad/productionsites_suppliers/farm_small_advanced/init.lua

@@ -96,7 +96,7 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start digging clay because ...
             descname = pgettext("europeans_building", "digging clay"),
             actions = {
-                "return=skipped unless economy needs clay",
+                "return=skipped unless economy needs clay or economy needs brick",
                 "callworker=dig",
                 "return=skipped unless site has water",
                 "consume=water",

addons/europeans_trading.wad/productionsites_suppliers/farm_small_basic/init.lua

@@ -122,7 +122,7 @@ wl.Descriptions():new_productionsite_type {
             -- TRANSLATORS: Completed/Skipped/Did not start digging clay because ...
             descname = pgettext("europeans_building", "digging clay"),
             actions = {
-                "return=skipped unless economy needs clay",
+                "return=skipped unless economy needs clay or economy needs brick",
                 "callworker=dig",
                 "return=skipped unless site has water",
                 "consume=water",

addons/europeans_trading.wad/tribes/initialization/units.lua

@@ -2121,7 +2121,7 @@ wl.Descriptions():new_tribe {
 
         -- Seafaring/Ferry Sites - these are only displayed on seafaring/ferry maps
         {
-            name = "europeans_ferry_yard",
+            name = "europeans_shipyard_basic",
             helptexts = {
                 -- TRANSLATORS: Purpose helptext for an Europeans production site: Ferry Yard
                 purpose = pgettext("europeans_building", "Builds ferries."),
@@ -2130,7 +2130,7 @@ wl.Descriptions():new_tribe {
             }
         },
         {
-            name = "europeans_shipyard",
+            name = "europeans_shipyard_advanced",
             helptexts = {
                 -- TRANSLATORS: Purpose helptext for an Europeans production site: Shipyard
                 purpose = pgettext("europeans_building", "Constructs ships that are used for overseas colonization and for trading between ports.")
@@ -2331,8 +2331,8 @@ wl.Descriptions():new_tribe {
    fastplace = {
       warehouse = "europeans_warehouse",
       port = "europeans_port",
-      training_small = "europeans_battlearena_basic",
-      training_large = "europeans_battlearena_level_2",
+      training_small = "europeans_training_center_health",
+      training_large = "europeans_battlearena_basic",
       military_small_primary = "europeans_sentry_basic",
       military_small_secondary = "europeans_sentry_level_3",
       military_medium_primary = "europeans_barrier_basic",
@@ -2362,8 +2362,8 @@ wl.Descriptions():new_tribe {
       armor_manufactory = "europeans_tailors_house_basic",
       boots_manufactory = "europeans_shoemakers_house_basic",
       big_manufactory = "europeans_manufactory_basic",
-      shipyard = "europeans_shipyard",
-      ferry_yard = "europeans_ferry_yard",
+      shipyard = "europeans_shipyard_basic",
+      ferry_yard = "europeans_shipyard_advanced",
       scout = "europeans_scouts_house_basic",
       barracks = "europeans_trainingscamp_basic",
       industry_supporter = "europeans_smelting_works_basic",

addons/europeans_trading.wad/tribes/scripting/starting_conditions.lua

@@ -344,12 +344,12 @@ function allow_productionsites_per_input(player)
         enough_input_wares = true
         if (tbuilding.type_name == "productionsite") and tbuilding.inputs then
             for k, ware in pairs(tbuilding.inputs) do
-                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (16 + ware_economy:target_quantity(ware.name)))
+                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (1.25 * ware_economy:target_quantity(ware.name)))
             end
         end
         if (tbuilding.type_name == "trainingsite") and tbuilding.inputs then
             for k, ware in pairs(tbuilding.inputs) do
-                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (16 + ware_economy:target_quantity(ware.name)))
+                enough_input_wares = enough_input_wares and (player:get_wares(ware.name) >= (1.10 * ware_economy:target_quantity(ware.name)))
             end
         end
         if ((tbuilding.type_name == "productionsite") or (tbuilding.type_name == "trainingsite")) and enough_input_wares then
@@ -381,7 +381,7 @@ function allow_warehouses_per_ware_amount(player)
     if (enough_ware_amount) then
         player:allow_buildings{"europeans_warehouse", "europeans_headquarters"}
     end
-    local number_shipyard = #player:get_buildings("europeans_shipyard")
+    local number_shipyard = #player:get_buildings("europeans_shipyard_basic")
     if ((enough_ware_amount) or (number_shipyard > 0)) and ((map.allows_seafaring == true) and (map.number_of_port_spaces > 0)) then
         player:allow_buildings{"europeans_port", "europeans_port_big"}
     end