58 Commits over 611 Days - 0.00cph!
Sum up the comfort values of different comfort deployable triggers your player is inside of. Previously, only the highest value was taken.
This means that you can place a rug and a bear rug next to eachother and get 75% comfort, when before you would only get 50%. Being next to 2 bear rugs however will mean you only get 50% comfort, the same deployable will not stack.
Started hackweek trying to investigate why standing underneath a bear rug gives you 100% comfort but standing on top of one only gives you 25% comfort. Discovered that the very old CalculateComfort code gave you the most comfort at the edge of the comfort trigger, so moving away from a comfort deployable gave you more comfort - that didn't make sense.
- Comfort is calculated from your closest position to the comfort deployable trigger, not your feet
- Comfort is calculated as a SmoothStep based on the distance you are from the center of the trigger, with minComfortRange forgiveness
- Increased rug.bear trigger size from 1.1 -> 3, base comfort (solo comfort) from 0.25 -> 0.5 on both bear rug comfort trigger spheres
Going further with this branch will likely mean reviewing all comfort deployables and making some comfortSource tweaks. Would like to explore adding up different nearby comfort sources instead of taking max but wary of performance concerns of generating a data structure every ServerUpdate
▉▋▌█▉ ▅█▌▊▊▌▊▅█ █▄▊▍▊▄▉▄▊ ▇▄ ▅▍▆█▄▄, ▊▆▋ ▌▍▋▉▇▋▉▊█▍ ▉▇▊▄▌▅▍ ▌█▍▋█▅██▇▅▅.▇▊▉▅█▇. ▊█▆▄▊▌█▌▊▊ ▋▋▉▍ ▇▇▄▆▅ ▆▍▇▌▇▄▍ ▉█ ▇▌█ ▇▌▆▇█▌ ▌▆▊ ▉▍▋█▋.▋▌▆▋▍
`▄▍▄▌▊.▇▄▅_▅▍▄█_▊▉▍▉▄▊` ▆▅▉ ▊▋▉▍▆▆▆▄ ▅▅▆▊▌▆ ▍▉▆▌▌ ▊▄▇▄▊ - ▊▇▌▄▊▌▊▌ ▇▊▇-▆▉▌█▄ ▌▅▍▌▋▋▋ ▇▍▄▋▋ `██▉▇▋.▍▇▍_█▅▇▇_▉█▇▆▌▋` ▄▇ █ ▋▌▍▇▅▌ ▍▊ ▉▅▉
▉▊▇▊▆ █▊▊▄▉ ▇▊ ▍▍▆▍▊ ▄▆▋██▉ ▆▌▊▇ ▊▋▇▋▄▆▌▌▍▋▉ ▋▆ ▍▋▋▌▄.▋▄
server.printwipeid command to print the wipe id of the .sav
Changed the car radio item inventory move sfx to a more suitable light metal sound rather than the heavy clunky car module sound
█▇▄▄▇▇ `▅▅▄▊_▆▋▋█▋▍▆▇_▅▉▆▉▊█▉_▄▉▇▍▉`'▅ ▆▌▅▅▅▅▉▋ `▊▇▍▍▌▍▉▇▍▉` ▊▌▅ ▇▆ `▇▌▋▉▉.▇▋▌▅▉█▍▍▉▆▊▋▊▉▉▅▇▉▌▉()` ▍▋▊▋ ▆▊ `▍▍▊▋▇.█▉▄█▌▉▋█▇▍▊()` ▋▊ ▍▍▆▊▌ ▄▄▆▍ ▄▉▊▅▄ ▌▍▉▄▇▋▌▆▅ ▊▅▊▊ ▉▅█▊▇▍▍ ▌▇█ ▇▅▉▋▅█▉. █▌▋█▌█▌▍▇ ▍▋▋ ▋▉█▅█▉▄ ██▅ ▊▅▆ ▉█ ▅▍▋▄▋.
`▋▉▅▇▍▆▊▊▊▋.▄▍▅▄▉▌▌▍` ▅▅▄▄ ▅▇▅ ▊▅▇▄▊▍▉ ▍▄▄ ▅█▅▅▆▌█ ▌▊ ▅▋▍ ▅▄▊▆▍▊▌▋▋█ ▋▅ ▇▄▇▊▍▋ █▄▅▄ ▇█▋▋▍▇▉ ▅█▆ █▊▍▇▇▇▄ ▍▄ ▆▇▋▊ ▍▌ ▅ ▉▋▍▍▊▊▋ ▅▊▅▉▅▊▉▅ ▉▍▉▋▊▄▍▆ ▉▋▉▍▍▋▉▋▌ (▍▋▋▌▅▉▉▋▍▌).
▊▅▌▌▆█▄▋▌ ▄▅▅ ▄▉▉▇▆▅▋ ▌▇ ▅█▊ ▆▌ ▌▇▇█▄ ▄▋ ▆▇▄▊▌▆▉▌▄ ▋▊▊▋▋ ▅ ▆▌▇█▄▅█ ▉▋▆▊▇, ▉▋▇▇▄▅█▌▆ █▊▇▌ ▅▍▇▇▋▍█▅▋▄.
▄▍▌▋▋ ▆▊▉▆ ▆█_▆▍▅█_▉▌▅▄█▄▄▄_▌▊▍▄▅▅▄▋▍_▅▅▉█▌▍▄██▄▊
merge from hackweek_car_radio
Car radio can now be picked up with a hammer if you are authorised on the car's codelock (or the car doesn't have a codelock)
merge from hackweek_car_radio
Car radio deploy sfx and impact effects
Prevent car radios being able to be deployed in eachother
car radio deployment is no longer blocked if the modular car is on a road
Merge from hackweek_car_radio
Fixed server / client errors
Remove old and accidental files
Car radio costs 120 metal fragments, the same as the Portable Boom Box
Removed old commented-out code
- WIP audio source setup
- Radio now turns off when the engine turns off
- Setup radio play interactions, sfx and the 3 default stations
Progress on moving over hackweek car radio code to its own class ModularCarRadio as a child entity of BaseVehicleModule and no longer in VehicleModuleSeating.
Commented out old code and got client UI interactions working again. Still needs sound setup
▋▇▉▊ ▆▍▆▄█▉▄▇ ██▄▆█▆▋▋▆▌ ▅▇▉ ▇▊▋ ▅▊▉▆▉▆▆▊▍▉█ ▍▄ ▄▍▆▇▌█▉▄▉█▄▉▌.▇▍▆▅▄▌▇▉.
- ▍▋▄ ▌▋▅▅▇▆.▍▌▋▊▅▌▍▄.▋▌▄▋_▉▅▉▊▋▍▇█_▌▉▉▊█▅▆▅█▄▇ = █.▊▇ (▉▅▋▅▅▄ ▇▄▇▄▆) ▌█▉ █▅▍▆ ▋▌█▇▆▅▅▄▊▋▊▊▉▉▄▅▊▇▍▊▌ > ▇ ; ▅▌▅ ▉▇▊▋▋▋▆
- ▅▄▋▋▍▅▍▉ ▍▄█ ▊▇▊█▊▋▆ ▍▄▆▆█▇▋▉▅▋▌ ▉▆▌▍ █▉█ ▌▆▆███▋▋▍▉-█▉▄▊▌▉▌▊.▄▌▊▇▄▇▄▅▋▇▌▉▊ ▍▅▍▌▉▍▉▊ ▌▉▋ █▅▅▊▋▆▊▊▄▇█▊▌ ▉▅▍█▆▋ (▇▌█▍██▄▌▇ ▊▇▍▅▆▌▍▍▅▇██▋ ▅█ ▇▉█▅▆▇▍▅ ▇▅▆▌▄▆▊▆▊█▇▄▋▇)
▊▉▋██▇█▄ █▍▇: ▍▇▊▊▋▌ `▇▍( !▇▍▄▋▄() ) ▉▄▆▅▇▍;` ▋▍ `▉▊ ( !▄█▌▍▋() || !█▆█▍▇█▆██() ) ▅▊▌▋▉▆;` ▋▊ ▌▊▌█▅▇▊█'▆ █▇▊▉▅▌ ▌▊█▅▉▄ █▊▆ ▉▋ ▍▊▄▄▇▇ ▌█▊▆▄▇ ▇▌▋▉▄▄ ▌▌▍▍▋▍ - ▄▄▅▆▉█▄▊ ▍▇█▄▇▆▄▄ ▌▅▉▊▌▇▅ ▆▌ ▉▇▉ ▇▋▌▍▍▅▍▇▆ ▊▌▆▆ █ ▇▄█▊▅▌ ▄▌ ▄▋█ ▅▅▋▍▌▇▄ ▄█▆▅██▅▆▇▋.
▌ ▅▆▆█▇▍▄▌ ▅▇█▉▉▋ ▄▉▋▍ ▆▇ ▇▆▌▅ ▋▅ ▆▉ ▍▉▍▉▆▍▌▉ (▅▋▋▋▌▍ ▆▋) ▉▌ ▋█ ▇▌▇ ▆▄▇█▌█▄ ▊▆▋ >█.▌ ▉▇▍▆▉▌▉ (▇▄▅█▉) █▄▅ ▉▌▇ ▋ ▆▄▆▊█▍ █▍ ▄▄▄ ▉▄ ▇▄ (▊▇▊▉▅▊▋▉▆)
Landmines now have a 15% chance to explode on being disarmed.
This was always the intended gameplay behaviour but turns out there was a bug that prevented it from exploding. Instead, it previously bugged out and did nothing, allowing the triggering player to walk off
▅▄▇ ▆▄█▊▆▉█ ▇▄█▍ ▍ ▇▅▍▊▅▋ ▄▅▊▅ ▉▇▆▍▍ ▊▊▇▄▌▇ ▄▄▄▄▋▌▋▉ █▇▆█▅█▄▇▍▄▆ ▄▍ ▋▄▉ ▅█▇▉▌ ▊▊█▅ ▊▆▄ ▌▊ ▇▍▇▉▅ ▋▆▌▄ ▉▍▇▋▆▋▋ -> !▇▇▍▉▌▇▉. ▆▋▋▊▌▇▉▅▄█▇▊▇ ▋█▊▇ ▆▇▇ ▌▊▉▍█ ▊▇▆▍▄▆▋ ▄█▅▋█▅█ ▉▉▇ ▌▌▇▉█ ▄ ▍▋▊▇▉▍ ▊▉ ▆▋▆▅▍▆▆▍▅▊▊ ▌▊ ▊▅▆▌▋ ▋█▋ ▊▉▌ ▆▇▇▆█▍.▅▅▋▉▉▊▌▆.▊▇▄▍_▋▋▍_▉▇▆▉█▉▌▅_▅▌▊▅▇▍▉ = ▍.▄█.
▆▉ ▉▅▅▅▉▇▉ ▅██▋, ▌ ▌▌▋▍▄▊▄█▇▍ ▉▊▌█ ▉▇▄▇▍▉▉▆█ ▇▆▄ ▍▅ ▍▊▊▋▅▋▇█▆ ▊▌▇█▌ ▆▉▉█▆▅▋ ▅▅▅█ ▅▇▊█▇ ▊▄▋▌ █ ▊▆▌█▅ ▄▄▅█▉▊ ▄▋▄ ▌▌ ▌▋▌ ▇▌▉▉▆▍▇▋ ▄▍▍▌▊▉ ▇▉▇▋ ▍▅▄▋▄▊▉ - ▌▅▊▊ ▉█▌▆ ▌▉▊▅ ▋▉▉▋▇▍▆ ▉▊▍█▇ █▉▄ ▌▊ ▌▉▋▌▍ █▌▊▅██▄▉▋ ▄▋█▉▆█ ▇▊▋ ▌▅▍ ▍▊▇▅▄ █▄▊▄ ▍▌▇▋▅▊▅▆▉ - ▋█▄▅█ ▉▄▍▋▇▆▆▋▌▊▄▉▆.
▄█▍▋▅▋▋▆.▆▋▌█▄▍▉▄▇▋ ▊▇▉▉▋▍▍ ▆▉▍ ▇▇▍▅ ▉▍▅▆█▋▋▍ ▆▆ ▉▇▇▉▉█▍▅ ▌█▉ ▊▌▉▋▄▌▌▅▋▌ ▌▌▋ ▍▄▌ ▇▊▉▍▊▅▆ ▍█▉▇▊. ▅▄▆▉█▊ ▌▅▊▉ ▇▌ ▌▋ ██▊▉▊▊█▊▊ ▉▆█▌▉ ▊▉▇ "▉▉▆▍▋" ▊▇▇▄▄▍▅▋▆▋▅▍
▌▉▋▆ ▍▅▌ ▊▋▄▋ ▅▄█▍▆▊▉▊ ▌▊▆▉▇▌▉▅▍▋ ▄▄ ▆▉▋ ▊▇▉▍▋▍▊▄.▄▋▇▉▇▊▍▉▄▉▄▊ - ▅▉▍█▇█▍▍ ▍▋▍▉▊▇ ▌▊▊▊▌▊ ▅▉▆ ▌▍ ▇▅▉▍▆▍ █▅▌▉▄▇▅ ▉▆▄▋▅▇▋▌▌▄▌▇ ▌▇▋ ▇▉ ▊▆▄█▄ ▆▇▍▊▌█▇▋▋ ▋▆█▅▉▊▇█, ▍▅▅ █▅▋▊ ▇▉▋▋▇ ▍▋▇▋ █▄ ▊▌██▆█▅▆▄▄█▆, ▅▋▅▅▇▍▆▉▅▊ ▆▇▇ ▋▊█▌▍▍▊▊
▉▆▆▋▅▉▅▅█ ▅▍▌: ▄▆█▇ ▍▌▊ ▆▍ ▊▊▅ █ ▄▅▆▄▌▅▍█▌ █▌▉▄▋▄ ▌▇▄▋ ▍▊█▅▉▌ ▄▋▊ ▉▅ ▌▉▅▇ ▅█ ▍▄▉▄ ▍▇▅▌▊▋▌ ▅▊█ ▊▊▍▆▋▉ ▍▊▅▋▇▇'▍ ▊▉▆█▋▉▊ ▍▇ █▋▍ ▇▇▆▌▅▅
▍▇▅▅_▌▍▌_▉▄▄▋█▍▋▇_▉▊▄▊▅▉▍ = ▅.▄▅, ▄▉█▆ █▄▆▆ ▋▇▊▅▄▆ ▇▉█▆█▇▄. █▄▆▉▊ ██▍▉▄ ▆▅▍▋▇█▇▊ ▄▉ ▆▅▇▋▇▊▋ ▆▊▄▊▋▋▄ ▊█▅ ▋▋▉▋▇ ▆▇█▍ ▄▉ ▄▅▅▊
Fix: FreeUnmanaged the DebrisEntity list after we're done with it
▆▇█▋▄▄▆▉▊█ ▉▌▌▅▆▅ ██ ▋▇▆▅▆▄ ▇▄▉▌█▋█▄▋ ▋▋▌▇▅▍▍
▍▋▄▇▉ ▅▋▄ ▆▍▋ || ▌▋▉▊▉▉▅▆ ▋▆▍▆▍▄▆ ▉▉▊▌▌▌▍▋▊▋ ▅▊▆▄▋, ▉▇ ▌█▆▊▅ ▄▄▄▆ ▄▅▅▄ ▉▅▇ ▇▉▅█▇▅ (▍▌▍▌▌█ ▍▌▅▄ ▊▉██▌▉ ▇▉▉▌▉▋ ▌▉▉▆▍▇▍█▉ ▅▄▊ ▉▇▋▆▅▊). ▅█▍▅ █▉▅▋█ ▋▆▊ ▌█▉▅▄ ▇▇▊█▉▌▊ █ & ▉
█▍▆ ▇▇▄▊▉▇▊▅ ▅█▅▋▅▌▍ ▍▉▄ ▇▆▉ █▍▅█▊▄██ ▄▉▆▋ ▅▊▆ ▇▊ ▉██▋▌ ▊█ █ ▌▉▄▍▉▋ ▄▊▋▌:
▇. ▍▆▌▇_▅▊▄_▌▌▄▄▅▋▉▍ = ▉.▍▋;
▋. ▊▆▊▍_▌██_▉█▌▅▄█▋▍_██▊▄▇▄▋▌ = ▉.█▌;
▇▇▇ ▊▆▅▌▍▆▄
▄▄▊▍▋ ▉▋▅▇▅▆▊ ▄▅▍▄▆▋▋█ ▆▋ ▉ ▋█▆▇▆▄ ▋▌▇▄ ▋▉ ▇.██ ▄▆▊▊ █▉█▍▊█▉▆ ▄▊▍ ▄.▍▆ ▉▍█▉ ▅█▄ ▊▆▌▊▇▊▊▉ - ▌▊█▋▊▇▍ ▆█▉▍▋▌▋▆ █▍▌▆ ▋▉▍▉▄▅▉▌ ▆▉ ▇▇▋▌▊▅ ▍█▇▆▍ ▉▊▄ ▍▆▋▆
▌▄▇▊▉ █▌▍▌▅ █▉▄█▊▊▅ ▅▅▌▅ ▉▆▍▊▉▆▆▍▍▉▋ █▇▄▆▆▊ ▌▆▄▊▆▋▄▋▅▉▍ ▍▍▌▅▌▄ ▆▋█▍▍▆▊
▉█▄▌▊▇ ▋▅▊ ▄▌▍▋▉▉▄ ▄▌█▌▇▆ ▆▄▋▉ ▌▋▌ ▍█▊ ▅▆▍▉▄▉▋▄ ▊▍█ ▆▉▌▅▇▄▍▄▆ █▋▊▇ ▅▍▅▄▉▄▆▊▊ ▆▌█▉▍▍▉▄ █▆ ▇▌▍▉▍▇█▊ ▍▍▅'▅ █▉▊▇▅▇ ▊▉▉▊▋▊ ▇▄▊ ▌▅▍█▆▄█▇ (█▆█▆▋▅▇.▇▋█▄▇▍▌▉▌▆) ▇▍▋ ▊▄▇▅▍ ▊▊▉▍█▍▄▍ ▆▅▅▊▄▍ █▅▇▍▅▆▊. ▋▍▉▅▆▌▅▋ ▊█▌▇ ▇▄▉▌▇▆ █▄▇ ▊▊█▆▅██ ▉▇▅▅ ▌▆▍▊▍▌▆ ▅▌▆'▉ ▋▆▇▋ ▍▍▆ ▍▊▋▆.
▆▄▇▄▌▄▇▊ ▅▇▇ ▋█▄▅▌ ▌█▄ ▆▅▅ ▅▌ ▅▌█▉ ▉▆▇██ ▊▄▌▇▍▍▅ ▋▆ ▄▆█▉▍▊▋▄█ █▊█ ▅▄▍█▍▄ ▊▌ ▄▍▍▍▆▌ ▄▇ ▉▍▉ ▌█ ▍▅▍█▉▍ ▋▋ ▉▌▍ ▋▍█▍▌▌▄▍▉.▍▅▄▆▉▇, ▅▊█ ██▍▋ ▍▆▍▄▄: ▇▄▌▅▉://▅▄▅▆▇.▄█▊▍▉▇▉▋▄.▊▌▆/▌▅▆▄▇/▍▄▄▆▍▌▌▊/▌▊▌▉▍_▆█▄▋▉▄▋██▇.▇█▍
▍▉▍▆▆▋▇ ▊▆▍ ▊▊▋▍█▆▌▍▇ ▋▍█▋▄ █▊▆ ▌▄▉▇▌▍▅▍█ ▊█▆ ▇▇▅▊▍▍▅ ▅▇▋_▉▊▍▇▅▄_█▌▍▌▊█ ▉▊▋▊ ▋.▊▉▄ ▍▉ ▇.▋▄█ ▋▋ ▌▄▆█▍▄▉▌ █▉▌▄█▊▊▊ ▉▌▋ ▉▍▆▅█▊ ▇▋ ▍▇▅ ▆▊▇▊▄▌▉ ▅▉█▅▌ ▅▆▌█ ▉▇ ▍▋▅▅▊▆▌▉▌▋▋▊▆▉ ▉▆ ▆▅▋▋▉▋▄▇▆▆█▅.▄▍▊▆▋█▄▊▄▄▄▄▌█
▄▌█▍ ▆▉▇▍▄▊ ▊▋▋▅▊▋ + ▍▇▌▋█▍▅▉ ▌▌▉▍▅▅'▅ ▋▍▅▋▆▍▆▄▌ ▋▅▍ ▍▊▍▊▍▍▇▅ ▊▅▅▄▅▋▌▅ ▇▄█ ▋▌▉▌▌▊▇ ▇▋▊▇▍▍▇ ▄▅▍▌▆ ▉▍▌▄█▉▋▄▊ ▉▅▅▋ ▌▇▇▄▇▋ ▅▍▊ ▉▉▉▇▆▅▋▄ ▉▍▆▄██ ▍▌▅▇▄▊▊ ▌▊▉▉▅▉ ▍▍▋▅▋▆ ▍▇▇▉▅▇▉▇▉▍▅▍ ▊▇ ▌▇▆▆█▄ ▇▍▋▌ ▍▋▄▊ ▋▅▌▋█▌ █▅▊▇▍ '▍█▆▄ ▌█▊' ▍▋▋▉▊█▋▋▍▄▉█ - ▉█▆▍▉█▅█ █▌▌▋▋▍▇█ ▉▄ ▌▍█▇▋, ▆▌▅█▇▄▋▌█▉ ▆▋ █▋█▋▊
▄▍▍ ▊▌▍▉▇▉ ▄▍▆▋█ ▆▆▌▌ ▊▉▉▆▍ ▉▅█▍▋█ ▌▇█▅▋ █▋▌▉▅█ ▅▆▍▄▅▅▆ (▉▉▆▆▉ █▆▌▋ ▍▇▉ ▇▄▋▍▋▋█▄▍▍█ █ ▇▋▆ ▇▇▇▍▇▄ ▅▇▆▅ ▉▋▄▍▍? ▋▌█▄▋ ██ ▇▆▆▊ ▅▇ ▊▅▌▍)
▆▌▉▉'▍ ▋█▍▇ ▆▅▍▇▅▋▋▍▇▅▍▄▆ ▌▉▍ ▌▊▋▊▋▄▅
▋▉▌▇█▍▄█▆ ▌█▅ ▊▊▄▄▉▋▅ ▉▍▄▊▅ ▌▆▌▅█ ▍▊ ▌▇▉▇▍▅ ▅▆▄ ▋█▋ ▉▉▉ ▆▍▉██▅▄▌/▇▋▌▊▉▆▄▍ ▄▆▅ ▉▋▄▆▄▍▇█ ▄▌▉▆▅▊▆
▄▌▉▍▉▉ ▌▉▅ ▊▅█▊▄▍ ▌▇▉ ▇▍▌▅▊▉█▄▊ ▍▄▌ █▋▄▆ ▆▆▇ ▄▊▊▋ ▆▍▊▌▉▋█▄ ▍▅▋▋ ▊█▌▆▄██▍▌█ ▆▆█▇▇▋▋ █▆▌▋▆▊▅ ▍▊▍ ▇▆▌▄▋ ▊▄▇▌▇▍▇▊▅ ▊▍▋▊ ██▅▇▊▇ █▌▍▍ ▇▌▋▆ :▇▉▅▊:
(▍█▉▉█'▍ ██▋▅▊▊▄ ▇▌▉█▆▋▍▉ ▉▉▌▋▄▍ :▄▊▊▄▄▄▄▍:)
▋▋▋ █▄▌▋▍▇▇ █▅ ▌▊▍▋▌█▉▊▌█ ▌▅ ▉█▄▌▄█ ▅▌▅▍▆▍▄█ ▇▄▅▄ ▊▍▇▇▇▉▇█▋/▋▇▅▋▇▍▊▌▊▋▌. ▌▍▅ ▊▄▌▇▍▊▇ ▅▉▉▌▌▌▋ ▆▄█▉▊ ▋█ █▍▅▍▄▇▊▊▆▆ ▅▊▋▋▆▉▆▇
▆▆▍▄ ▆█▊ ▊▌ ▄▅▇▊▆▊▇▆▆ ▆▇▍█ ▅▇▊▍▊▌▄▊ ▊▄█ ▋▉▌▍▆▉.▇▋▅▌▊▉▊▄.▍▉▋▍▇▍▉▌▌_▅▊█▇▌▋▊▆█▅ >= ▍
▍▋▌ ▇▄▊▍▊▋▊ ▉▋▍▌▋▇.▆▋▇▄▍▌▋▊.▇▋▅█▍▉▉▆▇_▋▄▆▋█▌▊▄▍▅ ▆▊ ▍ (█▉▅█ █)
