Joonas Rikkonen
|
80c563e7b0
|
(86280d29b) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
|
2019-05-16 06:31:49 +03:00 |
|
Joonas Rikkonen
|
fc22eb5088
|
(fc5e081d3) Fixed: Hull names not saving properly in submarineditor
|
2019-05-16 06:31:32 +03:00 |
|
Joonas Rikkonen
|
bf57a48c7e
|
(ebf4529cc) Use a uniform way to check if the bot has reached it's target. Should fix issues where bot is stuck when trying to get or operate an item in some cases.
|
2019-05-16 06:25:31 +03:00 |
|
Joonas Rikkonen
|
9c964b7843
|
(7d7010579) Fix ai dialog about not being able to find targets. Use a higher thershold for rescue objectives when it's an order.
|
2019-05-16 06:14:25 +03:00 |
|
Joonas Rikkonen
|
5f524ddd3f
|
(457e4ebe5) Fixed: Submarine navigation labels being translated when loading a sub in editor
|
2019-05-16 06:13:49 +03:00 |
|
Joonas Rikkonen
|
ce7b9c4f52
|
(94ad97066) Refactor combat objective. The bots should now be able to reload and seek more ammunition. When they run out of ammunition, they first try to use another weapon and only if no other weapon is found, they seek more ammunition. Had to change the contain item and get item objectives a bit. Hopefully doesn't break things too much.
|
2019-05-16 06:13:15 +03:00 |
|
Joonas Rikkonen
|
6fc8b8b573
|
(2d7903da7) Replaced some horizontal light components with vertical ones in tutorial outpost
|
2019-05-16 06:02:10 +03:00 |
|
Joonas Rikkonen
|
d70c463f41
|
(3d327d975) Merge branch 'dev' into human-ai
|
2019-05-16 06:01:53 +03:00 |
|
Joonas Rikkonen
|
cb83984e80
|
(4ca668169) Fixed: Conflict
|
2019-05-16 05:58:48 +03:00 |
|
Joonas Rikkonen
|
0a67590572
|
(21a808335) Added: 4k fixes
|
2019-05-16 05:58:32 +03:00 |
|
Joonas Rikkonen
|
257889b9cc
|
(42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool.
|
2019-05-16 05:58:15 +03:00 |
|
Joonas Rikkonen
|
884360216f
|
(de60c0961) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 05:50:56 +03:00 |
|
Joonas Rikkonen
|
fd7dfebd3a
|
(50c25dbf6) Added a "back" button that closes the credits, minor credits tweaks
|
2019-05-16 05:50:39 +03:00 |
|
Joonas Rikkonen
|
068089ae5c
|
(d622ac851) Fix double updates of current orders.
|
2019-05-16 05:47:36 +03:00 |
|
Joonas Rikkonen
|
ce1aa39a4b
|
(b1241e3dd) GUIMessageBoxes use relative sizes
|
2019-05-16 05:46:12 +03:00 |
|
Joonas Rikkonen
|
f8090d470e
|
(5670a7c58) Don't get stuck if cannot use the button.
|
2019-05-16 05:44:48 +03:00 |
|
Joonas Rikkonen
|
5ec107bf83
|
(0d96091e5) Adjusted layout spacing on Reactor to make the warning labels slightly more readable on Brazilian Portugese
|
2019-05-16 05:43:40 +03:00 |
|
Joonas Rikkonen
|
de2246fe57
|
(e0d673b0d) Test: Don't calculate the distance to the buttons when seeking path. Instead, check the distance when checking the doors. Allows the bots to access the Remora ballast through the door where the button is a bit farther from the door than usually.
|
2019-05-16 05:42:51 +03:00 |
|
Joonas Rikkonen
|
828150e0ae
|
(9d8f050b8) Added text wrapping to ItemInventory titles and changed pump GUI In/Out text to use a smaller font
|
2019-05-16 05:42:34 +03:00 |
|
Joonas Rikkonen
|
1d5de494cd
|
(a185ec0cd) Don't report on broken items that have condition above the threshold. Optimize and fix.
|
2019-05-16 05:41:25 +03:00 |
|
Joonas Rikkonen
|
79d01822d2
|
(8015dd67d) Show a language selection prompt when launching the game for the first time (WIP)
|
2019-05-16 05:41:09 +03:00 |
|
Joonas Rikkonen
|
ddd84a4f9e
|
(c45394988) Refactor and fix button interaction and access checks in the indoors steering manager.
|
2019-05-16 05:40:00 +03:00 |
|
Joonas Rikkonen
|
3575c8df52
|
(03ab09991) Load chinese fonts dynamically, removed unnecessary duplicate block from DynamicRenderAtlas
|
2019-05-16 05:39:25 +03:00 |
|
Joonas Rikkonen
|
96eb27140e
|
(ab2157c70) Remove KeepDivingGear property, because it can cause issues when the objective tree is deep. Checking the property is possible via recursion, but it seems that the checks can miss a frame. Instead, let's just make it simple and remove the diving suit only when idling.
|
2019-05-16 05:37:46 +03:00 |
|
Joonas Rikkonen
|
14e894cbc8
|
(82dc10a74) Some margin.
|
2019-05-16 05:35:30 +03:00 |
|
Joonas Rikkonen
|
6bb7f5f0f1
|
(5dc7f59e5) Remove an unnecessary check. The priority system should take care of this.
|
2019-05-16 05:34:37 +03:00 |
|
Joonas Rikkonen
|
155cb83f91
|
(f0f961ac3) Fix some priority related issues.
|
2019-05-16 05:33:46 +03:00 |
|
Joonas Rikkonen
|
a3db11876b
|
(d34fb2097) Major refactoring: - Replace custom logic regarding subobjectives with generic logic. - Ensure that all the objectives follow the same logic, reduce duplicate code where possible.
|
2019-05-16 05:32:56 +03:00 |
|
Joonas Rikkonen
|
a447a47661
|
(06129f656) Add some missing texts. Incomplete.
|
2019-05-16 05:26:25 +03:00 |
|
Joonas Rikkonen
|
053ef60fc4
|
(deee8cd6d) Merge branch 'dev' into human-ai
|
2019-05-16 05:23:20 +03:00 |
|
Joonas Rikkonen
|
65e284bf7c
|
(0fde6c604) Ignore dangerous targets.
|
2019-05-16 05:18:37 +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
|
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
|
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
|
cdeb6d40b3
|
(f3bfe1ac4) Fix damage priority calculation.
|
2019-05-16 05:10:25 +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
|
3a3d55d780
|
(39b4d0859) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:56 +03:00 |
|
Joonas Rikkonen
|
454dda56c7
|
(1762f02b3) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:22 +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
|
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
|
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
|
60f52375e6
|
(7788ec72a) Test issuing orders automatically.
|
2019-05-16 05:03:49 +03:00 |
|
Joonas Rikkonen
|
5031432e77
|
(513733e88) Check that the character is inside the same room as the target before repairing/operating an item.
|
2019-05-03 13:47:39 +03:00 |
|
Joonas Rikkonen
|
9b8d0ffc51
|
(17bb71ed5) Fix repair tool not being used if the repair target is not within interaction area. Fixes repairing items with the welding tool. Partial fix to #63 (dev).
|
2019-04-25 17:45:33 +03:00 |
|
Joonas Rikkonen
|
47ee14227e
|
(551008fc1) Abandon FixLeakObjective when the goto subobjective cannot be completed. Reset AIObjectiveLoops when the objective is activated or added. Don't clear ignored targets periodically by default. Calculate AIObjectiveGoTo CloseEnough when the objective is created. Don't use arm length in CloseEnough, because it's not used in range checks. Partial fixes to #1343.
|
2019-04-08 12:01:54 +03:00 |
|
Joonas Rikkonen
|
14d0daf16d
|
(ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:49:31 +03:00 |
|
Joonas Rikkonen
|
45c1ed499a
|
(e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used
|
2019-04-06 17:49:18 +03:00 |
|
Joonas Rikkonen
|
501a114000
|
(4119dec1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:19:55 +03:00 |
|
Joonas Rikkonen
|
d7364171fb
|
(e31a38ae1) Fixed spritebatch not being disposed when saving submarine preview images, don't reload all subs when saving a sub
|
2019-04-05 16:19:40 +03:00 |
|