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
|
5af8170ac6
|
(372c6e60a) More automatic text scaling + merge fix
|
2019-05-06 14:15:40 +03:00 |
|
Joonas Rikkonen
|
cffaef3c3c
|
(4dba94638) Legacy save file support (= save files present in Data/Saves will still be usable)
|
2019-05-06 11:29:24 +03:00 |
|
Joonas Rikkonen
|
5999a66681
|
(ac4fc6f29) Fixed EventInput crashing in 32-bit windows builds
|
2019-05-06 11:28:13 +03:00 |
|
Joonas Rikkonen
|
44001459c0
|
(ef6edf745) Fixed remote characters frequently getting stuck to the ragdoll state in multiplayer. Happened because the characters are forced to stay in ragdoll mode if they're moving more than 1 m/s, and if the character stops being ragdolled server-side and starts moving, the movement will prevent it from going back to normal state client-side. Now the client will simply determine the ragdoll state based on the ragdoll input from the server.
|
2019-05-06 11:24:37 +03:00 |
|
Joonas Rikkonen
|
65d627d57c
|
(2c9775b8e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-06 11:22:36 +03:00 |
|
Joonas Rikkonen
|
b797d112b7
|
(db4f4a55b) HasRequiredItems method is used for different purposes. Thus we shouldn't return true if the door is damaged but not broken, because it would cause issues for example in steering. Similarly I don't think we should use the canBePicked here, because it could be possible that the door should be interactable but not pickable.
|
2019-05-06 11:22:20 +03:00 |
|
Joonas Rikkonen
|
e4adc47dad
|
(1036993d3) Adjusted motion detector in autodoors
|
2019-05-06 11:22:02 +03:00 |
|
Joonas Rikkonen
|
30620ed059
|
(61cc49902) Don't create ai for the dummy character. Creates issues.
|
2019-05-06 11:21:45 +03:00 |
|
Joonas Rikkonen
|
872eeb70ce
|
(9b19bda7d) Workaround to characters' arms occasionally spinning when standing in place, don't offset limping characters' feet when not moving (the heavy leaning forwards looks unnatural), added a comment
|
2019-05-03 13:57:42 +03:00 |
|
Joonas Rikkonen
|
9121c878f5
|
(df822b5d5) Fixed characters not receiving impact damage when ragdolled. Closes #1433
|
2019-05-03 13:57:24 +03:00 |
|
Joonas Rikkonen
|
b0947d4bf8
|
(493361a05) Add a todo note.
|
2019-05-03 13:55:57 +03:00 |
|
Joonas Rikkonen
|
a11e7db190
|
(78f064b46) Revert "Cherry pick from human-ai: Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons."
|
2019-05-03 13:49:23 +03:00 |
|
Joonas Rikkonen
|
bd659383b4
|
(1aa050263) Cherry pick from human-ai: Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons.
|
2019-05-03 13:48:48 +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
|
1ff1584be5
|
(53f9210d1) Check the line of sight before fixing leaks or extinguishing fires.
|
2019-05-03 13:47:22 +03:00 |
|
Joonas Rikkonen
|
3d5e402d22
|
(a98f03ffb) Fix target blocking itself when it's structure. Take doors into account.
|
2019-05-03 13:46:48 +03:00 |
|
Joonas Rikkonen
|
e0732e6d57
|
(2eca8483c) Refactor CanSeeCharacter method and implement CanSeeTarget method. If we check whether or not we can see a character, it should now check if any of the limbs can be seen instead of always checking the head/torso etc. Not tested.
|
2019-05-03 13:45:58 +03:00 |
|
Joonas Rikkonen
|
953b5690ec
|
(2a7829fab) Add ISpatialEntity as a common interface for everything that has a position in the game world. Would have used IMapEntity, but there's already MapEntity, which inherits Entity, so that would be confusing. Declare the inheritance only in the shared class (Character).
|
2019-05-03 13:45:41 +03:00 |
|
Joonas Rikkonen
|
35f4657ea1
|
(d85d68721) Fixed character's feet getting stuck to platforms when climbing ladders while holding A/D
|
2019-05-03 13:44:04 +03:00 |
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
Joonas Rikkonen
|
aef95740d3
|
(768877381) Test: change the docking indicator to a pulsating crosshair when ready to dock (more noticeable than just changing the color of the centerline)
|
2019-05-03 13:43:26 +03:00 |
|
Joonas Rikkonen
|
7d7950e70b
|
(c3c244ef4) Nicer looking docking interface buttons (actual arrows instead of U, D, <, >)
|
2019-05-03 13:43:09 +03:00 |
|
Joonas Rikkonen
|
9b9735e2e7
|
(6aff06511) Fixed GUIComponent.SpriteEffects not having an effect on GUIImages
|
2019-05-03 13:42:53 +03:00 |
|
Joonas Rikkonen
|
bc5f571903
|
(29d8edbb9) Use a sprite to draw the lines on the sonar display (looks better than GUI.DrawLine)
|
2019-05-03 13:42:36 +03:00 |
|
Joonas Rikkonen
|
1d7faa8d1d
|
(b778c4641) Docking button works now in the docking interface, change button text depending on whether we're docking/undocking, some placeholder UI graphics for the nav terminal
|
2019-05-03 13:42:19 +03:00 |
|
Joonas Rikkonen
|
2f60af4365
|
(0947e0f05) Item.GetConnectedComponentsRecursive can traverse through relays and logic components
|
2019-05-03 13:42:00 +03:00 |
|
Joonas Rikkonen
|
32a8b97ad4
|
(01452b66f) Fixed "maintain position" indicators & inputs being relative to the center of the screen, not the center of the sub. Flash the docking button when ready to dock.
|
2019-05-03 13:41:42 +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 |
|