Skip to content

Commit

Permalink
Ballen eingefügt
Browse files Browse the repository at this point in the history
  • Loading branch information
@Achimobil
Achimobil committed Sep 7, 2023
1 parent f98ab1a commit cd6dfa9
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CS690.xml
View file
Expand Up @@ -872,7 +872,7 @@

<platform animationName="dropBale" nextBaleTime="0.7619" aiSpeed="3"/>

<buffer fillUnitIndex="2" overloadingDuration="5" balerDisplayType="ROUNDBALE_COTTON"/>
<buffer fillUnitIndex="2" overloadingDuration="5" balerDisplayType="ROUNDBALE_LAVENDER"/>

<animationNodes>
<animationNode node="chamberBelt" class="ScrollingAnimation" shaderParameterName="offsetUV" scrollSpeed="1" shaderParameterComponent="2" turnOnFadeTime="1" turnOffFadeTime="1"/>
Expand Down
Binary file added bales/hud_fill_roundBaleLavender.dds
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions bales/lavenderRoundbale238.i3d
View file
Expand Up @@ -6,19 +6,19 @@
</Asset>

<Files>
<File fileId="3" filename="$data/objects/cottonModules/bale_normal.png"/>
<File fileId="4" filename="$data/objects/cottonModules/bale_specular.png"/>
<File fileId="2" filename="lavender_bale_diffuse.dds"/>
<File fileId="2" filename="lavender_bale_diffuse.png"/>
<File fileId="3" filename="lavender_bale_normal.png"/>
<File fileId="4" filename="lavender_bale_specular.png"/>
</Files>


<Materials>
<Material name="bale_mat" materialId="6">
<Material name="bale_mat" materialId="5">
<Texture fileId="2"/>
<Normalmap fileId="3"/>
<Glossmap fileId="4"/>
</Material>
<Material name="lambert1" materialId="5" diffuseColor="0.498039 0.498039 0.498039 1">
<Material name="lambert1" materialId="6" diffuseColor="0.494118 0.494118 0.494118 1">
</Material>
</Materials>

Expand All @@ -31,9 +31,9 @@
</Dynamics>

<Scene>
<Shape shapeId="1" name="cottonRoundbale488" dynamic="true" compound="true" collisionMask="16781314" restitution="1" staticFriction="1.3" dynamicFriction="1.3" linearDamping="0.25" angularDamping="0.6" density="0.207" clipDistance="250" nodeId="11" materialIds="5" castsShadows="true" receiveShadows="true" nonRenderable="true">
<Shape shapeId="2" name="attacherTrigger" kinematic="true" trigger="true" collisionMask="134217728" linearDamping="0.5" angularDamping="0.5" nodeId="12" materialIds="5" castsShadows="true" receiveShadows="true" nonRenderable="true"/>
<Shape shapeId="3" name="roundbale_vis" clipDistance="250" nodeId="13" materialIds="6" castsShadows="true" receiveShadows="true"/>
<Shape shapeId="1" name="cottonRoundbale488" dynamic="true" compound="true" collisionMask="16781314" restitution="1" staticFriction="1.3" dynamicFriction="1.3" linearDamping="0.25" angularDamping="0.6" density="0.207" clipDistance="250" nodeId="11" materialIds="6" castsShadows="true" receiveShadows="true" nonRenderable="true">
<Shape shapeId="2" name="attacherTrigger" kinematic="true" trigger="true" collisionMask="134217728" linearDamping="0.5" angularDamping="0.5" nodeId="12" materialIds="6" castsShadows="true" receiveShadows="true" nonRenderable="true"/>
<Shape shapeId="3" name="roundbale_vis" clipDistance="250" nodeId="13" materialIds="5" castsShadows="true" receiveShadows="true"/>
</Shape>
</Scene>

Expand Down
Binary file modified bales/lavenderRoundbale238.i3d.shapes
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions bales/lavenderRoundbale238.xml
View file
Expand Up @@ -13,8 +13,8 @@
<fillTypes>
<fillType name="lavender" capacity="5000" mass="1000">
<diffuse filename="bales/lavender_bale_diffuses.png"/>
<normal filename="$data/objects/cottonModules/bale_normal.png"/>
<specular filename="$data/objects/cottonModules/bale_specular.png"/>
<normal filename="bales/lavender_bale_normal.png"/>
<specular filename="bales/lavender_bale_specular.png"/>
</fillType>
</fillTypes>
</bale>
Binary file modified bales/lavender_bale_diffuse.dds
View file
Binary file not shown.
Binary file added bales/lavender_bale_normal.dds
View file
Binary file not shown.
Binary file added bales/lavender_bale_specular.dds
View file
Binary file not shown.
10 changes: 10 additions & 0 deletions fillTypes.xml
View file
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<map xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../shared/xml/schema/fillTypes.xsd">
<fillTypes>
<fillType name="ROUNDBALE_LAVENDER" title="$l10n_fillType_roundBaleLavender" showOnPriceTable="false">
<physics massPerLiter="300.00" maxPhysicalSurfaceAngle="0"/>
<economy pricePerLiter="1.00"/>
<image hud="bales/hud_fill_roundBaleLavender.png"/>
</fillType>
</fillTypes>
</map>
6 changes: 5 additions & 1 deletion modDesc.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<modDesc descVersion="77">
<author>Achimobil</author>
<contributor>Agro Tonho</contributor>
<contributor>Agro Tonho, bgo1973</contributor>
<version>1.0.0.0</version>
<title>
<en>John Deere CS 690 And 606SH/608SH Lavender</en>
Expand All @@ -14,6 +14,7 @@ The pressing chamber has been specially corrected for lavender so that the valua
This is a conversion of the <a href="https://www.farming-simulator.com/mod.php?mod_id=272153&title=fs2022">cotton harvester by Agro Tonho</a>.
Feel free to post error messages and suggestions for improvement in the <a href="https://github.com/Achimobil/FS22_John_Deere_CS_690_lavender">GitHub</a>.
This makes the pressed bales with a lower capacity than comparable bales with cotton.
CS690 Specifications:
- Price: $613,000
Expand Down Expand Up @@ -46,6 +47,7 @@ John Deere 608SH:
<de>
<![CDATA[Der John Deere CS690 hat als Baumwollernter gute Dienste geleistet. Aufgrund seiner Kapazität und guten Bedienbarkeit wurde sein Aufgabenfeld auf Lavendel erweitert. Hierzu wurden die Schneidwerke umgebaut um Lavendel in realistischer Größe in 3 bzw 4 reihen zu schneiden.
Die Presskammer wurde speziell für Lavendel korrigiert, damit das Wertvolle Lavendelöl nicht schon beim Pressen auf dem Feld austritt und durch die Pressung wird eine Längere Haltbarkeit der frischen Ernte erreicht, bis diese weiter verarbeitet werden kann.
Hierdurch sind die gepressten Ballen mit einer geringeren Kapazität als vergleichbare Ballen mit Baumwolle.
Dieser ist ein Umbau des <a href="https://www.farming-simulator.com/mod.php?mod_id=272153&title=fs2022">Baumwollernters von Agro Tonho</a>.
Fehlermeldungen und Verbesserungsvorschläge gern im <a href="https://github.com/Achimobil/FS22_John_Deere_CS_690_lavender">GitHub</a> anbringen.
Expand Down Expand Up @@ -124,6 +126,7 @@ John Deere 608SH
<bales>
<bale filename="bales/lavenderRoundbale238.xml" />
</bales>
<fillTypes filename="fillTypes.xml"/>

<vehicleTypes>
<type name="CS690" parent="combineDrivable" className="Vehicle" filename="$dataS/scripts/vehicles/Vehicle.lua">
Expand All @@ -148,5 +151,6 @@ John Deere 608SH
<text name="cs690Lavender"><en>CS690 Lavender</en><de>CS690 Lavendel</de><br>CS690 Lavanda</br></text>
<text name="608shLavender"><en>608SH Lavender</en><de>608SH Lavendel</de><br>608SH Lavanda</br></text>
<text name="606shLavender"><en>606SH Lavender</en><de>606SH Lavendel</de><br>606SH Lavanda</br></text>
<text name="fillType_roundBaleLavender"><en>Lavender Bale</en><de>Lavendel Ballen</de><br>Lavanda Fardo</br></text>
</l10n>
</modDesc>

0 comments on commit cd6dfa9

Please sign in to comment.