Commit Graph

128 Commits

Author SHA1 Message Date
Joonas Rikkonen 90b0c208fc (1343e66e3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-23 15:08:45 +03:00
Joonas Rikkonen 1fb558d7ef (84593b8fb) Fixed: Oxygen levels of the patient on the submarine being adjusted too late 2019-05-23 15:08:27 +03:00
Joonas Rikkonen a965314b8f (15bea4eef) Only ask medical assistance if there is a character with the rescue all objective. Don't allow to add targets if the bot is dead. 2019-05-23 15:07:50 +03:00
Joonas Rikkonen 9b56fa9832 (db31ead65) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-20 21:03:14 +03:00
Joonas Rikkonen 7c67b1f164 (57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2. 2019-05-20 21:00:11 +03:00
Joonas Rikkonen b71adc7589 (2e0e45e1f) Updated: Localization 2019-05-20 20:46:21 +03:00
Joonas Rikkonen 120dc39a9e (36d2ff935) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-05-20 20:18:17 +03:00
Joonas Rikkonen 1340780205 (18af6c22d) Fixed: On/Off switches not being highlighted in mechanic tutorial 2019-05-20 20:17:59 +03:00
Joonas Rikkonen 1101252ad2 (a652b4140) Added missing "dialognorescuetargets" to EnglishVanilla, don't attempt to say the line on languages other than English 2019-05-20 20:17:42 +03:00
Joonas Rikkonen eed0666879 (76909c3c7) Fixed "clowncostume" and "crewaway" achievements not unlocking in multiplayer, fixed being able to get the "killclown" achievement by committing suicide while wearing a clown costume. Closes #1478
+ merge fix
2019-05-18 18:24:03 +03:00
Joonas Rikkonen a01729514b (deeaf479b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:52:26 +03:00
Joonas Rikkonen 31f74aca8d (e3fee50d9) Use roughly matching "fallback translations" for ConnectionPanel texts that haven't been translated yet (e.g. "signal_1" -> "signal_in_1", "trigger_out" -> "shoot"). Still missing the charge-related connection names in batteries, couldn't find any suitable replacements for them 2019-05-18 17:51:52 +03:00
Joonas Rikkonen 79282f5321 (f6436b630) Manually tweak Bunyip waypoints. 2019-05-18 17:48:28 +03:00
Joonas Rikkonen 1973a824bf (91366496d) Removed connection displayname attributes from ItemAssemblies (ended up there with liberal use of Find & Replace, but it's better to use values from the item prefab) 2019-05-18 17:48:06 +03:00
Joonas Rikkonen 90e1786f92 (6f6fc33e7) The bots having the follow order now also equip mask/diving suit if the follow target has one. Unequipping not yet implemented. 2019-05-18 17:47:48 +03:00
Joonas Rikkonen 6332cfd55f (81d7f4c1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:44:13 +03:00
Joonas Rikkonen 71d1738498 (76e16f98e) Use outdoorsteering when far enough from the sub. Increase the wait until reachable time a bit. 2019-05-18 17:43:38 +03:00
Joonas Rikkonen 78b67de866 (e9f10995d) Merge branch 'bugreporterUI' into dev 2019-05-18 17:43:00 +03:00
Joonas Rikkonen 3a2310e547 (3ac5065f5) Fixed: Rendering order for Bugreporter window, OK button position 2019-05-18 17:42:41 +03:00
Joonas Rikkonen da693c20fa (7bfeac605) More space for the labels in the Pump interface 2019-05-18 17:42:20 +03:00
Joonas Rikkonen 11d08f4f70 (2df363efc) Refactor avoiding, because the previous method wasn't working well. It now should work better, but requires a heading vector. Add some notes on how to improve the method. TODO: revisit fishes. 2019-05-18 17:41:58 +03:00
Joonas Rikkonen f1d794cb39 (86c9256b3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-18 17:35:10 +03:00
Joonas Rikkonen 65a914e5ed (0b29f1236) Added: Scaling to mouse cursor size 2019-05-18 17:34:53 +03:00
Joonas Rikkonen d893f27dc2 (4c4f47cc2) Fixed reports by bots not being sent to clients in MP 2019-05-18 17:33:48 +03:00
Joonas Rikkonen 1e85abf09d (8cbc4391a) Disable find safety while going somewhere in the sea with an order. 2019-05-18 17:30:46 +03:00
Joonas Rikkonen 9521f0ae2f (17fdbc9de) New path is also needed if the old becomes unreachable. Ignore the new path if it's unreachable. 2019-05-18 17:29:40 +03:00
Joonas Rikkonen 75640a321f (f4acd46ef) Don't enable the "report leaks" button inside ruins 2019-05-18 17:29:24 +03:00
Joonas Rikkonen d84832296c (cd17ab725) Cleanup. 2019-05-18 17:28:18 +03:00
Joonas Rikkonen e63ffe652e (5e16139ed) Added "OrderGiver" field to AI orders, always show reports from the currently controlled character (even if the report is not targeted for the character's class) 2019-05-18 17:26:34 +03:00
Joonas Rikkonen f605651966 (683b11c00) High-res shuttle preview images + merge fix 2019-05-16 08:49:01 +03:00
Joonas Rikkonen b97ecddf03 (da82264a0) Use ISpatialEntity as the target of "go to" objective to get rid of the reaching issues. Use display units instead of sim units. Don't calculate a standing point in "fix leak" objective, because it's handled in the AIOperate method when the bot get's near enough, 2019-05-16 06:57:32 +03:00
Joonas Rikkonen 112baf285d (291705dc5) updated drone 2019-05-16 06:56:19 +03:00
Joonas Rikkonen 89dc85adce (6e785d1ae) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:56:01 +03:00
Joonas Rikkonen f38aa90847 (546717195) Use the AIObjectiveFightIntruders.IsValidTarget for deciding whether or not the button should flash. 2019-05-16 06:55:43 +03:00
Joonas Rikkonen 5435adc9b4 (6c0663ce1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-16 06:55:26 +03:00
Joonas Rikkonen 106c61ca9a (4d3ec7d3b) Fixed: Missing {0} variable from russian localization 2019-05-16 06:55:08 +03:00
Joonas Rikkonen 81fe275299 (c3a729b34) Fix ai reporting only working if there's someone with the appropriate objective. Use the target's hull instead of using the reporter's hull. Take bleeding into account when filtering rescue targets. 2019-05-16 06:54:49 +03:00
Joonas Rikkonen 4c4cac9c39 (b97c9eb63) Restore the escape velocity condition: don't run to walls. 2019-05-16 06:54:31 +03:00
Joonas Rikkonen dbc35568cd (69d6e11bf) shuttle tweaks 2019-05-16 06:53:38 +03:00
Joonas Rikkonen 5453518793 (238bbeef2) Fix find safety not working properly. Decrease the reaction times and cache the current hull safety when the hull safety is updated. 2019-05-16 06:53:04 +03:00
Joonas Rikkonen a2f97bf303 (9cb944db7) Increase the priority modifier of extinguish fires for captain 2019-05-16 06:51:18 +03:00
Joonas Rikkonen 0ba5793b46 (3628de633) Use the visible hulls instead of the current hull in multiple cases. 2019-05-16 06:50:59 +03:00
Joonas Rikkonen 1e41ed6b63 (943a1e25b) Report all visible hulls, but add a dialogue line and icon only for current hull. 2019-05-16 06:50:42 +03:00
Joonas Rikkonen 437465690b (18165dcb9) Propagate hull safety once per second. 2019-05-16 06:50:23 +03:00
Joonas Rikkonen 4c0adb145d (d762b9ca6) Refresh visible hulls once per second. 2019-05-16 06:50:06 +03:00
Joonas Rikkonen d81457e3ef (8348f0003) Report in all the visible hulls (test). 2019-05-16 06:49:48 +03:00
Joonas Rikkonen af7fcb823d (63921aa0d) Implement GetVisibleHulls method. 2019-05-16 06:49:11 +03:00
Joonas Rikkonen 75b9ea6cce (cb3078117) Merged hulls to fix speech issue 2019-05-16 06:46:30 +03:00
Joonas Rikkonen ce02152130 (ef2a86a63) Add a null check. 2019-05-16 06:45:53 +03:00
Joonas Rikkonen 496ee1492c (1fe9abf75) Fix the GetAdjacentHulls method. 2019-05-16 06:45:36 +03:00