Skip to content

Commit

Permalink
Merge pull request #26 from Peppie84/development
Browse files Browse the repository at this point in the history
Release v1.2.0.0
  • Loading branch information
Peppie84 authored Jan 14, 2025
2 parents ff54323 + 8a2fa74 commit 6cf364e
Show file tree
Hide file tree
Showing 11 changed files with 223 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]


## [1.2.0.0] - 2025-01-14
- Added translation for CZ by Maca-LSczechforum - for [#13](https://github.com/Peppie84/FS22_BeesRevamp/issues/13)
- Added translation for CS by orangestar254 - for [#21](https://github.com/Peppie84/FS22_BeesRevamp/issues/21)
- Added Cotton and Soybean yield bonus for cross pollination
- Fix reading the field area value and not using the land area

## [1.1.0.1] - 2024-11-04
- Fixed Number to string conversion for formatting the nectar info for en and it language - for [#16](https://github.com/Peppie84/FS22_BeesRevamp/issues/16)
Expand Down
26 changes: 22 additions & 4 deletions FS22_BeesRevamp/modDesc.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="80">
<author>Peppie84</author>
<version>1.1.0.1</version>
<version>1.2.0.0</version>
<title>
<en>Bees Revamp</en>
</title>
Expand All @@ -28,7 +28,7 @@ Most questions can be answered by the in-game help of this mod.
- Precision farming compatible
- TerraLife compatible
Yield bonus for: Canola, Sunflower, Alfalfa, Clover, Buckwheat, Phacelia, Silphie, Mustard and Clover gras
Yield bonus for: Canola, Sunflower, Alfalfa, Clover, Buckwheat, Phacelia, Silphie, Mustard, Clover gras, Cotton and Soybean
Additional supported bee hives:
- Pack Of Beehives by BarT
Expand All @@ -39,6 +39,12 @@ Additional supported bee hives:
- Beehive With 3 Large Frames by doodoo
- Beehouse by Ls_Dezign
Changelog v1.2.0.0
- Added translation for CZ and CS
- Added Cotton and Soybean yield bonus for cross pollination
- Fix reading the field area value and not using the land area
- Placing new hives is only possible in spring or summer
Changelog v1.1.0.1
- Fixed Number to string conversion for formatting the nectar info for en and it language
Expand Down Expand Up @@ -73,7 +79,7 @@ Bitte schau Dir die Ingame-Hilfe zu dieser Mod an. Sie kann die meisten Fragen b
- Precision Farming kompatibel
- TerraLife kompatibel
Ertragsbonus für: Raps, Sonnenblume, Luzerne, Klee, Buchweizen, Phacelia, Silphie, Senf und Kleegras
Ertragsbonus für: Raps, Sonnenblume, Luzerne, Klee, Buchweizen, Phacelia, Silphie, Senf, Kleegras, Baumwolle und Sojabohne
Zusätzlich unterstützte Bienenstöcke:
- Bienenstöcke von BarT
Expand All @@ -84,6 +90,12 @@ Zusätzlich unterstützte Bienenstöcke:
- Bienenstock Mit 3 Grossen Zargen von doodoo
- Bienenhaus von Ls_Dezign
Changelog v1.2.0.0
- Übersetzung für CZ und CS hinzugefügt
- Baumwolle und Sojabohnen Ertragsbonus für Kreuzbesteubung hinzugefügt
- Korrektur das die Feldfläche benutzt wird statt der Landfläche
- Platzierung neuer Bienenstöcke ist nur im Frühling oder Sommer möglich
Changelog v1.1.0.1
- Konvertierung von Zahlen in Zeichenfolgen zum formatieren der Nectar-Informationen für die Sprachen EN und IT, behoben
Expand Down Expand Up @@ -118,7 +130,7 @@ La maggior parte delle domande può essere risolta dall'aiuto in-game di questa
- Compatibile con precision farming
- Compatibile con TerraLife
Bonus di resa per: Colza, Girasole, Erba Medica, Trifoglio, Grano Saraceno, Facelia, Silphie, Senape e Erba di Trifoglio
Bonus di resa per: Colza, Girasole, Erba Medica, Trifoglio, Grano Saraceno, Facelia, Silphie, Senape, Erba di Trifoglio, Cotone e Fagiolo di soia
Alveari aggiuntivi supportati:
- Pacchetto di Alveari di BarT
Expand All @@ -129,6 +141,12 @@ Alveari aggiuntivi supportati:
- Arnia con 3 telaini grandi di doodoo
- Apicoltura di Ls_Dezign
Changelog v1.2.0.0
- Aggiunta traduzione per CZ e CS
- Aggiunto bonus di resa di cotone e soia per impollinazione incrociata
- Correzione della lettura del valore dell'area del campo e mancato utilizzo dell'area del terreno
- L'inserimento di nuovi alveari è possibile solo in primavera o in estate
Changelog v1.1.0.1
- Conversione fissa da numero a stringa per formattare le informazioni di Nectar per le lingue EN e IT
Expand Down
12 changes: 12 additions & 0 deletions FS22_BeesRevamp/src/beecare.lua
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ end
function BeeCare.registerOverwrittenFunctions(placeableType)
SpecializationUtil.registerOverwrittenFunction(placeableType, 'updateInfo', BeeCare.updateInfo)
SpecializationUtil.registerOverwrittenFunction(placeableType, 'updateBeehiveState', BeeCare.updateBeehiveState)
SpecializationUtil.registerOverwrittenFunction(placeableType, "canBuy", BeeCare.canBuy)
end

-------------------------------------------------------------------------------
Expand Down Expand Up @@ -550,3 +551,14 @@ function BeeCare:updateInfo(overwrittenFunc, infoTable)

overwrittenFunc(self, infoTable)
end

---Can buy
function BeeCare:canBuy(overwrittenFunc)
local spec = self.spec_beecare

if spec.environment.currentSeason == Environment.SEASON.WINTER or spec.environment.currentSeason == Environment.SEASON.AUTUMN then
return false, g_brUtils:getModText('beesrevamp_beecare_warning_hive_placement_only_in_spring_and_summer')
end

return overwrittenFunc(self)
end
15 changes: 13 additions & 2 deletions FS22_BeesRevamp/src/beehivesystemextended.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function BeehiveSystemExtended:updateState()
self.isProductionActive = true

local isRaining = environment.weather:getIsRaining()
local isTemperaturToFly = environment.weather:getCurrentTemperature() > 10
local isTemperaturToFly = environment.weather:getCurrentTemperature() >= 10
local isSunOn = environment.isSunOn
local isWinterSeason = environment.currentSeason == Environment.SEASON.WINTER

Expand Down Expand Up @@ -111,7 +111,18 @@ function BeehiveSystemExtended:getBeehiveInfluenceFactorAt(wx, wz)
return 0
end

local totalFieldArea = farmLand.totalFieldArea or farmLand.areaInHa
local fieldArea = 0
local totalFieldArea = farmLand.areaInHa or farmLand.totalFieldArea
local farmLandByFieldMapping = g_fieldManager.farmlandIdFieldMapping
if farmLandByFieldMapping[farmlandId] ~= nil then
for _, field in pairs(farmLandByFieldMapping[farmlandId]) do
fieldArea = fieldArea + field.fieldArea
end
if fieldArea > 0 then
totalFieldArea = fieldArea
end
end

if totalFieldArea == nil then
return 0
end
Expand Down
8 changes: 8 additions & 0 deletions FS22_BeesRevamp/src/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ local function load(mission)
['yieldBonus'] = 0.50,
['hivesPerHa'] = 4
},
['COTTON'] = {
['yieldBonus'] = 0.35,
['hivesPerHa'] = 3
},
['SOYBEAN'] = {
['yieldBonus'] = 0.18,
['hivesPerHa'] = 2
},
}
}

Expand Down
123 changes: 123 additions & 0 deletions FS22_BeesRevamp/translations/translation_cs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<l10n>
<translationContributors>orangestar254</translationContributors>
<elements>
<e k="beesrevamp_beecare_info_title_oxusim" v="冬季处理"/>
<e k="beesrevamp_beecare_info_title_swarm_pressure" v="分蜂压力"/>
<e k="beesrevamp_beecare_info_title_bee_population" v="蜜蜂数量"/>
<e k="beesrevamp_beecare_info_title_state" v="状态"/>
<e k="beesrevamp_beecare_info_bee_population_format" v="%s 只蜜蜂"/>
<e k="beesrevamp_beecare_do_swarm_control" v="执行分蜂控制"/>
<e k="beesrevamp_beecare_state_economic_hive" v="经济蜂群"/>
<e k="beesrevamp_beecare_state_young_hive" v="年轻蜂群"/>
<e k="beesrevamp_beecare_state_dead_hive" v="死亡蜂群"/>
<e k="beesrevamp_beecare_state_additional_swarmed" v="已分蜂"/>
<e k="beesrevamp_beecare_common_state_on" v=""/>
<e k="beesrevamp_beecare_common_state_off" v=""/>
<e k="beesrevamp_placeablebeehiveextended_info_title_nectar" v="花蜜"/>
<e k="beesrevamp_placeablebeehiveextended_info_nectar_format" v="%s 升"/>
<e k="beesrevamp_placeablebeehiveextended_info_title_hives" v="蜂群"/>
<e k="beesrevamp_beehivesystemextended_info_influenced_by_bees" v="受蜜蜂影响"/>
<e k="beesrevamp_beehivesystemextended_info_bee_bonus" v="蜜蜂增益"/>
<e k="beesrevamp_beehivesystemextended_info_influenced_hive_singular" v="经济蜂群"/>
<e k="beesrevamp_beehivesystemextended_info_influenced_hive_plural" v="经济蜂群"/>
<e k="beesrevamp_beehivesystemextended_info_title_bee_bonus_is_shrinking" v="供应过剩!"/>
<e k="beesrevamp_beehivesystemextended_info_bee_bonus_is_shrinking" v="蜜蜂增益减少"/>
<e k="beesrevamp_beecare_warning_hive_placement_only_in_spring_and_summer" v="蜂箱只能在春季或夏季放置!"/>

<!-- 帮助信息 -->
<e k="beesrevamp_helpline_category" v="蜜蜂改进"/>
<e k="beesrevamp_helpline_page_1" v="概述"/>
<e k="beesrevamp_helpline_page_1_paragraph_2_title" v="欢迎使用蜜蜂改进模组"/>
<e k="beesrevamp_helpline_page_1_paragraph_2_text" v="通过本模组,《模拟农场22》中的蜜蜂变得更加真实和复杂,但同时也更具生产力。
我是一个拥有10个蜂群的业余养蜂人,很遗憾在《模拟农场22》中养蜂的玩法非常少。因此,我从2023年开始开发这个模组。
所有的数值和改动都基于科学依据,并可能稍作调整以保持游戏的趣味性。我们的目标是始终以趣味性为核心。
- 蜂群的两种状态(年轻蜂群和经济蜂群)
- 只有经济蜂群可以生产蜂蜜
- 蜜蜂采集花蜜
- 只有在天气良好的情况下,蜜蜂才会采集
- 花蜜会被转化为蜂蜜
- 蜜蜂会消耗花蜜
- 蜂巢的范围得到扩展
- 授粉效果得到提升
- 蜂巢中的蜜蜂数量可变
- 分蜂季节为每年的3月至7月
- 蜂巢的价格进行了调整
- 蜂蜜的销售价格进行了调整
- 支持精准农业
- 支持 TerraLife
有关更多信息、帮助和问题报告,请访问此模组的GitHub页面:https://github.com/Peppie84/FS22_BeesRevamp
希望大家能享受这款模组的乐趣。
- Dennis (Peppie84)"/>
<e k="beesrevamp_helpline_page_2" v="蜜蜂行为"/>
<e k="beesrevamp_helpline_page_2_paragraph_1_title" v="万事开头难..."/>
<e k="beesrevamp_helpline_page_2_paragraph_1_text" v="蜂群从小规模开始。您放置蜂巢后,蜂群状态为:年轻蜂群。 为了让年轻的蜂群全年发育,蜂箱只能在春季或夏季放置。"/>
<e k="beesrevamp_helpline_page_2_paragraph_2_text" v="年轻蜂群需要大约1年的时间才能成长为经济蜂群,只有这样才能为您生产蜂蜜。
每个蜂群在放置时会生成一个随机的蜜蜂数量,并且每年都会重新生成。蜜蜂数量会在3月至7月期间增长,在冬季减少。在蜂巢的信息显示中,您还可以看到蜜蜂已采集的未处理花蜜量。蜜蜂采集的是花蜜,而不是蜂蜜,并在蜂巢中将花蜜转化为蜂蜜。有关蜂蜜的更多信息,请参见“蜂蜜”部分。"/>
<e k="beesrevamp_helpline_page_2_paragraph_3_title" v="如果天气不好,蜜蜂不会出巢"/>
<e k="beesrevamp_helpline_page_2_paragraph_3_text" v="蜜蜂出巢的条件包括:
- 日出后
- 温度至少为10℃
- 无降雨
- 非冬季
此外,蜜蜂的采集范围也得到了大幅扩展。现实中,蜜蜂在半径3公里内采集,因此游戏中的范围扩大到500米。"/>
<e k="beesrevamp_helpline_page_2_paragraph_4_text" v="还有一些蜂巢可以容纳多个蜂群,例如10个朗斯特罗斯蜂巢。然而,目前并未模拟10个独立蜂群,而是将其作为一个蜂群来计算。蜂群数量则用于后续的产量奖励计算。"/>
<e k="beesrevamp_helpline_page_2_paragraph_5_text" v="现在,蜂群会每小时消耗采集的花蜜。但不用担心,即使花蜜值降至0,蜜蜂也不会饿死。不过,如果长期下雨而无法外出采集,蜂蜜产量会受到当年显著影响。"/>
<e k="beesrevamp_helpline_page_3" v="分蜂"/>
<e k="beesrevamp_helpline_page_3_paragraph_1_title" v="蜂巢空间不足时,蜜蜂会分蜂"/>
<e k="beesrevamp_helpline_page_3_paragraph_1_text" v="每年3月至7月期间,蜂群快速增长。如果养蜂人未及时扩展蜂巢,空间会变得拥挤。此外,蜜蜂可能因为‘无聊’而想要分蜂。"/>
<e k="beesrevamp_helpline_page_3_paragraph_2_text" v="分蜂是蜂群的自然分裂。对养蜂人而言,这意味着当年蜂蜜产量会受到影响,因为约一半的蜜蜂离巢。
在现实中,养蜂人应在3月至7月期间每7天检查一次蜂群;而在游戏中,每月检查一次即可。有25%的几率某些蜂群不会产生‘分蜂压力’。"/>
<e k="beesrevamp_helpline_page_3_paragraph_3_text" v="您需要走到每个蜂巢前,查看是否有‘分蜂压力’,并按‘R’执行操作。如果您以多日为一个月游戏,也可以在整个月内进行分蜂控制。"/>
<e k="beesrevamp_helpline_page_3_paragraph_4_title" v="蜂群已分蜂"/>
<e k="beesrevamp_helpline_page_3_paragraph_4_text" v="如果蜂群分蜂,50%的蜜蜂会离巢,导致当年剩余时间内蜂蜜产量减少。此状态将在年末重置。"/>
<e k="beesrevamp_helpline_page_4" v="产量奖励"/>
<e k="beesrevamp_helpline_page_4_paragraph_1_title" v="作物的全新产量奖励"/>
<e k="beesrevamp_helpline_page_4_paragraph_1_text" v="通过本模组,您需要为每公顷田地配置一定数量的蜂群,才能获得良好的产量奖励。
以下是新的产量奖励表:
作物 最大产量奖励 每公顷蜂群数
油菜 30% 3个蜂群/公顷
向日葵 80% 4个蜂群/公顷
土豆 0% -
苜蓿 15% 10个蜂群/公顷
三叶草 10% 8个蜂群/公顷
荞麦 25% 4.5个蜂群/公顷
菊蒿叶沙铃花 25% 4个蜂群/公顷
串叶松香草 50% 4个蜂群/公顷
芥菜 50% 4个蜂群/公顷
三叶草牧草 10% 8个蜂群/公顷
有些作物不是由蜜蜂直接授粉的,因为它们是自花授粉的。然而,许多研究表明,异花授粉,即从一株植物向另一株植物转移花粉,也可以增加自花授粉植物的产量。这些作物包括以下作物:
作物 最大产量奖励 每公顷蜂群数
鲍姆沃尔 35% 3个蜂群/公顷
索贾博内 18% 2个蜂群/公顷
状态为‘年轻蜂群’的蜂群完全被排除在此计算之外。这防止了玩家在收获前短时间内将蜂群放置到田间以获得额外奖励。"/>
<e k="beesrevamp_helpline_page_4_paragraph_2_text" v="田间信息现在会显示有多少蜂群接近田地,无论是您自己的还是其他玩家的蜂群,并显示可获得的产量奖励。"/>
<e k="beesrevamp_helpline_page_4_paragraph_3_text" v="但要注意,蜂群过多也会对田地产生负面影响,导致产量奖励再次减少。"/>
<e k="beesrevamp_helpline_page_5" v="蜂蜜"/>
<e k="beesrevamp_helpline_page_5_paragraph_1_title" v="蜜蜂越多,蜂蜜越多"/>
<e k="beesrevamp_helpline_page_5_paragraph_1_text" v="蜂蜜的产量不再仅由您放置的蜂巢类型决定,而是由多个因素决定。
在天气良好的情况下,蜂巢中大约三分之二的蜜蜂会外出采集花蜜,剩下的三分之一会留在蜂巢中照顾幼蜂并将花蜜转化为蜂蜜。因此,蜜蜂数量越多,采集的花蜜和生产的蜂蜜就越多。
日落后,蜜蜂停止飞行,全部开始将花蜜转化为蜂蜜。只有当蜂巢中有花蜜时,才能生产蜂蜜。花蜜与蜂蜜的转化比例为3:1。转化过程在冬季会停止,蜜蜂只会消耗花蜜。
如果长时间下雨,蜜蜂无法外出采集新花蜜,蜂巢中也无法生产蜂蜜。
蜜蜂也需要食物。它们直接从采集的花蜜中获取。如果花蜜值降到0,蜜蜂不会死亡。"/>
<e k="beesrevamp_helpline_page_6" v="冬季处理"/>
</elements>
</l10n>
12 changes: 10 additions & 2 deletions FS22_BeesRevamp/translations/translation_cz.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<e k="beesrevamp_beehivesystemextended_info_influenced_hive_plural" v="Eco. Úly"/>
<e k="beesrevamp_beehivesystemextended_info_title_bee_bonus_is_shrinking" v="Nadměrně zásobeno!"/>
<e k="beesrevamp_beehivesystemextended_info_bee_bonus_is_shrinking" v="Bonus se zmenšuje"/>
<e k="beesrevamp_beecare_warning_hive_placement_only_in_spring_and_summer" v="Úly lze umístit pouze na jaře nebo v létě!"/>

<!-- HelpLine -->
<e k="beesrevamp_helpline_category" v="Renovace včel"/>
Expand All @@ -46,7 +47,8 @@ Všechny hodnoty a změny jsou vědecky ověřené a/nebo možná mírně uprave
- Rojová sezóna je mezi březnem a červencem
- Ceny úlů byly upraveny
- Prodejní cena medu byla upravena
- Kompatibilní s přesným zemědělstvím
- Kompatibilní s přesným zemědělstvím
- Kompatibilní s TerraLife
Pro více informací, nápovědu a hlášení problémů navštivte stránku github tohoto modu: https://github.com/Peppie84/FS22_BeesRevamp
Expand All @@ -55,7 +57,7 @@ Doufám, že se s tímto modem všichni pobavíte.
- Dennis (Peppie84)"/>
<e k="beesrevamp_helpline_page_2" v="Chování včel"/>
<e k="beesrevamp_helpline_page_2_paragraph_1_title" v="Všechno začíná v malém ..."/>
<e k="beesrevamp_helpline_page_2_paragraph_1_text" v="Včelstvo také začíná v malém. Jakmile umístíte úl, včelstvo začíná stavem: mladé včelstvo."/>
<e k="beesrevamp_helpline_page_2_paragraph_1_text" v="Včelstvo také začíná v malém. Jakmile umístíte úl, včelstvo začíná stavem: mladé včelstvo. Aby se mladé včelstvo během roku vyvíjelo, lze úly umisťovat pouze na jaře nebo v létě."/>
<e k="beesrevamp_helpline_page_2_paragraph_2_text" v="Mladá včelstva potřebuje asi 1 rok, aby vyrostla v ekonomickou kolonii a teprve poté vám bude produkovat med.
Každé včelstvo má náhodný počet včel, jakmile je umístěno, a každý rok se převaluje. Včelí populace v období od března do července roste a v zimě opět klesá. Na informačním displeji úlu můžete také vidět, kolik nektaru včely nasbíraly a ještě nezpracovaly. Včely nesbírají med, ale nektar a v úlu ho přeměňují na med. Více o tom pod Med"/>
Expand Down Expand Up @@ -96,6 +98,12 @@ Mužák polní 50% 4 kolonie/ha
Hořčice 50% 4 kolonie/ha
Jetel tráva 10% 8 kolonie/ha
Některé plodiny nejsou přímo opylovány včelami, protože jsou samosprašné. Mnoho studií však ukazuje, že cizosprašné opylení neboli přenos pylu z jedné rostliny na druhou může také zvýšit výnos samosprašných rostlin. Patří sem následující plodiny:
Plodina max. bonus k výnosu kolonie na hektar
Bavlna 35% 3 kolonie/ha
Sójové boby 18% 2 kolonie/ha
Včelstva se statusem: mladé včelstvo jsou z tohoto výpočtu zcela vyloučena. To vám zabrání umístit včelstva na pole krátce před sklizní a získat tak bonus."/>
<e k="beesrevamp_helpline_page_4_paragraph_2_text" v="Informace o poli vám nyní ukazují, kolik včelstev je v blízkosti pole, ať už vašich vlastních nebo jiných hráčů, a jaký bonus k výnosu můžete očekávat."/>
<e k="beesrevamp_helpline_page_4_paragraph_3_text" v="Ale buďte opatrní, můžete také pole přetížit, což bude mít negativní dopad, protože opět ztratíte výnosový bonus." />
Expand Down
Loading

0 comments on commit 6cf364e

Please sign in to comment.