Commit Graph

472 Commits

Author SHA1 Message Date
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
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 482f3c1f3c (975eacb57) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-07 16:23:16 +03:00
Joonas Rikkonen bb6067df31 (1e5573bea) new outpost 2019-05-07 16:22:58 +03:00
Joonas Rikkonen e55a5d6d9d (aef4f0ea0) Option to override sprites per language, new logos 2019-05-07 13:23:02 +03:00
Joonas Rikkonen 2b4c38303e (6e6175b77) Credits stuff (libraries, placeholder publishing & contributor sections, layout improvements) 2019-05-07 13:21:39 +03:00
Joonas Rikkonen a2760830af (b2f1fcb2b) Progress on credits (images can now be displayed), removed unused "TileSprites" field from GUIComponent 2019-05-07 13:21:22 +03:00
Joonas Rikkonen f65d73ca74 (3950185ea) Progress on credits 2019-05-07 13:21:06 +03:00
Joonas Rikkonen f2f39e87e2 (10d1ebded) WIP credits sequence 2019-05-07 13:20:33 +03:00
Joonas Rikkonen dd120a8153 (8851c8702) Fixed submarines occasionally being rendered at an incorrect position when viewing them in the sub editor after they've been used in-game 2019-05-07 13:20:17 +03:00
Joonas Rikkonen 5619323cee (4c272e568) Fixed crashing when loading the same sub twice in the sub editor 2019-05-07 13:18:41 +03:00
Joonas Rikkonen 5af8170ac6 (372c6e60a) More automatic text scaling + merge fix 2019-05-06 14:15:40 +03:00
Joonas Rikkonen 7d825b051c (bcdbb4a59) For Bunyip too 2019-05-06 14:14:13 +03:00
Joonas Rikkonen 4ee5bf1e08 (cbcc94ae1) Higher res preview pics for subs 2019-05-06 14:13:55 +03:00
Joonas Rikkonen 6e152c4575 (c57beb621) Autoscale text in a bunch of places where it's likely to overflow 2019-05-06 14:13:38 +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 342a150855 (59b1edfd7) Added a button that opens the campaign disclaimer to the new game menu 2019-05-06 11:40:40 +03:00
Joonas Rikkonen 84054b75bb (016cc3e0f) Updated Remora cable holders 2019-05-06 11:40:24 +03:00
Joonas Rikkonen 1e666a5a0d (073c09b0f) Don't allow signals to deactivate Repairables (made it impossible to fix hatches on some vanilla subs because the signals kept the Repairable inactive, preventing the repair state from being updated) 2019-05-06 11:40:06 +03:00
Joonas Rikkonen 836acc0814 (82b78c472) Fixed inability to close the pause menu with Esc when an item interface is open 2019-05-06 11:39:49 +03:00
Joonas Rikkonen 397b99a2ad (6e1c0e7da) removed RDX from railgun shells!!! 2019-05-06 11:39:31 +03:00