commit 409d4d96ead69028a164274637d23e350acb73fb
Merge: 95169f539 26e89c63d
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Mon Mar 11 15:13:27 2019 +0200
Merge branch 'dev' of github.com:Regalis11/Barotrauma into dev
commit 95169f53937f9a7e168a884171eaa21ae7f08023
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Mon Mar 11 15:13:11 2019 +0200
Modified: ServerMessage structure to allow _ ; in player & submarine names
commit 26e89c63dc8da771aea9f09978a630a6cff60a6f
Merge: b7646d06d fb0b821bc
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 14:42:44 2019 +0200
Merge branch 'kuraiookami-logicExpantion' into dev
# Conflicts:
# Barotrauma/BarotraumaShared/SharedContent.projitems
commit fb0b821bc97891cdeec8f2c740a12119696393ea
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 14:41:21 2019 +0200
Use invariant culture when parsing floats or converting them to strings in signal components
commit f0c8afba934b41358cf5d59a22b87caf33f98a61
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 14:00:44 2019 +0200
Update new signal components to use identifiers & added names and descriptions to the text file, use invariant culture in equalscomponent, memorycomponent doesn't require the signals to be floats
commit 674d9ec804fc4770b602d4b09240b08cafc8ccec
Merge: 3ea33fb54 242e2429f
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 12:01:27 2019 +0200
Merge branch 'logicExpantion' of https://github.com/kuraiookami/Barotrauma into kuraiookami-logicExpantion
# Conflicts:
# Barotrauma/BarotraumaShared/BarotraumaShared.projitems
# Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml
# Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml
# Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
# Barotrauma/BarotraumaShared/Source/Items/Components/Signal/AdderComponent.cs
commit b7646d06d53fb05227276e6286d0e15da5dc9080
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 11:37:33 2019 +0200
Re-enabled multiplayer campaign
commit cf7258f6410a5995c881ec6e95eb9def5cd90ad4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 11:28:48 2019 +0200
Fixed item interfaces getting repositioned every frame when the editing HUD is open. Closes#1212
commit e8906239c779cf71de694bc65c81058e5cae16ef
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Mar 11 11:12:05 2019 +0200
Fixed VoipCapture creating new "could not start voice capture" popups constantly if there's no suitable capture device. Closes#1262
commit a30f47fbe47fde4fccb0453c1773a76d730d226b
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun Mar 10 19:04:59 2019 +0200
Disable audio instead of crashing if no audio device is found. Closes#1214
commit 242e2429fd2c3ed199ac26b55e2cbdc8636e73f9
Author: Darkwolf <Darkwolf0101@gmail.com>
Date: Mon Jan 21 21:26:57 2019 -0600
Expansion of Barotrauma's logic system.
Changed:
- AdderComponent and children can clamp their output
- Powercontainer signals for charge,charge% and charge rate
Added:
- ColorComponent: Dynamic signals for light set_color inputs
- MemoryComponent: Stores and sends a signal that is edge latched
- DivideComponent: Standard division
- MultiplyComponent: Standard multiplication
- SubtractComponent: Standard subtraction
- XorComponent: Exclusive or
- EqualsComponent: Equals comparison
- GreaterComponent: Greater than comparison
commit 7245c721339885d062567befc052a592391b3b4a
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun Mar 10 15:22:31 2019 +0200
Fixed StatusEffects only applying afflictions to one limb even if the target is "Character" instead of "Limb", added a subtle screen distortion effect to heavy radiation sickness. Closes#1256
commit e0db27e62ec9546fd4b182a0cc97f7e5830645ae
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 21:53:51 2019 +0200
Fixed WrapText adding unnecessary spaces after every line break. Closes#1215
commit 988bc58d51c195ad9265b84a1e97e0101cd3f808
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 21:12:50 2019 +0200
Fixed crashing when attempting to create a body for a wall section that's less than 1 unit long (e.g. if a wall that's just slightly longer than the wall section size receives damage).
commit 8c31157425a9e2ec02312618d1bfa359ab3ee87d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 20:30:44 2019 +0200
Fixed clients being unable to toggle the respawn shuttle on/off
commit a4ccb039219830efe9cd305c26942dda1bd04e9c
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 19:33:22 2019 +0200
Fixed inability to select the respawn shuttle as a client host
commit b89b2d2c282d8c74d7ccd37b3f29dcab51eff680
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 19:32:41 2019 +0200
Made it possible to edit the style of the ListBox under GUIDropDowns, increased the opacity of the listbox to make the contents more readable when there's text behind it
commit 8f6d9aef3d637fe37a18c78f4b15ef8fd266374e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sat Mar 9 18:11:23 2019 +0200
Fixed NetLobbyScreen not showing the names of the submarines the client doesn't have
commit 18b4bacd5bb645f36f62e77587af971cb789d37c
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date: Fri Mar 8 13:04:51 2019 +0200
Added a beginner level sub
commit eef09f7d07cde64d1f2f6971eda733505339a0c0
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 19:05:14 2019 +0200
Remove the old sprite when recreating the sprite.
commit a6c3ce00782882bc14f200f95abab0fa4d5d9a2d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 19:04:51 2019 +0200
Fix gender specific wearables not refreshing when we change the gender.
commit f606b801dac9e4cbb4238506ff4d73981709a2f8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 18:42:14 2019 +0200
Move some console commands from the shared project to the client. These should not be debug only, because they might be useful for modders too.
commit 154251c183eacf37e92fa7b27bb6d57bb15797d8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 14:42:22 2019 +0200
Disable latchonto ai for now.
commit bdbcef41bfbc42beeb2d942e7db431b8ab627f1c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 13:31:02 2019 +0200
Simplify the sprite related commands.
commit 49c8e1cd01953ae31cff99bf35432ab887b45d62
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 13:05:20 2019 +0200
Rename "Reload Texture" button as "Reload Sprite", because it actually reloads both the xml and the texture. Add the button text into the localization file.
commit 84f58d9e0bb46f29412f936d569348e46227c9d5
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 12:50:51 2019 +0200
Add the option to reload xml/texture/both for items when they are hovered over with the mouse. dry.
commit 732084c044e6a2c220cee8d5c1d9b5e4ce05587d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 12:48:49 2019 +0200
Fix the sprite name of the right hand in the assistant job gear.
commit 30344369d7e87a17312cc839f195c36c77c4a3b2
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 12:26:20 2019 +0200
Fix ReloadXML failing when multiple source elements are found.
commit ddb6fb48b6e0789b18a1ea889dcdf408fcbb5b12
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 11:47:13 2019 +0200
Fix damagemodifier multiplier not applied on particles if no sound is played.
commit 41206013be41d240b12dad48f4ddaba9b072742b
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Thu Mar 7 11:46:22 2019 +0200
Fix engigear lower arm sprite name.
commit 8ce938305206ca65aeb00515639e799d9f2fd526
Merge: e6166d2ef 61703e8af
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Mar 6 18:53:36 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit e6166d2ef24489bac6f217211849884013dbf4e6
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Mar 6 18:53:30 2019 +0200
Implement husk sprite overlays as wearables. Add new husk injector (wip).
commit 367c4f5b3784c65c3c26807dd6c10e837960c6bb
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Mar 6 18:52:15 2019 +0200
Add console commands for changing the gender and race of the character.
commit 61703e8af274c8f5d9e05575ebaf13c9bde8855f
Author: Iiro Enges <iiro@fakefish.fi>
Date: Wed Mar 6 17:47:09 2019 +0200
Refined environment item scales and colors
commit 5d2c9f2e19d9d876d606415667f56c1f92fd1b8f
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Mar 5 19:35:34 2019 +0200
corrected cases
commit cd9cf4ed3117b9a5cc4cb57428d8dc11d756d274
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Mar 5 19:01:54 2019 +0200
updated settings
commit 84ad07149a8e56d59fd2d71b34fbb92479eba042
Author: Iiro Enges <iiro@fakefish.fi>
Date: Tue Mar 5 18:48:26 2019 +0200
Added an updated title text
commit 0ae68b0857ee259cac1480cb20a9c02f3bb88d8d
Author: Iiro Enges <iiro@fakefish.fi>
Date: Tue Mar 5 18:46:59 2019 +0200
Replaced old alien ruin textures with new ones (more variants to be added)
commit b57a6765f56ea1504ff5b39b14172f73b4122597
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 17:44:46 2019 +0200
Fixed particle jitter caused by a bug in the interpolation logic (was especially noticeable when the sub is moving fast)
commit e6715d605db9bb1d608e4a4990ac41f6214f61d1
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 17:22:31 2019 +0200
Fixed the "control" console command not being usable by clients, changed the way arguments are given to the "setclientcharacter" command (no semicolon to separate the names, quotation marks have to be used for multi-word names just like with any other command). Closes#1224
commit acb7c1e0dc05bf619e7ec4875196cc45647d3fb4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 16:30:38 2019 +0200
Steam Workshop fixes:
- Install content packages for items that only contain a sub. Otherwise the system can't determine if the item has been updated (and might also be useful for toggling off incompatible subs when switching from mod to another).
- Log an error instead of crashing the game if CheckWorkshopItemEnabled or CheckWorkshopItemUpToDate fails due to a missing filelist.xml.
- Show a messagebox when a workshop item is updated succesfully.
commit b2e8ed565bc03f466930799268c13b2fca4bb9c9
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 14:43:42 2019 +0200
Fixed nullref exception when disabling a workshop item that doesn't have an update button (or when enabling the item fails)
commit 26f1f285cd80ca6f023b12e6dd80dc71e87ee9c3
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 14:15:14 2019 +0200
Fixed console command aliases not being taken into account in GameClient.HasConsoleCommandPermission (meaning that the client needed a permission for each name variant of a command, making it impossible to for example use "fixwalls" instead of "fixhulls"). Closes#1225
commit dee02de681a212efd0e0a82c14619f3fe4839cc4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 13:35:48 2019 +0200
Fixed traitor rounds failing to start if there's no owner client, fixed occasional "traitorCount somehow ended up less than 1" errors due to Rand.Int using 0 as the minimum value. Closes#1217
commit bbc4a31aa83572258226f303ab767f8546de64fb
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 13:08:38 2019 +0200
Fixed missing item names in the extra cargo menu. Closes#1218
commit dd18bd163e05e8ba4718c0e98083e50ef0a0157e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 13:04:54 2019 +0200
Fixed a compiler error in RespawnManager
commit 904700eda3e4da5468208bd7553a803e9f41234e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Mar 5 12:56:29 2019 +0200
Autorestart/spectating fixes (closes#1219):
- The server owner and spectators don't trigger autorestart.
- The owner is allowed to spectate even if spectating is disallowed in server settings.
- Fixed "play yourself" always toggling to true when a round ends.
commit 9710612256875d5a788fb34371ca8ea6dd61b749
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Mar 5 10:10:25 2019 +0200
dropped the point at which damage sprites appear slightly.
commit 2ad9b5de40f128e8413f1ad5f568a4bc006d0971
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 20:11:41 2019 +0200
v0.8.9.3
commit 2d64da9d1e0d10f9ccb08d6e3fbc45d69fcda368
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 18:08:10 2019 +0200
Randomize the races and the heads in the net lobby. TODO: remember the previous heads and check that the next in line is unique (not exactly the same as the current).
commit 09f74ab37692291ca070bac5dbc53eef395fb1cf
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 16:30:16 2019 +0200
AI characters can give treatment to characters who aren't unconscious, fixed AI characters attempting to treat dead characters. Closes#1083
commit a8fea2450cf4ef0b80a8fc809aee339bc39b28c6
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 16:28:23 2019 +0200
Fixed horizontal docking ports failing to find the hull prefab
commit dd5a7a4f09195ecfeb82605e1e73ea22607694e7
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Wed Feb 6 16:02:52 2019 +0200
halved the hitpoints for baby moloch
commit 92ae260558ece991560d83819168ef51d5267a66
Merge: 75fe087d7 8f451825e
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 15:44:08 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 75fe087d7263b46611fb0aad5c91c616e22ad41b
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 15:43:12 2019 +0200
Update the ai block in the moloch boss config file.
commit caf11944294dfe66b5d302888baecbfddad7293a
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 15:42:42 2019 +0200
Remove the lowercase version of the moloch boss config file.
commit b422feece1e620c427fa62d41c2b847b6b8837e9
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 15:41:40 2019 +0200
Fix molochbaby character name in the config file.
commit 913762516dd17921c185de2cb912333f2e5230dd
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 15:41:22 2019 +0200
Include the baby moloch files in the project.
commit 8f451825e95b415b1262f984d83828c379d36ea2
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 15:36:50 2019 +0200
Added molochbaby to the project file
commit 2078307f255f432c19fcbbc0b690acf5655f3c99
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 15:33:08 2019 +0200
Disable creating humanoids in the wizard for now, because it can go wrong in so many ways.
commit 55a931795ac5f60699033c4ff484a9a2d0ae9b7e
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 15:32:18 2019 +0200
Unfreeze when adjusting the joint scale, because the limbs are not otherwise updated to the joint positions.
commit 2c92373ccbf331c545c830c9780f450b116f0359
Author: Iiro Enges <iiro@fakefish.fi>
Date: Wed Feb 6 15:28:22 2019 +0200
Tinted baby moloch to differentiate from the adult version (for testing purposes)
commit f05be351cdf8a6073702e988ed1861f665399048
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 15:26:52 2019 +0200
Fixed automatic temperature control setting turbine output above 100 if the power consumption is higher than what the reactor can generate. Caused "failed to write an event for the entity" errors in MP when the server tried to write the targetTurbineOutput using WriteRangedSingle with a maximum value of 100. Closes#1085
commit 7b737ebbea41fd5b7825a6c6373e578c1b1c91fd
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Wed Feb 6 15:15:59 2019 +0200
Baby moloch, doo doo doo doo doo doo
commit f5d13649915ba761bbc6fe78370c607905e2d5f8
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Wed Feb 6 15:15:04 2019 +0200
Small fixes and tweaks to gun performance dependent on skill of user.
commit 4bf61738c6da08d771dedf1c96160cc76e0b4dd7
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Wed Feb 6 15:14:11 2019 +0200
New staggered swarm medium difficulty event
commit 3e593f46850987ba074d9b26d59d08eeeddd1d70
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 15:05:43 2019 +0200
Removed incorrect item name/description instructions fron EnglishVanilla.xml. Correct instructions are at the beginning of the file.
commit ce33a523e440a5b5037b84ca96bebf1f977e0aa8
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 15:00:48 2019 +0200
Attempt to fix "attempted to move pull joint extremely far" errors (#895). I think they were (at least for the most part) caused by characters switching to simple physics mode and then moving a significant distance, and when the character switched back to normal animation, the pull joints were still somewhere far away and lerping them to the position of the collider failed (because the lerped position triggers the error).
commit c8212e3eff6d9272c9d38b833743b0f33b3611a2
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 13:54:15 2019 +0200
Fixed nullref exception when teleporting from a sub to ruins or vice versa. Closes#1037
commit 0d812394944eb05be4291be7b56593cc4def6d0f
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date: Wed Feb 6 13:34:58 2019 +0200
Made regular ruin walls much more durable (500 -> 5000)
commit c9a4d9d6f6c9c767ecd8cf34f917db9da852f4bf
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date: Wed Feb 6 13:34:26 2019 +0200
Rebalanced Humpback battery grid, added toggles for using backup power
commit 47617a6d54f933714dffeca5fa311776e9d0523c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 13:17:57 2019 +0200
Remove the lowercase variant of moloch's config file from the source control.
commit 640662835684464e4a66b106b1958e5a9fde8a0c
Merge: 80e91f96b 7861d00a6
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 13:10:00 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 80e91f96bf5f1e9f89c5a6e4695292298a802b06
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 13:09:37 2019 +0200
Fix a null reference exception.
commit 91b16aaa7aacc658cb36325ea85944802166ef53
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 13:09:26 2019 +0200
Instead of having a bad sight, make the Hammerhead deaf. Add "provocative" priority tag, remove "sonar". Make slightly less aggressive towards weaker.
commit a383c136f6f6915163e98c472ec7ba7f575ea479
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 13:02:00 2019 +0200
Add "provocative" tag on Moloch and Mudraptor targeting priorities. Tweak moloch priorities a bit.
commit 7861d00a609f2555a19f510d72591bd0330f607e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 12:53:37 2019 +0200
Attempt to fix/diagnose "collection was modified; enumeration operation may not execute" exceptions when using the fixhulls command (see #1011). Haven't been able to reproduce this issue.
commit 1d1321c60e8815b3beaffb81bfb9c5f5c2528297
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 12:52:29 2019 +0200
Add "provocative" tag that can be used as a red flag for the monsters. Add the tag on the diving scooter. Also add an ai target with sound ranges.
commit 8530f4c9e4b1c444687cadbf615a9ade0440262b
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 12:50:43 2019 +0200
Propulsion can now make sound that attracts the enemies. The sound is on when the propulsion is active.
commit 291f12676e5148da1a83d4dd72071381c1ae73e3
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 12:49:39 2019 +0200
If a target item is held by a character, attack the character instead.
commit 2aeaa9eaa51f3ed3db71f7853efef37bf5998838
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 12:46:27 2019 +0200
Allow to define min and max sound ranges.
commit 3bf5d2383cbcc33fa862a79c06756e6d9f20a753
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 12:42:57 2019 +0200
Adjust the ai debug info.
commit 369355ffef340875335c0d81d9a2c9a4bfac898b
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Wed Feb 6 12:40:30 2019 +0200
ContextualTutorial Update cleanup
commit 101387adc1308ad87e3134ab2960d3032f725735
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Wed Feb 6 12:34:07 2019 +0200
Formatting
commit cc44eff21d57d93e4b0a67249af2135e5782e3c3
Merge: 9a338a2d4 33d1cd1be
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Wed Feb 6 12:31:54 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 9a338a2d440ff12426171fe9c3121efb934b6803
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Wed Feb 6 12:31:50 2019 +0200
Modified: ContextualTutorial dismissal logic to use buttons instead of the press any key logic
commit 33d1cd1beb61862a91bce16ebeb5090a8969cf1b
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 12:07:21 2019 +0200
Fixed spectate button staying disabled if starting a round fails (due to a missing sub file for example). Closes#1066
commit 8935825146203725759463278e7776a42d84a6a0
Merge: 2cdc96214 9fd3de63b
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Wed Feb 6 11:45:06 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 2cdc96214e2285bfa83a566ed8bc2aed4156c31d
Author: EdusFF <pitkanen.eetu@gmail.com>
Date: Wed Feb 6 11:44:56 2019 +0200
Added: Saving of the download size to the Workshop.Item, allows displaying the file size for non-downloaded content in SteamWorshopScreen. Closes#1052
commit 9fd3de63bc08e06a924bf5ec8a8b2938a647282f
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 11:34:38 2019 +0200
Watchmen cannot be dragged or grabbed, fixed watchmen imploding continuously if they end up outside. Closes#1072
commit eb3fca43d77e79f04e0ae80daac53b7e2c1e37f7
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 11:14:06 2019 +0200
Fixed server not sending PowerContainer events until the charge of the PowerContainer has changed by more then 100% (i.e. never). Closes#1068
commit 5b3b71bab75489714f72ce55621f6da7d5ec8d94
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 10:59:09 2019 +0200
Prevent locations from being generated too close to each other. Closes#1048
commit b032b36a50b60432f565cab0178de749585562ad
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed Feb 6 10:48:43 2019 +0200
Fixed a couple of errors in the translation instructions in EnglishVanilla.xml
commit a31b2f257ef863f2cdd1504a3a15356f95262225
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Wed Feb 6 09:34:11 2019 +0200
Show inventory icons in the sprite editor.
commit fb7a69d6179824dde0a44d27ce5143a1a25d0147
Author: Roni Kovaniemi <roni.kovaniemi@gmail.com>
Date: Wed Feb 6 02:18:44 2019 +0200
Improved background smoke texture
commit 888e86a0e7d6e6a70feb2b87ea16cee17adcfd76
Author: Juan Pablo Arce <juanjp600@users.noreply.github.com>
Date: Tue Feb 5 11:36:06 2019 -0300
whoops strikes again
commit 67e94c6bb9e59b20bc1b9f3cb796780d1c2141f7
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Tue Feb 5 16:32:45 2019 +0200
Adjust the min and max values for the sight range and add a todo note.
commit ad0becdf175a66c963b2cbea5259b435c250ffa6
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Tue Feb 5 16:31:47 2019 +0200
Refactor the sound range calculation. It was way off.
commit adc0aa96be5426dbb845e4138acab87c44c935ba
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Tue Feb 5 16:31:18 2019 +0200
Improve the ai target debug info.
commit 9230ba0865896d5740898993ab3389659a4cbb4a
Author: Juan Pablo Arce <juanjp600@users.noreply.github.com>
Date: Tue Feb 5 10:53:51 2019 -0300
Attempted audio buffer queue fix
commit dfbc61628de37a60acbaa208934957a9d892eb99
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Tue Feb 5 15:18:34 2019 +0200
Fixed: Rubber ducks not floating like a good duck should
commit 8b8523dad99b5c1db271ac13e48975487a7c7c99
Merge: 509c67594 c0156c3d3
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Tue Feb 5 14:34:59 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 509c6759484750d44a154a7f1703f92d0d6e1692
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Tue Feb 5 14:34:53 2019 +0200
Fixed: Holdable items retaining their pushing ability even when the user is stunned or unconscious. Closes#1061
commit c0156c3d350b64309c8068f437ddd57765f0b911
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Tue Feb 5 13:46:32 2019 +0200
If no limb is selected, select the limb with the most critical affliction. Re-evaluate when new affliction is received. Sort afflictions so that dmg/sec is prioritized. Implements the feature request #1033.
commit 4a056c6e9b78f3d6f43574b1b9ff5493d36565b0
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Feb 5 13:25:57 2019 +0200
Fixed order messages not being visible in single player if the character issuing the order has no headset. Closes#1030
commit 357b14fb4f4b1a56a04d192c17a2ce8e0ab7405e
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Feb 5 12:52:40 2019 +0200
new load tips
commit 1f158760e1ed79968f10647c0a2931d2c603281e
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Tue Feb 5 12:52:20 2019 +0200
minor formatting tweak to xml
commit c53438151043174e18fbfe979ac3b3b862d24255
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Feb 5 12:48:47 2019 +0200
Stop Steam auth session of a client when they disconnect. Probably fixes servers reporting incorrect player counts (#1049)?
commit 2073b170e4fdd5cedd998ff9d01f37842995194b
Merge: 9914631c7 9b912a7bf
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Tue Feb 5 12:43:05 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 9914631c7eb30c02913cd4ed44f7b7827169ad83
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Tue Feb 5 12:42:53 2019 +0200
Fixed: Fabricator allowing new items to be created when the output is not empty, resulting in wasted materials.
commit 9b912a7bf16bd121bbe8b7eae20f4a253a9e1eba
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Feb 5 12:33:00 2019 +0200
Fixed LOS effect not working on ruins when looking at them from inside a sub
commit aeaf190c6d3b45d4d12654926acbe223dc4f5888
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Feb 5 11:57:17 2019 +0200
Pressing the radio chat hotkey doesn't deselect the chatbox. Closes#1044
commit e08c5e722fdff38d408428d138919bb8ea90321b
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Feb 5 11:13:25 2019 +0200
Changed default radio chat keybind to T. OemTilde works as an apostrophe on some keyboard layouts, making it difficult to type in chat messages without deselecting the chatbox. Closes#1044
commit e0ca9ffebe06b3f711b28a3ccfd486d84c47f9b0
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue Feb 5 11:03:14 2019 +0200
Fixed content package compatibility check. Closes#1059
commit f54bc180e8aef383cf9c893cd44c103840c066ac
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Tue Feb 5 10:48:03 2019 +0200
Remove the spacing from the crew selection listbox and disable focusing from the background. An alternative fix for #1039.
commit d037815054ecc8269b0af3297700d2b98e1e5bc5
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Tue Feb 5 10:40:52 2019 +0200
Enforce vsync during the splash screen. Should fix the crashes due to insufficient memory mentioned in #1060. Does not fix the issue on releasing the used video resources.
commit 90f1d8fe168356ba3c797c0c58fadea2aff57458
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 23:05:54 2019 +0200
small updates to subs
commit 56dbdf6ea6e8e14035f943eb232eed7aa250f8f6
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 23:05:26 2019 +0200
adjusted default deterioration values on prefabs
commit eaa4818cb63d52e1af519c8ca5c4f01f20143cb2
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 21:59:03 2019 +0200
Fixed servers occasionally starting the round multiple times when automatically starting the game via autorestart or clients being ready. Happened because "initiatedStartGame" (which prevents starting the round again) was not set until the InitiateStartGame coroutine is run for the first time, causing the automatic restart logic to run one extra time. Closes#1056
commit afd83b6ef40333a95e5eeec400d5f981cbdb1889
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 21:36:35 2019 +0200
Fixed some typos in affliction & mission descriptions. Closes#1057
commit feb97628582a9a22f0660a8ab2798f8e03fe8fc9
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 18:29:40 2019 +0200
Fixes to Level.TryGetInterestingPosition. Should fix monsters spawning very close to the sub in some levels (see #1054).
- Ignore outposts when determining which positions are far enough from the sub.
- If no position far enough from the sub is found, use the furthest one instead of choosing randomly.
commit 62e5d7b229f334a5cf15cedf22e6795f18d637b9
Merge: 6ffc90da6 73f3dd060
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 18:03:44 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 6ffc90da69d9a5db146435054fdbb2cb18d855be
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 18:03:26 2019 +0200
Allow to focus on the crew selection listbox to enable scrolling when the mouse cursor is not over a content element, but is inside the listbox. Another option would be to remove the spacing from the listbox. Fixes#1039.
commit 73f3dd060ef208199941cb74a72dcda6a7c15f41
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 18:00:57 2019 +0200
Fixed compiler error in GameServer.ClientWriteIngame
commit 131263490c7093dd526a84757f4edd096a213a74
Merge: 637668488 9753e46a5
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 17:55:39 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 637668488b27954afa0a8485eeaa3b23cf9461c5
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 17:55:01 2019 +0200
Changed character culling logic a bit. The characters need to be 22,000 units away from the players to be disabled, and won't be re-enabled until they're within 20,000 units. Using 20,000 as the threshold for both caused characters to be constantly toggled on/off when they're around the maximum distance, which caused ContactManager to constantly have to update contacts.
commit 9753e46a5694b7b3c2bd0c4c006e2c1856c6eddb
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 17:54:35 2019 +0200
Add a debug command for adding more money in the compaign mode.
commit f8a7179d6f8cb7c834b91b942722b1ae05417316
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 17:53:03 2019 +0200
Always disallow zooming when the cursor is over a gui element.
commit eefd956c50650be906acbd10662e24507e48cb83
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 17:47:18 2019 +0200
Don't display outpost markers on the sonar (the ending and starting positions of the level are displayed, no need to show an additional marker on the "outpost submarine").
commit c7883bafc634e0ac2603bc96a87433da0c3481df
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 17:21:50 2019 +0200
removed references to medical syringes
commit 1ec6577ad95e1d7ebc8cbfa261c9893c55ea987c
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 17:10:31 2019 +0200
Don't attempt to move character's hands in UpdateUseItem if the character is disabled. May be causing "attempted to move pulljoint extremely far" errors (see #895)
commit 1aabc5110ce8e0ec208adce6380cbafd255b576f
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 16:47:50 2019 +0200
removed syringes from the fabricator
commit 0a80a2d8029275f6cffdae580d1ba86cd44dd1a2
Merge: 039c04818 686d4c482
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Mon Feb 4 16:43:55 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 039c04818e3598f2e4cdef4065434000a48bb229
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Mon Feb 4 16:43:51 2019 +0200
Updated: Alien artifacts to spawn inside containers tagged artifactholders in salvage missions & artifact events
commit 686d4c482f692bcc31eb37aeaea0d5074a537fe9
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 16:42:11 2019 +0200
Fixed a bunch more buttons/sliders being invisible while pressed
commit 823728511547f14a3dcb4fcf5025db592ea3dac9
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 16:13:36 2019 +0200
Reset the unsaved changes when exitting the character editor (Not applied when the switching between the game view and the character editor).
commit 9ecc56db4e73dd2ccd577130014020a1a502ae15
Merge: efbeda895 b824fc3f2
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 16:04:57 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit efbeda895fceecb8b4701f23ae5a51057aa44efb
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 16:03:54 2019 +0200
Fix crash on trying to undo limb/joint deletion. Undo does not currently work on these cases, but the ragdoll can be reset to the original state from the reset button.
commit b824fc3f281aed76e8e0ed78ffb16d2213d2fda1
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 16:03:03 2019 +0200
removed syringe from medical doctor default kit
commit c40c716962c7ae1a16d791b0fbd744627a2283c5
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 16:01:33 2019 +0200
Nerfed door welding (takes 4x longer to weld a door shut now)
commit 7a27fcab1cec322fe75bcfad553aa42a37ec7d53
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 16:01:09 2019 +0200
Fixed StatusEffects not being able to target item components. Caused doors to be impossible to weld and most likely other issues with item StatusEffects as well. Closes#1053
commit 50c09ad85ee44018418f537827c009892f4feb23
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 15:52:38 2019 +0200
Fixed depth charges disappearing from loaders when interacting them with both hand slots full. Closes#1046
commit 648a5ba889623f776f184fb30b99133a8551234a
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 15:47:16 2019 +0200
Allow to delete the main limb in the character editor. Should not crash anymore.
commit 751bda4d29b81c58c1b1df1653158543a3b7710d
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 15:46:53 2019 +0200
Add a bunch of null checks to prevent crashes when the main limb is null.
commit 05c068f7aa35f7070e2cf19c526eff0c8d196b53
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 15:35:20 2019 +0200
Syringes removed from medical.xml due to being legacy items we should no longer support.
commit 74389aa95e29fc7415de48230c8f12fd4a0a6847
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 15:30:13 2019 +0200
Attempt to fix LightSource removal causing nullref exceptions.
commit 0907516bcac599b5ae20dc8e35f3a66adb8704b5
Merge: 659e1c58d f042994f4
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Mon Feb 4 15:25:07 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 659e1c58d3fb03d21acf2bb6065d07d1ac2ab914
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Mon Feb 4 15:24:59 2019 +0200
Added: Yes to All / No to All to the prompts when deleting multiple containers with contents. Fixed: Aforementioned prompts staying active when quitting the submarine editor. Moved: Logic for the prompts from ItemContainer.cs to SubEditorScreen.cs
commit f042994f4b7eeff8cf5a6a68715c7c6aa6b8ddfb
Merge: 70a968a16 5a2ca22bd
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 15:08:15 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit 70a968a165c383c2ee765164b4507aa6072e0504
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 15:08:01 2019 +0200
Use inventory icons in the extra cargo menu, layout fixes
commit 5a2ca22bde4be43f4577d20ae4e0a1ec20a23497
Merge: b2f89ea59 9ca7440be
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 15:06:11 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit b2f89ea59d481c109046d1edbd2807a516502b0c
Author: ezjamsen <ezjames.fi@gmail.com>
Date: Mon Feb 4 15:05:39 2019 +0200
redesigned walls in junction compartment of Typhon, closing #1042
commit 9ca7440be41a4fc2082b73618e90312af57c0817
Author: itchyOwl <lauri.harkanen@gmail.com>
Date: Mon Feb 4 15:05:35 2019 +0200
Add some null checks to prevent crashing if the xml document or the source element is not found.
commit 6d1331e9b86a5583761bc374c5dfb42868b03f45
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 15:03:53 2019 +0200
Fixed the layout of the extra cargo menu in server settings. Closes#1038
commit 02ac14076ace0418a5d35df7a574f99811d56017
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 14:10:34 2019 +0200
Fixed fire sounds persisting in menus. Closes#1047
commit d7d4516ddc9e21a2dba8f7bfd14a61ba7a805d4a
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 14:06:03 2019 +0200
Added a null check to CampaignUI to help diagnose #1029
commit 0fee58808c261cecd4a602db22e39dfb855ee018
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 13:55:50 2019 +0200
Fixed "attempting to remove an already removed item" console errors when ending a round.
commit 5e4448024ce00231e9e479aa238ed4b134b07321
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 13:53:59 2019 +0200
Fixed crashing when ending a round while a character is outside the sub. Closes#1040
commit e3ff050561a8f823fc8abfddfec9d22ad4dc14a5
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 13:35:28 2019 +0200
Fixed battery positioning in charging docks. Closes#1041
commit d383aec6cb7f4525906fa858375729d4ad4fc0d4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 13:26:00 2019 +0200
Fixed debugconsole adding the file number after the extension ("file123.txt (2)" instead of "file123 (2).txt"). Closes#1043
commit fee18b7ebcaea949c3f7d0c8027ab6253769b49c
Merge: d03807237 c06e8990f
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Mon Feb 4 12:10:12 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit d038072372ab1993a44542298fe4031db6448ae4
Author: Eetu <pitkanen.eetu@gmail.com>
Date: Mon Feb 4 12:10:04 2019 +0200
Fixed: Setting an item's condition to zero in the SubmarineEditor causing its OnBroken status effects to be fired
commit c06e8990f97af7ae9b4788b281bf2801cdd8e2ff
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 11:43:35 2019 +0200
Fixed chatbox being deselected in the net lobby when receiving a lobby update from the server. Closes#1019
commit 2962647c37cec01fdb01092b94c25063c74c9ee0
Merge: b77bc3654 c89df8750
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 10:41:24 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into dev
commit b77bc365470c8cfb86dc83e4b21e5b36e0e28918
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 10:41:08 2019 +0200
Warning about automatic hull generation not working correctly with sloped walls when using the autohull command
commit 85ef20a48532e06ef0c2774aa81e1fb517814b14
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 10:40:20 2019 +0200
Log the name of the item in the "attempting to remove an already removed item" error
commit b6e32d4009a898db9c97316bcb6236170a7a92fe
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 10:39:46 2019 +0200
Fixed sliders not moving in the PowerContainer interface when an AI character is operating it
commit 4b4848b5caa7bf3893e4ae2f5afef3c980f60e46
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon Feb 4 10:39:09 2019 +0200
Nullref fix in AIObjectiveGoto
commit c89df87500c9026b3a6e75139391e64a4b1073e7
Author: Juan Pablo Arce <juanjp600@users.noreply.github.com>
Date: Sun Feb 3 21:02:59 2019 -0300
whoops
commit a85cc7705ea7611fff02fff7c18bc9826f03029a
Author: Juan Pablo Arce <juanjp600@users.noreply.github.com>
Date: Sun Feb 3 21:01:51 2019 -0300
ReduceAffliction loops back around if there's a surplus on index 0
commit e0047df3e089fd8be1646aecbd53b86b69949b13
Author: Juan Pablo Arce <juanjp600@users.noreply.github.com>
Date: Sun Feb 3 19:45:52 2019 -0300
Fixed ReduceAffliction freezing
Thanks to nilanthanimosus for catching this
Joonas Rikkonen