14,925 Commits over 2,649 Days - 0.23cph!
Merge from swimming_dithering_fix
Potentially fixed a few issues with swimming animation dithering, had to change some swimming behaviour
Player now starts swimming if there is 1.17m of water above their feet and will stop swimming once the water is below 0.9m, this means you cannot start swimming by ducking as the measurement is from feet level
When a player is swimming the server will no longer send a water level that triggers the standing animation if the player is still considered swimming, preventing dithering between standing and swimming
This will affect movement in shallow water, players will now take slightly longer to start walking when swimming towards the shore
S2P ferry terminal and radtown
Don't allow car lift to grab a car if any animals are mounted
Wool can now recycle into cloth, 5 each
Removed hqm (300-800) from ranch sales, replaced with high quality metal ore (30-50)
Increased threshold of SAR to 0.5
Livestock eating from a trough now takes calories of the food into account
Makes high calorie food like bread 6x more effective for feeding animals
WIll make low calorie food like worms less effective
Also accidentally fixed livestock being able to eat spoiled produce (as it doesn't have calories)
Doubled lifetime of adult cow/sheep (was 24h, now 48h)
Changed "Chicken Food" label in inventory to "Livestock food"
Beef pie and rich beef pie now lasts 120m (was 30m)
Mutton pie is now shepherds pie
Added a potato to the requirements
Double calories from all milk products
Triple hydration from all milk products
Don't allow players to unmount animals from a car if there is no navmesh
If a player does somehow unmount an animal into a space with no navmesh just kill them
Added analytic hook locations TODOs
Merge from legacy_anim_deletes_oct_2026
Removed 75 animation files and overrides, around 47mb worth
Mostly legacy hold types
Cleaned orphaned data in player animation controller
Updated cleanup tool to also clean out orphaned references in override controllers
Added new tool Tools/Animation/Remove Orphaned Sub Assets
Finds orphaned assets on animation controllers that Unity apparently just keeps around after you delete things?
Could also have been caused by bad merges
Cleaned out Scientist2.anim, RidableHorse, v_mini_crossbow.anim, snowballgun.anim, v_food_pies.anim
Fixed boomerang waiting to catch animation still using old player model animation
Once removed old boomerange animations were no longer referenced, removed them
Double baseline dung production speed of cow and sheep (was every 40m, now 20m)
Fixed a long standing dung production bug on horses that was inadvertedly increasing their dung production x10
Adjusted horse dung produced per calorie to 0.2, was 0.1
A well fed horse should now produce ~48 dung/day (was 240)
A well fed livestock animal should now produce ~72 dung/day (before any gene increase/decrease)
Merge from deep_sea_teleport_fix
Possible fix for players being left behind when a boat they are on transfers to/from the deep sea and they were standing too close to a wall
Also add null checks when spawning the deep sea so we can spawn a quick, empty deep sea in the editor
Animals are now dismounted when the vehicle they are on rolls or ends up submerged
Updated sales charts for livestock selling
Can now receive random reward that could include Turret, HQM, LGF, Semi rifle, Scrap, Saddles, Rope, Blue cards, Tarps, CCTV, Targeting computer and frags
Updated wool chart to match for now, will likely need a further revision
Cows now harvest for 30 cloth, 100 leather, 100 bones, 20 beef, 40 fat
Sheep now harvest for 10 cloth, 20 leather, 50 bones, 12 mutton, 20 fat + whatever wool they had on them at the time of death
Hooked up new animal icons
Set all animal avatars to 1024, was 2056
Item icons for milk drink interaction
S2P ferry terminal, radtown and oil rig
Merge from main
Had to text merge all the Test fixture/runner merges as semantic merge hates those files for some reason
WIll need to S2P some monuments
▅▇▅▆▍▆ █▌ ▊▄ █▆▅▊▍█▌ ▇▇▉▇ █▄▊▄▋ ▅▍▌▍ ▌▌▉ ▅▊▇█ ▇▊▉▄▆▋ ▌▉▆▊ █▆▍▇█▅▅▌▊ ▆▉ ▅ ▅▄▉▍▊▆▊▊▄ ▍▉▍▉▋▋█▄▋▅▅▌▅▋ ▋▍ ▉▇▊▇▇▄▄▍▅ █▉▉▇▄▊▍ ▊▊█▋▍▌▋ ▇▋▋▍ ▅█▇▄▆▌
Chicken eggs are now dropped flush with the terrain and with phsyics disabled (if terrain can be found)
Possibly fixes eggs sometimes falling through terrain and getting killed by OOB
Hooked up mount/dismount animations for cow
Fixed cow using croc protection
Hooked up temp icons for new pies
Added visual food entries for the cooking workbench for the new pies
Swapped icon for milk interaction
Removed the list of ovenCookingFlagItems from CookingWorkbench, replaced with a new ItemModCookingWorkbench
Makes it easier to setup new items and removes a big string comparison client side
Swapped the eat sfx for drink on milk
Shave two pixels off each category button in the crafting menu, fixes categories overflowing
Harvesting a sheep will now reward you with the wool that was on it at the time of death
Fixed server compilation causing the visible lead mechanic not working in builds
Lambs no longer drop dung (syncs them up with calves)
Fix sheep not dropping dung
New mutton pie with rich version
Increases the speed that livestock animals bond to the player, also prevents bulls from charging
Regular pie halves time to reach Bonded status (can be led), rich pie reduces takes another 30s off the time it takes to reach bonded
New beef pie
Increases the maximum amount of food that can be consumed by a player for a duration by +75% (875 calories)
More food = more chance to recover when downed, if hunger bar is full after eating a beef pie recovery chance is 75% (calculated after medkit which still guarantees recovery)
Also included a rich verison, can go up to 1000 calories and takes recovery chance to 100%
Don't show the mount animal prompt if no animal is being led by the player
Allow a mounting slot to control which animal type it supports (large/small)
Cows no longer fit in the small flatbed, need to use the large flatbed
