diff --git a/bobelectronics/data-updates.lua b/bobelectronics/data-updates.lua index 25168c05c..440561a67 100644 --- a/bobelectronics/data-updates.lua +++ b/bobelectronics/data-updates.lua @@ -5,12 +5,6 @@ require("prototypes.aai-integration") data.raw.item["copper-cable"].subgroup = "bob-electronic-components" data.raw.item["copper-cable"].order = "0-a1" -if data.raw["recipe-category"]["bob-chemical-furnace"] then - if data.raw.recipe["bob-carbon"] then - data.raw.recipe["bob-carbon"].category = "bob-chemical-furnace" - end -end - if data.raw["recipe-category"]["bob-mixing-furnace"] then if data.raw.recipe["bob-solder-alloy"] then data.raw.recipe["bob-solder-alloy"].category = "bob-mixing-furnace" diff --git a/bobelectronics/prototypes/recipe-updates.lua b/bobelectronics/prototypes/recipe-updates.lua index 2e49600db..e4a8718e7 100644 --- a/bobelectronics/prototypes/recipe-updates.lua +++ b/bobelectronics/prototypes/recipe-updates.lua @@ -25,8 +25,8 @@ if data.raw.item["bob-tinned-copper-cable"] then bobmods.lib.recipe.replace_ingredient("bob-integrated-electronics", "copper-cable", "bob-tinned-copper-cable") end -if data.raw.item["bob-carbon"] then - bobmods.lib.recipe.replace_ingredient("bob-basic-electronic-components", "coal", "bob-carbon") +if data.raw.item["carbon"] then + bobmods.lib.recipe.replace_ingredient("bob-basic-electronic-components", "coal", "carbon") end if data.raw.item["bob-silicon-wafer"] then diff --git a/bobplates/locale/cs/bobplates.cfg b/bobplates/locale/cs/bobplates.cfg index d5f8ea186..737c72c90 100644 --- a/bobplates/locale/cs/bobplates.cfg +++ b/bobplates/locale/cs/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Oxid kobaltu bob-salt=Sůl bob-sodium-hydroxide=Hydroxid sodný -bob-carbon=Uhlík +carbon=Uhlík bob-resin=Pryskyřice bob-rubber=Pryž bob-silicon-wafer=Křemíkový plát diff --git a/bobplates/locale/de/bobplates.cfg b/bobplates/locale/de/bobplates.cfg index c53204b51..7ebe800e3 100644 --- a/bobplates/locale/de/bobplates.cfg +++ b/bobplates/locale/de/bobplates.cfg @@ -44,7 +44,7 @@ bob-cobalt-oxide=Kobaltoxid bob-salt=Salz bob-sodium-hydroxide=Natriumhydroxid -bob-carbon=Karbon +carbon=Karbon bob-resin=Harz bob-rubber=Gummi bob-silicon-wafer=Siliziumwafer diff --git a/bobplates/locale/en/bobplates.cfg b/bobplates/locale/en/bobplates.cfg index 9b5866f3b..59b9a77db 100644 --- a/bobplates/locale/en/bobplates.cfg +++ b/bobplates/locale/en/bobplates.cfg @@ -44,7 +44,7 @@ bob-cobalt-oxide=Cobalt oxide bob-salt=Salt bob-sodium-hydroxide=Sodium hydroxide -bob-carbon=Carbon +carbon=Carbon bob-resin=Resin bob-rubber=Rubber bob-silicon-wafer=Silicon wafer diff --git a/bobplates/locale/es-ES/bobplates.cfg b/bobplates/locale/es-ES/bobplates.cfg index d76d949ea..84e2dd7ee 100644 --- a/bobplates/locale/es-ES/bobplates.cfg +++ b/bobplates/locale/es-ES/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Óxido de cobalto bob-salt=Sal bob-sodium-hydroxide=Hidróxido de sodio -bob-carbon=Carbono +carbon=Carbono bob-resin=Resina bob-rubber=Hule bob-silicon-wafer=Oblea de silicio diff --git a/bobplates/locale/fr/bobplates.cfg b/bobplates/locale/fr/bobplates.cfg index 3e73e6c48..72440b95a 100644 --- a/bobplates/locale/fr/bobplates.cfg +++ b/bobplates/locale/fr/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Oxyde de cobalt bob-salt=Sel bob-sodium-hydroxide=Hydroxyde de sodium -bob-carbon=Carbone +carbon=Carbone bob-resin=Résine bob-rubber=Gomme bob-silicon-wafer=Wafer de silicium diff --git a/bobplates/locale/id/bobplates.cfg b/bobplates/locale/id/bobplates.cfg index 0ef91ac19..60a990ca1 100644 --- a/bobplates/locale/id/bobplates.cfg +++ b/bobplates/locale/id/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Cobalt oksida bob-salt=Garam bob-sodium-hydroxide=Natrium hidroksida -bob-carbon=Karbon +carbon=Karbon bob-resin=Resin bob-rubber=Karet bob-silicon-wafer=Wafer silikon diff --git a/bobplates/locale/it/bobplates.cfg b/bobplates/locale/it/bobplates.cfg index 64c6a9e77..739b43c6b 100644 --- a/bobplates/locale/it/bobplates.cfg +++ b/bobplates/locale/it/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Ossido di cobalto bob-salt=Sale bob-sodium-hydroxide=Idrossido di sodio -bob-carbon=Carbone lavorato +carbon=Carbone lavorato bob-resin=Resina bob-rubber=Gomma bob-silicon-wafer=Wafer di silicio diff --git a/bobplates/locale/ja/bobplates.cfg b/bobplates/locale/ja/bobplates.cfg index 102f9b5cf..b6fbcb131 100644 --- a/bobplates/locale/ja/bobplates.cfg +++ b/bobplates/locale/ja/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=酸化コバルト bob-salt=塩 bob-sodium-hydroxide=水酸化ナトリウム -bob-carbon=カーボン +carbon=カーボン bob-resin=レジン bob-rubber=ゴム bob-silicon-wafer=シリコンウェーハー diff --git a/bobplates/locale/ko/bobplates.cfg b/bobplates/locale/ko/bobplates.cfg index 38904c345..4f71fbcc3 100644 --- a/bobplates/locale/ko/bobplates.cfg +++ b/bobplates/locale/ko/bobplates.cfg @@ -46,7 +46,7 @@ bob-silicon-powder=실리콘 분말 bob-cobalt-oxide=산화 코발트 bob-salt=소금 bob-sodium-hydroxide=수산화 나트륨 -bob-carbon=탄소 +carbon=탄소 bob-resin=수지 bob-rubber=고무 bob-silicon-wafer=실리콘 웨이퍼 @@ -323,4 +323,4 @@ bobmods-plates-vanillabarrelling=활성화하면, 기본 게임처럼 조립 기 bobmods-plates-bluedeuterium=중수소는 파란색이라고 알고있으며, 게임에서 그렇게 보여줬으면 한다면 활성화하세요. bobmods-plates-convert-recipes=활성화하면, 다양한 용광로 유형 사이에 자유로운 변환이 가능하도록, 제작법을 추가됩니다. bobmods-plates-expensive-electrolysis=활성화하면, 전기 분해 장치를 가동하는데 필요한 전력 비용이 증가합니다. 이렇게 되면 전기분해로 얻는 수소를 연소하는 것보다 더 많은 전력 비용이 발생하게 됩니다. -bobmods-plates-nuclearupdate=활성화하면, 토륨으로부터 플루토늄을 제거하는 방법이나, 중수소 연료 전지 제작에 필요한 연료 전지 재활용 공정에 핵융합 촉매를 추가하는 등 작은 변화를 시도합니다. \ No newline at end of file +bobmods-plates-nuclearupdate=활성화하면, 토륨으로부터 플루토늄을 제거하는 방법이나, 중수소 연료 전지 제작에 필요한 연료 전지 재활용 공정에 핵융합 촉매를 추가하는 등 작은 변화를 시도합니다. diff --git a/bobplates/locale/nl/bobplates.cfg b/bobplates/locale/nl/bobplates.cfg index 1d63189c4..bc37e4150 100644 --- a/bobplates/locale/nl/bobplates.cfg +++ b/bobplates/locale/nl/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Kobaltoxide bob-salt=Zout bob-sodium-hydroxide=Natriumhydroxide -bob-carbon=Koolstof +carbon=Koolstof bob-resin=Hars bob-rubber=Rubber bob-silicon-wafer=Silicium wafer diff --git a/bobplates/locale/pl/bobplates.cfg b/bobplates/locale/pl/bobplates.cfg index 3dc6c475d..1480252ee 100644 --- a/bobplates/locale/pl/bobplates.cfg +++ b/bobplates/locale/pl/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Tlenek kobaltu bob-salt=Sol bob-sodium-hydroxide=Wodorotlenek sodu -bob-carbon=Karbon +carbon=Karbon bob-resin=Żywica bob-rubber=Guma bob-silicon-wafer=Wafel krzemowy diff --git a/bobplates/locale/pt-BR/bobplates.cfg b/bobplates/locale/pt-BR/bobplates.cfg index 90a4f1ad7..6016e8aaf 100644 --- a/bobplates/locale/pt-BR/bobplates.cfg +++ b/bobplates/locale/pt-BR/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Óxido de cobalto bob-salt=Sal bob-sodium-hydroxide=Hidróxido de sódio -bob-carbon=Carbono +carbon=Carbono bob-resin=Resina bob-rubber=Borracha bob-silicon-wafer=Wafer de silício diff --git a/bobplates/locale/ru/bobplates.cfg b/bobplates/locale/ru/bobplates.cfg index 72b6b4088..10c44100a 100644 --- a/bobplates/locale/ru/bobplates.cfg +++ b/bobplates/locale/ru/bobplates.cfg @@ -44,7 +44,7 @@ bob-cobalt-oxide=Оксид кобальта bob-salt=Соль bob-sodium-hydroxide=Гидроксид натрия -bob-carbon=Углерод +carbon=Углерод bob-resin=Смола bob-rubber=Резина bob-silicon-wafer=Полупроводниковая пластина diff --git a/bobplates/locale/th/bobplates.cfg b/bobplates/locale/th/bobplates.cfg index 92914c15c..325af47d6 100644 --- a/bobplates/locale/th/bobplates.cfg +++ b/bobplates/locale/th/bobplates.cfg @@ -42,7 +42,7 @@ bob-cobalt-oxide=โคบอลต์ออกไซด์ bob-salt=เกลือ bob-sodium-hydroxide=โซดาไฟ -bob-carbon=คาร์บอน +carbon=คาร์บอน bob-resin=ยางไม้ bob-rubber=ยาง bob-silicon-wafer=เวเฟอร์ซิลิคอน diff --git a/bobplates/locale/tr/bobplates.cfg b/bobplates/locale/tr/bobplates.cfg index 5e7af8176..637832f24 100644 --- a/bobplates/locale/tr/bobplates.cfg +++ b/bobplates/locale/tr/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Kobalt oksit bob-salt=Tuz bob-sodium-hydroxide=Sodyum hidroksit -bob-carbon=Karbon +carbon=Karbon bob-resin=Reçine bob-rubber=Kauçuk bob-silicon-wafer=Silikon levha diff --git a/bobplates/locale/uk/bobplates.cfg b/bobplates/locale/uk/bobplates.cfg index 152f2556d..4b03734ed 100644 --- a/bobplates/locale/uk/bobplates.cfg +++ b/bobplates/locale/uk/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=Кобальтин bob-salt=Сіль bob-sodium-hydroxide=Їдкий натр -bob-carbon=Вуглець +carbon=Вуглець bob-resin=Гума bob-rubber=Каучук bob-silicon-wafer=Кремнієвий лист diff --git a/bobplates/locale/zh-CN/bobplates.cfg b/bobplates/locale/zh-CN/bobplates.cfg index d4920544f..32ac6b79d 100644 --- a/bobplates/locale/zh-CN/bobplates.cfg +++ b/bobplates/locale/zh-CN/bobplates.cfg @@ -43,7 +43,7 @@ bob-cobalt-oxide=氧化钴 bob-salt=盐 bob-sodium-hydroxide=氢氧化钠 -bob-carbon=碳 +carbon=碳 bob-resin=树脂 bob-rubber=橡胶 bob-silicon-wafer=硅晶片 diff --git a/bobplates/locale/zh-TW/bobplates.cfg b/bobplates/locale/zh-TW/bobplates.cfg index 84ac69765..2439289d7 100644 --- a/bobplates/locale/zh-TW/bobplates.cfg +++ b/bobplates/locale/zh-TW/bobplates.cfg @@ -44,7 +44,7 @@ bob-cobalt-oxide=氧化鈷 bob-salt=鹽 bob-sodium-hydroxide=氫氧化鈉 -bob-carbon=碳 +carbon=碳 bob-resin=樹脂 bob-rubber=橡膠 bob-silicon-wafer=矽晶圓 diff --git a/bobplates/migrations/bobplates_2.0.0.json b/bobplates/migrations/bobplates_2.0.0.json index 9be430568..112207b7e 100644 --- a/bobplates/migrations/bobplates_2.0.0.json +++ b/bobplates/migrations/bobplates_2.0.0.json @@ -70,7 +70,6 @@ ["brass-gear-wheel", "bob-brass-gear-wheel"], ["bronze-alloy", "bob-bronze-alloy"], ["calcium-chloride", "bob-calcium-chloride"], - ["carbon", "bob-carbon"], ["ceramic-bearing", "bob-ceramic-bearing"], ["ceramic-bearing-ball", "bob-ceramic-bearing-ball"], ["chlorine-barrel", "bob-chlorine-barrel"], @@ -227,7 +226,6 @@ ["brass-gear-wheel", "bob-brass-gear-wheel"], ["bronze-alloy", "bob-bronze-alloy"], ["calcium-chloride", "bob-calcium-chloride"], - ["carbon", "bob-carbon"], ["ceramic-bearing", "bob-ceramic-bearing"], ["ceramic-bearing-ball", "bob-ceramic-bearing-ball"], ["coal-cracking", "bob-coal-cracking"], diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json index fc3848149..59c54f39f 100644 --- a/bobplates/migrations/bobplates_2.0.6.json +++ b/bobplates/migrations/bobplates_2.0.6.json @@ -1,6 +1,11 @@ { + "item": + [ + ["bob-carbon", "carbon"] + ], "recipe": [ + ["bob-carbon", "carbon"], ["bob-heavy-water-electrolysis", "bob-deuterium"] ] } diff --git a/bobplates/prototypes/item/resource.lua b/bobplates/prototypes/item/resource.lua index 15454e4ea..09d2660ac 100644 --- a/bobplates/prototypes/item/resource.lua +++ b/bobplates/prototypes/item/resource.lua @@ -1,7 +1,7 @@ data:extend({ { type = "item", - name = "bob-carbon", + name = "carbon", icon = "__bobplates__/graphics/icons/carbon.png", icon_size = 32, subgroup = "bob-resource", @@ -233,3 +233,8 @@ data:extend({ }, }, }) + +if mods["space-age"] then + data.raw.item.carbon.icon = "__space-age__/graphics/icons/carbon.png" + data.raw.item.carbon.icon_size = 64 +end diff --git a/bobplates/prototypes/recipe/alloy-recipe.lua b/bobplates/prototypes/recipe/alloy-recipe.lua index 4783de326..3eb1ef046 100644 --- a/bobplates/prototypes/recipe/alloy-recipe.lua +++ b/bobplates/prototypes/recipe/alloy-recipe.lua @@ -58,7 +58,7 @@ data:extend({ category = "bob-mixing-furnace", energy_required = 6.4, ingredients = { - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, { type = "item", name = "bob-tungsten-oxide", amount = 1 }, }, results = { @@ -76,7 +76,7 @@ data:extend({ category = "bob-mixing-furnace", energy_required = 12.8, ingredients = { - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, { type = "item", name = "bob-powdered-tungsten", amount = 1 }, }, results = { diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua index b87a3d09a..7f0d1e9b5 100644 --- a/bobplates/prototypes/recipe/chemistry-recipe.lua +++ b/bobplates/prototypes/recipe/chemistry-recipe.lua @@ -700,7 +700,7 @@ data:extend({ ingredients = { { type = "item", name = "copper-ore", amount = 7 }, { type = "item", name = "stone", amount = 1 }, - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, { type = "fluid", name = "bob-hydrogen", amount = 5 }, }, results = { @@ -725,7 +725,7 @@ data:extend({ auto_recycle = false, ingredients = { { type = "item", name = "bob-lead-oxide", amount = 7 }, - { type = "item", name = "bob-carbon", amount = 3 }, + { type = "item", name = "carbon", amount = 3 }, { type = "item", name = "bob-nickel-plate", amount = 1 }, }, results = { @@ -746,7 +746,7 @@ data:extend({ auto_recycle = false, ingredients = { { type = "item", name = "bob-silicon-powder", amount = 1 }, - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, }, results = { { type = "item", name = "bob-silicon-carbide", amount = 2 } }, allow_productivity = true, diff --git a/bobplates/prototypes/recipe/parts-recipe.lua b/bobplates/prototypes/recipe/parts-recipe.lua index d403aa409..2c2946a89 100644 --- a/bobplates/prototypes/recipe/parts-recipe.lua +++ b/bobplates/prototypes/recipe/parts-recipe.lua @@ -195,7 +195,7 @@ data:extend({ ingredients = { { type = "item", name = "bob-lithium-perchlorate", amount = 2 }, { type = "item", name = "bob-lithium-cobalt-oxide", amount = 1 }, - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, { type = "item", name = "plastic-bar", amount = 1 }, }, results = { { type = "item", name = "bob-lithium-ion-battery", amount = 1 } }, diff --git a/bobplates/prototypes/recipe/plates-recipe.lua b/bobplates/prototypes/recipe/plates-recipe.lua index 7b1cbdf13..589669f4f 100644 --- a/bobplates/prototypes/recipe/plates-recipe.lua +++ b/bobplates/prototypes/recipe/plates-recipe.lua @@ -50,7 +50,7 @@ data:extend({ auto_recycle = false, ingredients = { { type = "item", name = "bob-lead-oxide", amount = 2 }, - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, }, results = { { type = "item", name = "bob-lead-plate", amount = 2 } }, allow_decomposition = false, @@ -159,7 +159,7 @@ data:extend({ auto_recycle = false, ingredients = { { type = "item", name = "bob-alumina", amount = 2 }, - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, }, results = { { type = "item", name = "bob-aluminium-plate", amount = 2 } }, allow_decomposition = false, @@ -176,7 +176,7 @@ data:extend({ auto_recycle = false, ingredients = { { type = "item", name = "bob-calcium-chloride", amount = 2 }, - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, { type = "item", name = "bob-rutile-ore", amount = 2 }, }, results = { { type = "item", name = "bob-titanium-plate", amount = 2 } }, @@ -194,7 +194,7 @@ data:extend({ auto_recycle = false, ingredients = { { type = "item", name = "bob-calcium-chloride", amount = 2 }, - { type = "item", name = "bob-carbon", amount = 1 }, + { type = "item", name = "carbon", amount = 1 }, { type = "item", name = "bob-quartz", amount = 2 }, }, results = { { type = "item", name = "bob-silicon-plate", amount = 2 } }, diff --git a/bobplates/prototypes/recipe/resource-recipe.lua b/bobplates/prototypes/recipe/resource-recipe.lua index c3c89b377..48af9640a 100644 --- a/bobplates/prototypes/recipe/resource-recipe.lua +++ b/bobplates/prototypes/recipe/resource-recipe.lua @@ -1,7 +1,8 @@ data:extend({ { type = "recipe", - name = "bob-carbon", + name = "carbon", + localised_name = { "item-name.carbon" }, category = "bob-chemical-furnace", subgroup = "bob-material-chemical", energy_required = 2, @@ -11,7 +12,7 @@ data:extend({ { type = "fluid", name = "water", amount = 5 }, { type = "item", name = "coal", amount = 1 }, }, - results = { { type = "item", name = "bob-carbon", amount = 2 } }, + results = { { type = "item", name = "carbon", amount = 2 } }, allow_decomposition = false, allow_productivity = true, }, @@ -222,7 +223,7 @@ data:extend({ { type = "recipe", name = "bob-carbon-from-wood", - localised_name = { "item-name.bob-carbon" }, + localised_name = { "item-name.carbon" }, category = "bob-chemical-furnace", subgroup = "bob-material-chemical", enabled = false, @@ -231,7 +232,7 @@ data:extend({ ingredients = { { type = "item", name = "wood", amount = 1 }, }, - results = { { type = "item", name = "bob-carbon", amount = 1 } }, + results = { { type = "item", name = "carbon", amount = 1 } }, subgroup = "bob-resource", order = "c", allow_decomposition = false, @@ -291,3 +292,8 @@ data:extend({ data.raw.recipe["solid-fuel-from-petroleum-gas"].allow_productivity = false data.raw.recipe["solid-fuel-from-light-oil"].allow_productivity = false data.raw.recipe["solid-fuel-from-heavy-oil"].allow_productivity = false + +if mods["space-age"] then + data.raw.recipe["carbon"].allow_productivity = false + data.raw.recipe["coal-synthesis"].allow_productivity = false +end diff --git a/bobplates/prototypes/technology-updates.lua b/bobplates/prototypes/technology-updates.lua index 4f4e51f90..618f61142 100644 --- a/bobplates/prototypes/technology-updates.lua +++ b/bobplates/prototypes/technology-updates.lua @@ -162,3 +162,7 @@ if mods["Nuclear Fuel"] then "production-science-pack" ) end + +if mods["space-age"] then + bobmods.lib.tech.remove_recipe_unlock("tungsten-carbide", "carbon") +end diff --git a/bobplates/prototypes/technology.lua b/bobplates/prototypes/technology.lua index 45b86dde6..76de0d0e6 100644 --- a/bobplates/prototypes/technology.lua +++ b/bobplates/prototypes/technology.lua @@ -80,7 +80,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "bob-carbon", + recipe = "carbon", }, { type = "unlock-recipe", diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua index d21d108b4..34f932c30 100644 --- a/bobvehicleequipment/prototypes/recipe-updates.lua +++ b/bobvehicleequipment/prototypes/recipe-updates.lua @@ -735,14 +735,14 @@ if data.raw.fluid["hydrogen-chloride"] then end end -if data.raw.item["bob-carbon"] then +if data.raw.item["carbon"] then bobmods.lib.recipe.add_ingredient( "bob-vehicle-fission-reactor-equipment-1", - { type = "item", name = "bob-carbon", amount = 40 } + { type = "item", name = "carbon", amount = 40 } ) bobmods.lib.recipe.add_ingredient( "bob-vehicle-fission-cell-equipment-1", - { type = "item", name = "bob-carbon", amount = 20 } + { type = "item", name = "carbon", amount = 20 } ) end