Commit Graph

70 Commits

Author SHA1 Message Date
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +03:00
Joonas Rikkonen 8be0b0676e (83868bb0e) Refactor AIObjectiveExtinguishFires to use the AIObjectiveLoop class. Significant refactoring of the other looping objectives. Reduce the duplicate code. 2019-05-16 05:13:40 +03:00
Joonas Rikkonen 7fb7c13198 (fbfb76aeb) Implement automatic extinguishing. TODO: should use the AIObjectiveLoop class. 2019-05-16 05:13:21 +03:00
Joonas Rikkonen ab2ca90d08 (900eddc26) Take the priority modifier in account when calculating the priority, not the max value. 2019-05-16 05:13:03 +03:00
Joonas Rikkonen 3c8707fc16 (d9d8b0f27) Always display waypoint ids in debug draw. Adjust the positions and the colors. 2019-05-16 05:12:44 +03:00
Joonas Rikkonen e06a473b41 (a63bd205d) Adjust automatic order priority modifiers. 2019-05-16 05:12:24 +03:00
Joonas Rikkonen 019712ef66 (829458a66) Don't apply priority modifier on the priority value, because it's already applied to the max value. The priority value should be normalized, because we are using the lerp. 2019-05-16 05:12:07 +03:00
Joonas Rikkonen dbccd76613 (c6ca0ef58) Recreate objectives when the bot is dismissed. 2019-05-16 05:11:49 +03:00
Joonas Rikkonen de8a23f687 (1137f730e) Instead of forcing the looping objectives to use the average, let them decide the method of evaluating the targets. Use the highest priority for now. 2019-05-16 05:11:32 +03:00
Joonas Rikkonen 759e4aee0d (96ccafd88) Fix the goto objective not always completing because of too high NearEnough value. 2019-05-16 05:11:17 +03:00
Joonas Rikkonen 9a1e7f8212 (1c6954251) Add IsLoop property. Fixes operate item orders being removed when they are done. Instead of calling loopable objectives done, let's just use the priority system. 2019-05-16 05:11:01 +03:00
Joonas Rikkonen 781fd44a8c (4efa46ffe) Limit the base priority due to devotion to 10. 2019-05-16 05:10:42 +03:00
Joonas Rikkonen cdeb6d40b3 (f3bfe1ac4) Fix damage priority calculation. 2019-05-16 05:10:25 +03:00
Joonas Rikkonen 9cc9137fff (b8fa3b004) Merge branch 'dev' into human-ai 2019-05-16 05:10:07 +03:00
Joonas Rikkonen 7ebb0be29b (db42ef494) Don't allow combat priority go over 100. 2019-05-16 05:09:51 +03:00
Joonas Rikkonen 171c42f077 (3241b8fe7) Adjust the priorities. The orders should now always have higher priority than other objectives (except find safety and combat). 2019-05-16 05:09:33 +03:00
Joonas Rikkonen 7c901d8d77 (8fd36f702) Add a separate value for run threshold. Increase the order priority from 50 to 70. 2019-05-16 05:09:15 +03:00
Joonas Rikkonen 3a3d55d780 (39b4d0859) Merge branch 'dev' into human-ai 2019-05-16 05:08:56 +03:00
Joonas Rikkonen 616efac2bf (19b26d13b) Merge branch 'dev' into human-ai 2019-05-16 05:08:39 +03:00
Joonas Rikkonen 454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen 4797f6b0d3 (307219669) Add some automatic orders. 2019-05-16 05:08:02 +03:00
Joonas Rikkonen b51fd32b88 (de7949704) Rewrite the leak priority calculations. Ensure that the damage priority is not negative. 2019-05-16 05:07:45 +03:00
Joonas Rikkonen 7f58f30829 (1c243b972) Fix steering related issues in the fix leaks objective. 2019-05-16 05:07:27 +03:00
Joonas Rikkonen 37555ed1a4 (9fc7c8e98) Only reset when the objective is an order. 2019-05-16 05:07:07 +03:00
Joonas Rikkonen 2a0e289a59 (40f4f67f8) Further changes to the calculations. 2019-05-16 05:06:49 +03:00
Joonas Rikkonen b7272e1c96 (2f379083c) Change how some of the priorities are clamped. 2019-05-16 05:06:30 +03:00
Joonas Rikkonen b5db30ec72 (c48cb7804) Change the operate item priority calculation so that it starts from 25 and increases with devotion and is multiplied by the priority modifier. Clamp the result. 2019-05-16 05:06:11 +03:00
Joonas Rikkonen ff5a819ad3 (62a89ce6a) Refactor and fix priority calculations. WIP, but should already improve things. 2019-05-16 05:05:53 +03:00
Joonas Rikkonen d0795791e7 (3bb9485ad) Add automatic orders as objectives instead of orders so that we can take advantage of the existing priority system. Turn the priority values defined in the xml into modifiers. 2019-05-16 05:04:53 +03:00
Joonas Rikkonen 5def53f7bd (2972c6da9) Add a missing text. 2019-05-16 05:04:29 +03:00
Joonas Rikkonen 039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen 60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen e3a485edd3 (cb8c9ec1b) Fixed subs not being rendered when switching from the game screen to the sub editor immediately after the round starts 2019-05-03 13:51:05 +03:00
Joonas Rikkonen 8c678e3977 (9f9b86b9b) Fixed tutorial level generation params being used in normal levels. 2019-05-03 13:50:49 +03:00
Joonas Rikkonen c7a71d5627 (52c4b3002) Fixed CustomInterface labels & signals not being saved correctly 2019-05-03 13:50:32 +03:00
Joonas Rikkonen 5d9c61598b (e695ea73c) Changes to draw order logic. Fixes background lights bleeding through background walls that can only be resized on one axis. 2019-05-03 13:50:14 +03:00
Joonas Rikkonen dedc9b5083 (9a7f4893d) Don't select the chatbox when pressing R/T while another textbox is selected. 2019-05-03 13:49:57 +03:00
Joonas Rikkonen 71d546ff7f (f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-08 19:17:50 +03:00
Joonas Rikkonen 5a9b681c13 (8c99939f6) Fix bots dropping from ladders if there is a non-ladder node in the path (Especially on Typhon). The distance check was incorrect, but after correcting it, I decided that it probably causes more issues than it solves. If there is one node in the path that is not in the current ladder, but the node after that is, we can just follow the path to the node that is on the ladders. Remove an unnecessary IgnorePlatforms assignment. It's handled in the HumanAIController. 2019-04-08 19:17:35 +03:00
Joonas Rikkonen eb6e919c66 (f832e24f5) Prevent bots jumping from too high. 2019-04-08 19:17:20 +03:00
Joonas Rikkonen 9a829206af (2c264b075) Improve readability (no functional changes). 2019-04-08 19:17:06 +03:00
Joonas Rikkonen 5876097da4 (4b07ea1ca) Removed unused method from HumanoidAnimController 2019-04-08 19:16:51 +03:00
Joonas Rikkonen 63971c90a9 (a9fbb0120) Disable controls when the pause menu or settings menu is open. Closes #1391 2019-04-08 19:16:37 +03:00
Joonas Rikkonen e19bf22112 (9c93ed664) Fixed fabricators and deconstructors deteriorating when they're powered (not just when fabricating/deconstructing) something 2019-04-08 19:16:23 +03:00
Joonas Rikkonen d482e6554d (276e03242) Reset Use and Select inputs when releasing the Shoot input to prevent accidentally selecting/using items 2019-04-08 19:16:09 +03:00
Joonas Rikkonen b08a31a68f (33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it. 2019-04-04 11:10:14 +03:00
Joonas Rikkonen a3425a0432 (bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row 2019-04-04 11:08:49 +03:00
Joonas Rikkonen 7eb03ea6b3 (874c38a79) Show keybindings for use or shoot in the tooltips. 2019-04-04 11:08:33 +03:00
Joonas Rikkonen d4752bb6a0 (9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time. 2019-04-04 11:08:18 +03:00
Joonas Rikkonen 7491b06a5d (bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults. 2019-04-04 11:08:02 +03:00