Commit Graph

493 Commits

Author SHA1 Message Date
Joonas Rikkonen cf55de90ba (0ccb08c95) Remove item collision category, since we only want to check the walls and the characters here. 2019-05-16 05:22:30 +03:00
Joonas Rikkonen ad604a44c4 (0bc1c5f88) Fix bots trying to rescue enemies in single player game. 2019-05-16 05:22:12 +03:00
Joonas Rikkonen 99307f764a (a47ab977d) Allow shooting through platforms. 2019-05-16 05:21:56 +03:00
Joonas Rikkonen 9ec9adb2a7 (cec5cdbcd) Reset steering when an objective is activated. 2019-05-16 05:21:39 +03:00
Joonas Rikkonen f95a59cc50 (cc14ef57a) Remove the Doing text, because it's not used and because there can be multiple. Remove order names, because they should be defined in EnglishVanilla.xml. Add todo notes about the texts. 2019-05-16 05:21:20 +03:00
Joonas Rikkonen 1e200722ae (81244db07) Implement AIObjectiveFightIntruders. 2019-05-16 05:21:03 +03:00
Joonas Rikkonen 88de435487 (cf495e03c) Check the visibility to the target when engaging (the distance is not enough, if there's something blocking the line of sight). 2019-05-16 05:20:45 +03:00
Joonas Rikkonen 3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen 7b6c2f1fa8 (663910402) Unequip weapons when not in combat mode and all items when idling. 2019-05-16 05:20:11 +03:00
Joonas Rikkonen 3b313976c5 (5394332a8) Add a note. 2019-05-16 05:19:52 +03:00
Joonas Rikkonen bcd18aab4e (8025561da) Implement offensive combat. 2019-05-16 05:19:31 +03:00
Joonas Rikkonen 363eb0540a (a8f2f39bd) The ai now sorts the weapons by the combat priority value, which can be set in xml. Ranged weapons are favored. The required items are also taken into account. 2019-05-16 05:19:14 +03:00
Joonas Rikkonen 9facded24c (2561cb6ea) Tune the priority modifiers. 2019-05-16 05:18:55 +03:00
Joonas Rikkonen 65e284bf7c (0fde6c604) Ignore dangerous targets. 2019-05-16 05:18:37 +03:00
Joonas Rikkonen fea0c31e85 (27b4fa143) Tune the priority modifiers. 2019-05-16 05:18:18 +03:00
Joonas Rikkonen f61bff8970 (a1fe45652) Add some margin. 2019-05-16 05:18:01 +03:00
Joonas Rikkonen cbfef49e9d (d9fd52f40) Change the priority calculations for charge batteries and pump water loops. Tweak the operate item priority calculation. 2019-05-16 05:17:42 +03:00
Joonas Rikkonen c9bfc21880 (49f837fbb) Fix: operate battery or pump should not be looping objectives. 2019-05-16 05:17:24 +03:00
Joonas Rikkonen c8160f6e0b (a599eccb0) Expose the ai recharge target ratio and add a property for easy accessing to the recharge ratio. 2019-05-16 05:17:06 +03:00
Joonas Rikkonen 6c777aa91e (d7e59613a) Ignore broken items. 2019-05-16 05:16:47 +03:00
Joonas Rikkonen 6bdd0ab8c0 (83ad1f3d2) Fix a null reference exception. 2019-05-16 05:16:31 +03:00
Joonas Rikkonen 5b3696f7e4 (d16942d30) Simplify. 2019-05-16 05:16:13 +03:00
Joonas Rikkonen bbce41fab0 (bd2976a16) Add some automatic orders. 2019-05-16 05:15:52 +03:00
Joonas Rikkonen 82d74f7481 (a1ebc2642) Use lazy loading to ensure that the list is assigned when it's needed. Fixes null reference exceptions when pumping water or charging batteries. 2019-05-16 05:15:34 +03:00
Joonas Rikkonen 108e42edb0 (b5250291f) Merge branch 'dev' into human-ai 2019-05-16 05:15:16 +03:00
Joonas Rikkonen b02565796a (98f1dbf5e) Merge branch 'dev' into human-ai 2019-05-16 05:14:58 +03:00
Joonas Rikkonen 7f72f72ca7 (9c0250ef1) Merge branch 'dev' into human-ai 2019-05-16 05:14:40 +03:00
Joonas Rikkonen 2ae54a01a5 (ac7ab10b0) Pass AIObjectiveManager reference in the constructors instead of methods so that we can always access it. 2019-05-16 05:14:20 +03:00
Joonas Rikkonen bec7aadfa9 (af16ecdfa) Merge branch 'dev' into human-ai 2019-05-16 05:14:00 +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 b83302408f (909dcf05d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 18:05:33 +03:00
Joonas Rikkonen 427526aba2 (d4a475f03) Added text wrapping to pump GUI texts 2019-05-07 18:05:16 +03:00
Joonas Rikkonen 56015c2f01 (d2cb979c9) Added: Creditsbutton to englishvanilla. Fixed: Title & objective in videoplayer being shown in manualvideo contenttype 2019-05-07 18:04:58 +03:00
Joonas Rikkonen 96a5875b9a (a01a93af6) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:24:58 +03:00
Joonas Rikkonen cc22268f0e (ae2d4614b) Added: NPCConversation translations 2019-05-07 16:24:41 +03:00
Joonas Rikkonen 799c2d4a5c (20b87e5bc) More workarounds to missing texts, fixed an error in one of the French texts 2019-05-07 16:24:23 +03:00
Joonas Rikkonen ed23155de7 (a79419041) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:24:06 +03:00
Joonas Rikkonen bc55ab10b8 (d81130005) added new outpost to project 2019-05-07 16:23:50 +03:00