Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.2.2] ship floatation logic updates and flying fixes #116

Merged
merged 8 commits into from
Jul 18, 2024
Merged

[2.2.2] ship floatation logic updates and flying fixes #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0d3c17
- Add custom height support for vehicle floatation, vehicles can be c…
zolantris Jul 11, 2024
8a135c9
- add some custom colliders for convex meshes that need concave colli…
zolantris Jul 14, 2024
e607a62
Move VehiclePiecesController monobehaviors into Custom variants and c…
zolantris Jul 14, 2024
f683ca8
fix hull prow, ignore prow keel colliders, and add custom box collide…
zolantris Jul 15, 2024
10d8651
remove the double Custom/Piece references and use the JVL_Custom/Piec…
zolantris Jul 18, 2024
0494ae7
Add an experimental flag to prevent ship jitters for players that are…
zolantris Jul 18, 2024
258859d
Add guard for piece sync so it does not apply while flying which need…
zolantris Jul 18, 2024
ae70223
Make player use joint sync if they are flying regardless of DesyncedJ…
zolantris Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/ValheimRAFT/AssetBundle/AssetBundle
View file
Open in desktop
Binary file not shown.
4 changes: 1 addition & 3 deletions src/ValheimRAFT/AssetBundle/AssetBundle.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
ManifestFileVersion: 0
CRC: 221614854
CRC: 3416738337
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: valheim-raft
Dependencies:
Dependency_0: valheim-vehicles-shared
Dependency_1: valheim-vehicles
Info_1:
Name: valheim-vehicles-shared
Dependencies:
Dependency_0: valheim-raft
Dependency_1: valheim-vehicles
Info_2:
Name: valheim-vehicles
Dependencies:
Expand Down
Binary file modified src/ValheimRAFT/AssetBundle/valheim-raft
View file
Open in desktop
Binary file not shown.
27 changes: 13 additions & 14 deletions src/ValheimRAFT/AssetBundle/valheim-raft.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ManifestFileVersion: 0
CRC: 2550324663
CRC: 1066052378
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 65a17c8c40273297a444fbd796839783
Hash: 16415052085ae4d12098a5be7d61f596
TypeTreeHash:
serializedVersion: 2
Hash: b14c0469088ad3fc0572cdc4f2350ceb
Hash: cf00480c8b9c76a7d0180d5f6a376b7d
IncrementalBuildHash:
serializedVersion: 2
Hash: 65a17c8c40273297a444fbd796839783
Hash: 16415052085ae4d12098a5be7d61f596
HashAppended: 0
ClassTypes:
- Class: 1
Expand All @@ -33,25 +33,25 @@ ClassTypes:
- Class: 65
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3}
Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 120
Expand Down Expand Up @@ -120,5 +120,4 @@ Assets:
- Assets/ValheimVehicles/Prefabs/dirt_floor.prefab
- Assets/ValheimVehicles/Texture/sail.png
Dependencies:
- C:/Users/fre/dev/repos/ValheimMods/src/ValheimRAFT/AssetBundle/valheim-vehicles
- C:/Users/fre/dev/repos/ValheimMods/src/ValheimRAFT/AssetBundle/valheim-vehicles-shared
Binary file modified src/ValheimRAFT/AssetBundle/valheim-vehicles
View file
Open in desktop
Binary file not shown.
Binary file modified src/ValheimRAFT/AssetBundle/valheim-vehicles-shared
View file
Open in desktop
Binary file not shown.
15 changes: 11 additions & 4 deletions src/ValheimRAFT/AssetBundle/valheim-vehicles-shared.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ManifestFileVersion: 0
CRC: 1184932895
CRC: 3995961022
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: e8b7b2373191b121f59e9f76e70b212e
Hash: 1c011d5dd6e88b9ca4421faf74edd231
TypeTreeHash:
serializedVersion: 2
Hash: 0e971d6ec910fda0a941f7ca640159c0
IncrementalBuildHash:
serializedVersion: 2
Hash: e8b7b2373191b121f59e9f76e70b212e
Hash: 1c011d5dd6e88b9ca4421faf74edd231
HashAppended: 0
ClassTypes:
- Class: 1
Expand All @@ -36,22 +36,28 @@ SerializeReferenceClassIdentifiers: []
Assets:
- Assets/ValheimVehicles/Texture/dirtfloor_d.png
- Assets/ValheimVehicles/Material/wood_piece_bg_wood.mat
- Assets/ValheimVehicles/Material/wood_piece_valheim_2x2.mat
- Assets/ValheimVehicles/Texture/dirtfloor_n.png
- Assets/ValheimVehicles/IconsDeprecated/rope_anchor.fbx
- Assets/ValheimVehicles/Texture/wood_59_diffuse_256_normal.png
- Assets/ValheimVehicles/Texture/Planks5c_low_n.png
- Assets/ValheimVehicles/Texture/iron.png
- Assets/ValheimVehicles/Shaders/VehicleDoubleSidedShader.shader
- Assets/Horem/Mocks/Shaders/Standard TwoSided.shader
- Assets/ValheimVehicles/Texture/blackmetal_d.png
- Assets/ValheimVehicles/Texture/rope_d.png
- Assets/ValheimVehicles/Texture/iron_n.png
- Assets/ValheimVehicles/Material/RopeMat.mat
- Assets/ValheimVehicles/Material/wood_piece_valheim_2x4.mat
- Assets/ValheimVehicles/Texture/wood_59_diffuse_256.png
- Assets/ValheimVehicles/Texture/blackmetal_n.png
- Assets/ValheimVehicles/Shaders/Custom_Vegetation.shader
- Assets/ValheimVehicles/Texture/rope_n.png
- Assets/Horem/Mocks/Shaders/Custom_Piece.shader
- Assets/ValheimVehicles/Texture/Planks5c_low.png
- Assets/ValheimVehicles/Icons/pirate_skull_uncompressed.png
- Assets/ValheimVehicles/Texture/Planks5_Normal.png
- Assets/ValheimVehicles/Shaders/DirtfloorShader.shader
- Assets/ValheimVehicles/Prefabs/bottom_stand.prefab
- Assets/ValheimVehicles/Material/wood.mat
- Assets/ValheimVehicles/Material/wood_piece_valheim.mat
Expand All @@ -60,8 +66,9 @@ Assets:
- Assets/ValheimVehicles/BlenderImports/shturval_edit2.FBX
- Assets/ValheimVehicles/Shaders/VehicleSailShader.shader
- Assets/ValheimVehicles/Material/iron.mat
- Assets/Texture2D/Noise.png
- Assets/ValheimVehicles/Material/iron_metal.mat
- Assets/Material/woodwall.mat
- Assets/ValheimVehicles/Material/iron_metal_no_tiling.mat
Dependencies:
- C:/Users/fre/dev/repos/ValheimMods/src/ValheimRAFT/AssetBundle/valheim-raft
- C:/Users/fre/dev/repos/ValheimMods/src/ValheimRAFT/AssetBundle/valheim-vehicles
12 changes: 5 additions & 7 deletions src/ValheimRAFT/AssetBundle/valheim-vehicles.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ManifestFileVersion: 0
CRC: 4020482301
CRC: 2026882048
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 6a80a8738d377b7861078809eff727f4
Hash: 7cff7027d87f5af81b318b027343fe64
TypeTreeHash:
serializedVersion: 2
Hash: c06587813f50b4ac49249ee2d68a3382
IncrementalBuildHash:
serializedVersion: 2
Hash: 6a80a8738d377b7861078809eff727f4
Hash: 7cff7027d87f5af81b318b027343fe64
HashAppended: 0
ClassTypes:
- Class: 1
Expand Down Expand Up @@ -100,17 +100,15 @@ Assets:
- Assets/ValheimVehicles/Prefabs/ram_blade_top.prefab
- Assets/ValheimVehicles/Prefabs/hull_rib_iron.prefab
- Assets/ValheimVehicles/Prefabs/steering_wheel.prefab
- Assets/Shader/Custom_Piece.shader
- Assets/ValheimVehicles/Prefabs/hull_rib_wood.prefab
- Assets/ValheimVehicles/Prefabs/hull_wall_wood_2x2.prefab
- Assets/ValheimVehicles/Prefabs/hull_wall_wood_4x4.prefab
- Assets/ValheimVehicles/vehicle_icons.spriteatlasv2
- Assets/ValheimVehicles/Prefabs/mechanical_switch.prefab
- Assets/ValheimVehicles/Prefabs/hull_rib_corner_right_iron.prefab
- Assets/ValheimVehicles/Prefabs/GUI/hud_anchor.prefab
- Assets/ValheimVehicles/Prefabs/shared_hull_slab_2x2_worn.prefab
- Assets/ValheimVehicles/Prefabs/hull_rib_corner_right_iron.prefab
- Assets/ValheimVehicles/Prefabs/custom_sail.prefab
- Assets/ValheimVehicles/Prefabs/hull_window_wood_4x4.prefab
- Assets/ValheimVehicles/Prefabs/custom_sail.prefab
- Assets/ValheimVehicles/Prefabs/shared_rudder_advanced_double.prefab
- Assets/ValheimVehicles/Prefabs/rudder_advanced_single_wood.prefab
- Assets/ValheimVehicles/Prefabs/shared_rudder_advanced_single.prefab
Expand Down
2 changes: 1 addition & 1 deletion src/ValheimRAFT/Thunderstore/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ValheimRAFT",
"version_number": "2.2.1",
"version_number": "2.2.2",
"website_url": "https://github.com/zolantris/ValheimMods/tree/main/src/ValheimRAFT",
"description": "ValheimRAFT - a water vehicles mod for valheim. V2 has new hulls,walls,slabs.",
"dependencies": [
Expand Down
1 change: 1 addition & 0 deletions src/ValheimRAFT/ValheimRAFT.Patches/PatchController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ internal static void Apply(string harmonyGuid)
Harmony.PatchAll(typeof(ZNetScene_Patch));
Harmony.PatchAll(typeof(ZNetView_Patch));
Harmony.PatchAll(typeof(Hud_Patch));
Harmony.PatchAll(typeof(VehicleMovementPatches));


// #if DEBUG
Expand Down
50 changes: 0 additions & 50 deletions src/ValheimRAFT/ValheimRAFT.Unity/Assets/Shader/Custom_Piece.shader
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/ValheimRAFT/ValheimRAFT.Unity/Assets/ValheimVehicles/Material/boat_wood_worn.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: boat_wood_worn
m_Shader: {fileID: 4800000, guid: 377825f654969ee4ca04134ef7f10cef, type: 3}
m_Shader: {fileID: 4800000, guid: 5a017bb1d1e8f7142bcb05f77a8be48e, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
Expand Down
2 changes: 1 addition & 1 deletion src/ValheimRAFT/ValheimRAFT.Unity/Assets/ValheimVehicles/Material/stake.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stake
m_Shader: {fileID: 4800000, guid: 377825f654969ee4ca04134ef7f10cef, type: 3}
m_Shader: {fileID: 4800000, guid: 5a017bb1d1e8f7142bcb05f77a8be48e, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
Expand Down
2 changes: 1 addition & 1 deletion src/ValheimRAFT/ValheimRAFT.Unity/Assets/ValheimVehicles/Material/stake_iron.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stake_iron
m_Shader: {fileID: 4800000, guid: 377825f654969ee4ca04134ef7f10cef, type: 3}
m_Shader: {fileID: 4800000, guid: 5a017bb1d1e8f7142bcb05f77a8be48e, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
Expand Down
2 changes: 1 addition & 1 deletion src/ValheimRAFT/ValheimRAFT.Unity/Assets/ValheimVehicles/Material/wood_piece.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: wood_piece
m_Shader: {fileID: 4800000, guid: 377825f654969ee4ca04134ef7f10cef, type: 3}
m_Shader: {fileID: 4800000, guid: 5a017bb1d1e8f7142bcb05f77a8be48e, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
Expand Down
2 changes: 1 addition & 1 deletion src/ValheimRAFT/ValheimRAFT.Unity/Assets/ValheimVehicles/Material/wood_piece_valheim.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: wood_piece_valheim
m_Shader: {fileID: 4800000, guid: 377825f654969ee4ca04134ef7f10cef, type: 3}
m_Shader: {fileID: 4800000, guid: 5a017bb1d1e8f7142bcb05f77a8be48e, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
Expand Down
2 changes: 1 addition & 1 deletion src/ValheimRAFT/ValheimRAFT.Unity/Assets/ValheimVehicles/Material/wood_piece_worn.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: wood_piece_worn
m_Shader: {fileID: 4800000, guid: 377825f654969ee4ca04134ef7f10cef, type: 3}
m_Shader: {fileID: 4800000, guid: 5a017bb1d1e8f7142bcb05f77a8be48e, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
Expand Down
27 changes: 2 additions & 25 deletions ...eimRAFT/ValheimRAFT.Unity/Assets/ValheimVehicles/Prefabs/hull_rib_corner_left_iron.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ GameObject:
- component: {fileID: 7596944948155091688}
- component: {fileID: 5663530037382696221}
- component: {fileID: 8336341135229508172}
- component: {fileID: 3670978125757728705}
m_Layer: 10
m_Name: iron_brace 5
m_TagString: Untagged
Expand All @@ -60,8 +59,8 @@ Transform:
m_GameObject: {fileID: 8882276798005044018}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.0042811036, y: -0.027901173, z: -4.0014315}
m_LocalScale: {x: 1, y: 1, z: 0.01}
m_LocalPosition: {x: 0.0042811036, y: -0.035, z: -3.982}
m_LocalScale: {x: 1, y: 1.01, z: 0.01}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1741468856471499102}
Expand Down Expand Up @@ -116,28 +115,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &3670978125757728705
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8882276798005044018}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 6320000259446333544, guid: 66815e8fb7eb7d74c84347705ef587c4, type: 3}
--- !u!1001 &2863819340376293423
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
Loading
Loading