Commit Graph

211 Commits

Author SHA1 Message Date
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 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 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
Joonas Rikkonen 92f300128e (f6783d0df) Workarounds to missing texts (use a "fallback tag" if the correct tag can't be found, now used for "shuttle" and "savesubdialogdescription"), minor layout tweaks to fix overlapping texts in Pt-Br 2019-05-07 16:23:32 +03:00
Joonas Rikkonen aa287f8bfb (8fed20401) Fixed the "mysteries lie ahead" popup opening multiple times when clicking the icon at the center of the map 2019-05-07 13:19:12 +03:00
Joonas Rikkonen 5af8170ac6 (372c6e60a) More automatic text scaling + merge fix 2019-05-06 14:15:40 +03:00
Joonas Rikkonen 3c1db2e9a7 (c91620d64) Fixed all language options showing "English" if the name of the language is not present in the text files, apply settings when switching language (too easy to just change the language and restart without applying first) 2019-05-06 14:13:22 +03:00
Joonas Rikkonen 47d7bd8f14 (977fc6511) Allow panning the campaign map with LMB (otherwise it can't be panned with a touchpad) 2019-05-06 14:13:03 +03:00
Joonas Rikkonen 088f7e5485 (d3c10117b) Fixed nullref exception if there are no texts defined for a location type change 2019-05-03 13:47:58 +03:00
Joonas Rikkonen fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen fbb7daed00 (0c3442136) Merge branch 'dev' into docking-interface 2019-05-03 13:41:23 +03:00
Joonas Rikkonen 45ba589d96 (12412e6fd) Determine the steering vector relative to the center of the sub, not the center of the display when clicking on the display 2019-05-03 13:41:06 +03:00
Joonas Rikkonen 5d4a3f18c6 (021a3d977) Draw the steering indicator at the center of the sub, not at the center of the display. Change the color of the docking indicators when ready to dock 2019-05-03 13:40:49 +03:00
Joonas Rikkonen a2c2f72357 (2edf7845f) Progress on docking interface (nudge controls), focus sonar on the center of the submarine instead of the nav terminal 2019-05-03 13:40:31 +03:00
Joonas Rikkonen 2199a0f97f (276dcf6d2) Docking indicator changes color when the docking port is within the sector 2019-05-03 13:40:12 +03:00
Joonas Rikkonen b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +03:00
Joonas Rikkonen 67a0636470 (b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:09:50 +03:00
Joonas Rikkonen 2554e17189 (621326f05) Don't flee when taking damage if part of a swarm. 2019-04-29 21:08:32 +03:00
Joonas Rikkonen c5452048d7 (d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-29 21:08:16 +03:00
Joonas Rikkonen b3b1d1851d (eda627512) Fixed MonoKickStart files needed by the dedicated server not being copied to the output directory in release builds 2019-04-29 21:08:00 +03:00
Joonas Rikkonen 788c51143b (55f425031) Tutorial outpost visual pass 2019-04-29 21:06:26 +03:00
Joonas Rikkonen 205f808f84 (5b377538a) Adjust crawler attacks a bit. 2019-04-29 21:05:53 +03:00
Joonas Rikkonen 33747a63b0 (3340f2f90) Don't do impact damage to structures in Structure.OnWallCollision. Impact damage was disabled when a character hits the sub from the outside (implemented in SubmarineBody), but should've been done here as well. 2019-04-29 21:05:21 +03:00
Joonas Rikkonen 2aec2414be (12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-26 11:25:25 +03:00
Joonas Rikkonen 3eb883fbb3 (9253f5b70) Added libvlc.so to LinuxClient 2019-04-26 11:25:10 +03:00