Merge pull request #24 from Peppie84/pre-release/v1.2.0.0

Pre-Release v1.2.0.0

CHANGELOG.md

@@ -4,6 +4,9 @@ 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

FS22_BeesRevamp/modDesc.xml

@@ -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>
@@ -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
@@ -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
 
@@ -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
@@ -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
 
@@ -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
@@ -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
 

FS22_BeesRevamp/src/beecare.lua

@@ -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
 
 -------------------------------------------------------------------------------
@@ -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

FS22_BeesRevamp/translations/translation_cs.xml

@@ -23,6 +23,7 @@
     <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="蜜蜂改进"/>
@@ -56,7 +57,7 @@
 - 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_1_text" v="蜂群从小规模开始。您放置蜂巢后，蜂群状态为：年轻蜂群。 为了让年轻的蜂群全年发育，蜂箱只能在春季或夏季放置。"/>
     <e k="beesrevamp_helpline_page_2_paragraph_2_text" v="年轻蜂群需要大约1年的时间才能成长为经济蜂群，只有这样才能为您生产蜂蜜。
 
 每个蜂群在放置时会生成一个随机的蜜蜂数量，并且每年都会重新生成。蜜蜂数量会在3月至7月期间增长，在冬季减少。在蜂巢的信息显示中，您还可以看到蜜蜂已采集的未处理花蜜量。蜜蜂采集的是花蜜，而不是蜂蜜，并在蜂巢中将花蜜转化为蜂蜜。有关蜂蜜的更多信息，请参见“蜂蜜”部分。"/>

FS22_BeesRevamp/translations/translation_cz.xml

@@ -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"/>
@@ -56,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"/>

FS22_BeesRevamp/translations/translation_de.xml

@@ -23,6 +23,7 @@
     <e k="beesrevamp_beehivesystemextended_info_influenced_hive_plural" v="Wirt.Völker"/>
     <e k="beesrevamp_beehivesystemextended_info_title_bee_bonus_is_shrinking" v="Überversorgt!"/>
     <e k="beesrevamp_beehivesystemextended_info_bee_bonus_is_shrinking" v="Bienen Bonus schrumpft"/>
+    <e k="beesrevamp_beecare_warning_hive_placement_only_in_spring_and_summer" v="Bienenstöcke können nur im Frühling oder Sommer platziert werden!"/>
 
     <!-- HelpLine -->
     <e k="beesrevamp_helpline_category" v="Bees Revamp"/>
@@ -56,7 +57,7 @@ Ich wünsche euch allen viel Spaß mit der Mod.
 - Dennis (Peppie84)"/>
     <e k="beesrevamp_helpline_page_2" v="Bienen verhalten"/>
     <e k="beesrevamp_helpline_page_2_paragraph_1_title" v="Alles fängt mal klein an ..."/>
-    <e k="beesrevamp_helpline_page_2_paragraph_1_text" v="Auch ein Bienenvolk fängt klein an. Sobald Du ein Bienenstock platzierst, fängt das Volk im Status: Jungvolk an."/>
+    <e k="beesrevamp_helpline_page_2_paragraph_1_text" v="Auch ein Bienenvolk fängt klein an. Sobald Du ein Bienenstock platzierst, fängt das Volk im Status: Jungvolk an. Damit sich das Jungvolk über das Jahr entwickeln kann, können Bienenstöcke nur im Frühling oder Sommer platziert werden."/>
     <e k="beesrevamp_helpline_page_2_paragraph_2_text" v="Ein Jungvolk benötigt etwa 1 Jahr bis es zu einem Wirtsschaftsvolk herangewachsen ist und erst dann wird es Dir auch Honig bringen.
 
 Jedes Volk hat eine zufällige Menge an Bienen sobald es platziert wird und wird jedes Jahr neu ausgewürfelt. Die Bienenpopulation wächst über den Zeitrtraum von Mär-Jul und nimmt zum Winter wieder ab. In der Infoanzeige eines Bienenstocks kannst du auch sehen wie viel Nektar die Bienen gesammelt und noch nicht verarbeitet, haben. Bienen sammeln keinen Honig, sondern Nektar und wandeln diesen im Stock in Honig um. Mehr dazu unter Honig"/>

FS22_BeesRevamp/translations/translation_en.xml

@@ -23,6 +23,7 @@
     <e k="beesrevamp_beehivesystemextended_info_influenced_hive_plural" v="Eco. Hives"/>
     <e k="beesrevamp_beehivesystemextended_info_title_bee_bonus_is_shrinking" v="Oversupplied!"/>
     <e k="beesrevamp_beehivesystemextended_info_bee_bonus_is_shrinking" v="Bee bonus shrinks"/>
+    <e k="beesrevamp_beecare_warning_hive_placement_only_in_spring_and_summer" v="Beehives can only be placed in spring or summer!"/>
 
     <!-- HelpLine -->
     <e k="beesrevamp_helpline_category" v="Bees Revamp"/>
@@ -56,7 +57,7 @@ I hope you all have fun with this mod.
 - Dennis (Peppie84)"/>
     <e k="beesrevamp_helpline_page_2" v="Bee behavior"/>
     <e k="beesrevamp_helpline_page_2_paragraph_1_title" v="Everything starts small..."/>
-    <e k="beesrevamp_helpline_page_2_paragraph_1_text" v="A bee colony also starts small. As soon as you place a beehive, the colony starts with the status: young colony."/>
+    <e k="beesrevamp_helpline_page_2_paragraph_1_text" v="A bee colony also starts small. As soon as you place a beehive, the colony starts with the status: young colony. In order for the young colony to develop over the year, beehives can only be placed in spring or summer."/>
     <e k="beesrevamp_helpline_page_2_paragraph_2_text" v="A young colony needs about 1 year to grow into a economy colony and only then will it produce honey for you.
 
 Each colony has a random number of bees as soon as it is placed and is re-rolled every year. The bee population grows over the period from March to July and decreases again in winter. In the information display of a beehive you can also see how much nectar the bees have collected and have not yet processed. Bees do not collect honey, but nectar and convert it into honey in the hive. More on this under Honey"/>

FS22_BeesRevamp/translations/translation_it.xml

@@ -23,6 +23,7 @@
     <e k="beesrevamp_beehivesystemextended_info_influenced_hive_plural" v="Colonie eco."/>
     <e k="beesrevamp_beehivesystemextended_info_title_bee_bonus_is_shrinking" v="Sovrabbondanza!"/>
     <e k="beesrevamp_beehivesystemextended_info_bee_bonus_is_shrinking" v="Il bonus api si riduce"/>
+    <e k="beesrevamp_beecare_warning_hive_placement_only_in_spring_and_summer" v="Gli alveari possono essere posizionati solo in primavera o in estate!"/>
 
     <!-- HelpLine -->
     <e k="beesrevamp_helpline_category" v="Bees Revamp"/>
@@ -56,7 +57,7 @@ Spero che tutti vi divertiate con questo mod.
 - Dennis (Peppie84)"/>
     <e k="beesrevamp_helpline_page_2" v="Comportamento delle api"/>
     <e k="beesrevamp_helpline_page_2_paragraph_1_title" v="Tutto inizia in piccolo..."/>
-    <e k="beesrevamp_helpline_page_2_paragraph_1_text" v="Anche una colonia di api inizia in piccolo. Non appena posizioni un'arnia, la colonia inizia con lo stato: colonia giovane."/>
+    <e k="beesrevamp_helpline_page_2_paragraph_1_text" v="Anche una colonia di api inizia in piccolo. Non appena posizioni un'arnia, la colonia inizia con lo stato: colonia giovane. Affinché la giovane colonia possa svilupparsi nel corso dell'anno, gli alveari possono essere posizionati solo in primavera o in estate."/>
     <e k="beesrevamp_helpline_page_2_paragraph_2_text" v="Una colonia giovane ha bisogno di circa 1 anno per crescere in una colonia economica e solo allora produrrà miele per te.
 
 Ogni colonia ha un numero casuale di api non appena viene posizionata e viene ricalcolato ogni anno. La popolazione di api cresce nel periodo da marzo a luglio e diminuisce di nuovo in inverno. Nella visualizzazione delle informazioni di un'arnia puoi anche vedere quanto nettare le api hanno raccolto e non hanno ancora elaborato. Le api non raccolgono miele, ma nettare e lo convertono in miele nell'arnia. Maggiori informazioni su questo sotto Miele"/>

README.md

@@ -3,7 +3,7 @@
 <div align="center">
 
 [![FarmingSimulator-22](https://img.shields.io/badge/FarmingSimulator-22-blue?style=flat-square)](https://www.farming-simulator.com/)
-[![Modhub Version](https://img.shields.io/badge/Modhub-v1.1.0.1-green?style=flat-square)](https://www.farming-simulator.com/mod.php?mod_id=298737)
+[![Modhub Version](https://img.shields.io/badge/Modhub-v1.2.0.0-green?style=flat-square)](https://www.farming-simulator.com/mod.php?mod_id=298737)
 [![GitHub issues](https://img.shields.io/github/issues/Peppie84/FS22_BeesRevamp?style=flat-square)](https://github.com/Peppie84/FS22_BeesRevamp/issues)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0)
 [![Last commit](https://img.shields.io/github/last-commit/Peppie84/FS22_BeesRevamp?style=flat-square&color=important)](https://github.com/Peppie84/FS22_BeesRevamp/commits/development)