Hostility System
Implemented hostility system - entities can mark each other as friend or foe depending on changing conditions (currently only depends on local security level) Added "friendly" target indicators in blue
This commit is contained in:
parent
81acaf2a47
commit
1284149d47
39 changed files with 519 additions and 141 deletions
|
|
@ -2307,7 +2307,7 @@
|
|||
</Sound>
|
||||
<Folder Name="Cannon_gun" ID="{E5DFDBF4-5721-4187-8D25-D90903700EE9}" ShortID="1060416587">
|
||||
<ChildrenList>
|
||||
<Sound Name="cannon_fire" ID="{CC8D2668-6F4F-4272-86B2-9674CAEE2FCF}" ShortID="512141866">
|
||||
<Sound Name="Cannon_fire" ID="{CC8D2668-6F4F-4272-86B2-9674CAEE2FCF}" ShortID="512141866">
|
||||
<PropertyList>
|
||||
<Property Name="3DSpatialization" Type="int16" Value="2"/>
|
||||
<Property Name="Highpass" Type="int16">
|
||||
|
|
@ -2373,7 +2373,7 @@
|
|||
<ActiveSource Name="SFX_weapon_cannon_fire" ID="{BC90198B-673F-4DA7-9EB4-67B4BC2453FB}" Platform="Linked"/>
|
||||
</ActiveSourceList>
|
||||
</Sound>
|
||||
<Sound Name="cannon_hit" ID="{99F85F09-7AA1-4CFA-BD79-7789B22C8A8E}" ShortID="1068647667">
|
||||
<Sound Name="Cannon_hit" ID="{99F85F09-7AA1-4CFA-BD79-7789B22C8A8E}" ShortID="1068647667">
|
||||
<PropertyList>
|
||||
<Property Name="3DSpatialization" Type="int16" Value="2"/>
|
||||
<Property Name="Highpass" Type="int16">
|
||||
|
|
@ -2440,7 +2440,7 @@
|
|||
<ActiveSource Name="SFX_weapon_cannon_hit" ID="{29DE1CA9-7843-4B8A-81B2-255288EA24F3}" Platform="Linked"/>
|
||||
</ActiveSourceList>
|
||||
</Sound>
|
||||
<Sound Name="cannon_ship_destroyed" ID="{A5A74A9F-967D-4624-AC4B-3AD0573FE1C9}" ShortID="371823711">
|
||||
<Sound Name="Cannon_ship_destroyed" ID="{A5A74A9F-967D-4624-AC4B-3AD0573FE1C9}" ShortID="371823711">
|
||||
<PropertyList>
|
||||
<Property Name="3DSpatialization" Type="int16" Value="2"/>
|
||||
<Property Name="Highpass" Type="int16">
|
||||
|
|
@ -2503,7 +2503,7 @@
|
|||
<ActiveSource Name="SFX_weapon_cannon_hit" ID="{4C561304-9CA6-4CA2-A3AC-7A280E1FC25C}" Platform="Linked"/>
|
||||
</ActiveSourceList>
|
||||
</Sound>
|
||||
<RandomSequenceContainer Name="cannon_miss" ID="{481DB8D8-3BA3-428A-B8B3-DECF5A568D60}" ShortID="977076854">
|
||||
<RandomSequenceContainer Name="Cannon_miss" ID="{481DB8D8-3BA3-428A-B8B3-DECF5A568D60}" ShortID="977076854">
|
||||
<PropertyList>
|
||||
<Property Name="3DSpatialization" Type="int16" Value="2"/>
|
||||
<Property Name="Highpass" Type="int16">
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@
|
|||
<Property Name="GenerateSoundBanks\x64_SelectedPlatforms" Type="string" Value="74wppGGLGUKocCTUjliE6atk2Ww+IVRJs5fEQCA5KRI="/>
|
||||
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="Za5mlmZVs0yOu7E3c3kEhXSKlUaqlINNhKJXlakG6GST8E5vupvETYQ2huJEcWGrSmgS3nSEw0miaQE+YFVy9QY/x16o9PZItj3ojqC5EK2og/98mcaOTKpRAxiUGqrTg28tAxQIvEmhYGyC91kSrR+chcmRgJhGt2N3GZgjDIHthAk1VRuHQKFsG3D+ioKLkXoxD61LqUCO+4Lawl5ffJ4FL/v2+bRBo/3Iezc3mrRhO2GpvVNORZtuDp8Fh1/6KIMtl4HI002epB73v2D5XEDzRwKdZpdGp9A1J8v1gGkHDOPiWGJmTb0MvxoxxAruEqVoKQFKSkSwW9fwHyzGX3zVNCY9JBdJi7DIXcLnL0MhDBOG3YG4TZAq8XLM15Zm"/>
|
||||
<Property Name="HardwareController\CurrentSession" Type="string" Value="{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}"/>
|
||||
<Property Name="HardwareController\{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}\x64_ActiveGroups" Type="string" Value="sahohopAK0WRE4XvXPYF/QHvygD/////+lZlPDTFnUSwqLpTpFltuQHvygD/////"/>
|
||||
<Property Name="HardwareController\{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}\x64_ActiveGroups" Type="string" Value="sahohopAK0WRE4XvXPYF/QHvEwH/////+lZlPDTFnUSwqLpTpFltuQHvEwH/////"/>
|
||||
<Property Name="Interactive Music\x64_{065373CA-B6B7-4634-9C4B-6D6F79214FAA} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP+PLJfkeqhdAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
|
||||
<Property Name="Interactive Music\x64_{586B920D-AA94-4B2C-828B-37B68C3F2982} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwPxf6U4KZ8SFAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
|
||||
<Property Name="Interactive Music\x64_{7282DE71-9B0C-4E9B-960C-0EF0036250A4} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP4NGy0A+qhxAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
|
||||
|
|
@ -150,18 +150,18 @@
|
|||
<Property Name="ProjectExplorer\FirstVisible_10_1" Type="string" Value="{4C96B38B-3DB4-40C7-91C9-665510E38993}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_11_1" Type="string" Value="{4C96B38B-3DB4-40C7-91C9-665510E38993}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_12_1" Type="string" Value="{23EC2DE3-3ED8-4B82-AC99-92E25F2E4C6B}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_1_1" Type="string" Value="{076C9B1F-5546-43DA-8A92-E4A1C9B3FD42}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_1_1" Type="string" Value="{A840C15E-F723-46FB-A6CF-9D8CDA869AEE}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_3_1" Type="string" Value="{A69BF0FC-D84A-487C-ABDD-56F71CB2A126}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_4_1" Type="string" Value="{FD58627D-DA04-4181-8A2E-6995EE927024}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_5_1" Type="string" Value="{CB6175F1-6080-4A23-92EF-0807E304D0C1}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_4_1" Type="string" Value="{73F86CF2-764E-4EE6-83F3-A385BE96CCD1}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_5_1" Type="string" Value="{D04C8C16-82AB-4895-B181-95D353956951}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_6_1" Type="string" Value="{C98E673F-A24C-48A8-960F-10565FFE70A0}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_7_1" Type="string" Value="{C98E673F-A24C-48A8-960F-10565FFE70A0}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_7_1" Type="string" Value="{46958A74-94AA-4D83-84A2-5795A906E864}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_8_1" Type="string" Value="{41093F77-829F-4D88-8601-E8B25F3D4781}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_9_1" Type="string" Value="{41093F77-829F-4D88-8601-E8B25F3D4781}"/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_10_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_11_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_12_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_13_1" Type="string" Value="q2PPeqBdrkC8FluEK/lXKQk+ngR9C+hDlZu300kLqf/xhFaWG58XRbGhviCrj5N6KHNLKmE8UkaVaxXDHGvW0/Qit3ydOGdIh8oAEgp0WiKCVXSIS+HdSouZqzbGVH9lvvuxxoiq2E+c+gyku4FwHg=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_13_1" Type="string" Value="q2PPeqBdrkC8FluEK/lXKShzSyphPFJGlWsVwxxr1tP0Ird8nThnSIfKABIKdFoiglV0iEvh3UqLmas2xlR/ZQ=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_14_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_15_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_16_1" Type="string" Value=""/>
|
||||
|
|
@ -173,16 +173,16 @@
|
|||
<Property Name="ProjectExplorer\x64_Expanded_21_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_22_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_2_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_3_1" Type="string" Value="5mszmjEJjECJveimULc2ly1MVjXJG7tAs2XZxKR65fGOlvkQeABMQbc9Iaoc0J04zyPFD6h9VkGze7siv8YDSlSN5LS1oHJBimEBPM+wWPj029/lIVeHQY0l2QkDcA7p2LgdSKM7ikK4s97PWlaNYB+bbAdGVdpDipLkocmz/UKZM+UxzkzgQ7XwPt+YZXOeQrPGKYRK4kaTEUYpTSWjfpIWGli/U5VJn3j3XcMPxuL0wV+aunkGSpmEZaTdHIFnAtrhC8nAjUyLjKDM+dQ4eR5Gl589G7NMkBQogmOOCg3hVWU0WHgqTrmszB5JkHWePMoV8hASc06ezT5vc2kjXp0f+wOf2TBPs7gfG3QtLFVbJQVCfadFT7ol1mv4I5zV"/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_4_1" Type="string" Value="RKCoPPy0bkCCcQXv8eepOG/Oljc7P+BAmBxnt9FVODoHd4ejsmpvQb19amPUHbdefWJY/QTagUGKLmmV7pJwJL9QNYS3yZtCiqiLuGpAITwbjnC6qA54Q6f/cg8dYm6CungmQHz3rUOTPoxwGuOBS1bDQsXzBtdDh7ejsX9loVlN1jbmEMy7Rb/5y3dd5BFpTvDkPcMkdUe3MNSSXpgHpQbuQBFpJJVHklAMcr/67xtVbZDm/nqrR5O1mbNTJWEN6B6PCYa/CkmNjMns+nbtKq/od+46YaJJjHfjezhn53A6JKx5R065SaDiKxYo5giMPY3G4xeZDUudCukE17j89/hzr7EXj1ZLlMBEHXdzkjSDYFNyrKOxS77srGpI90ncXMvPttDmEk2LW5meVxT4OUrP9+SN5FZNlRdhY6pOj7MDJpsIq+jHTpHNOvX+wVKlx0jx0GZH+U6yXgMuajQ5pg=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_3_1" Type="string" Value="5mszmjEJjECJveimULc2ly1MVjXJG7tAs2XZxKR65fGOlvkQeABMQbc9Iaoc0J04zyPFD6h9VkGze7siv8YDSlSN5LS1oHJBimEBPM+wWPj029/lIVeHQY0l2QkDcA7poly6dK9voEGMn2JNk9uOJNi4HUijO4pCuLPez1pWjWAfm2wHRlXaQ4qS5KHJs/1CmTPlMc5M4EO18D7fmGVznkKzximESuJGkxFGKU0lo36SFhpYv1OVSZ94913DD8bi9MFfmrp5BkqZhGWk3RyBZwLa4QvJwI1Mi4ygzPnUOHkeRpefPRuzTJAUKIJjjgoN4VVlNFh4Kk65rMweSZB1njzKFfIQEnNOns0+b3NpI16dH/sDn9kwT7O4Hxt0LSxVWyUFQn2nRU+6JdZr+COc1Q=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_4_1" Type="string" Value="RKCoPPy0bkCCcQXv8eepOG/Oljc7P+BAmBxnt9FVODoHd4ejsmpvQb19amPUHbdefWJY/QTagUGKLmmV7pJwJL9QNYS3yZtCiqiLuGpAITwbjnC6qA54Q6f/cg8dYm6CungmQHz3rUOTPoxwGuOBS1bDQsXzBtdDh7ejsX9loVlN1jbmEMy7Rb/5y3dd5BFpTvDkPcMkdUe3MNSSXpgHpQbuQBFpJJVHklAMcr/67xtVbZDm/nqrR5O1mbNTJWEN6B6PCYa/CkmNjMns+nbtKq/od+46YaJJjHfjezhn53A6JKx5R065SaDiKxYo5giMPY3G4xeZDUudCukE17j89/hzr7EXj1ZLlMBEHXdzkjSDYFNyrKOxS77srGpI90ncXMvPttDmEk2LW5meVxT4OUrP9+SN5FZNlRdhY6pOj7N44EPm8uRyTr068Na6vAPNAyabCKvox06RzTr1/sFSpcdI8dBmR/lOsl4DLmo0OaY="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_5_1" Type="string" Value="AlekTQhF7EqFkQdJV+6xTg=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_6_1" Type="string" Value=""/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_7_1" Type="string" Value="XauXjQKuVUGiRlV8dB3srnaEJ7RCyOZBrRNq5HwcVY8n2cxK9AmIQrh8e0QsnPsKW3PN2icgxEWSMy36nfKfTFNFtRmQl/5Fq1lEm+BmOxG4Q7HqupazSoJZtOVbQ1I66tA4kU6ZlEygIlAJuzX8O+zW0PHXYlJNu1mf6Prap20926c37VnfTYa94Acg+F8j3jePNb9nT06OOrLWe8QYMPOeHmWIm8xPtlOqph86KSE="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_8_1" Type="string" Value="Bclcc8A9IEKzeqI7Supe3jIjyQqAyJNCm3a9EGUqOnlUIxUCz0WJQ7Q1U2f6gMiBFoxM0KuClUixgZXTU5VpUbkoo5lcDOZKuGjI/8sf/8IGMi54KI/mTJCHmw6uWg5Y"/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_8_1" Type="string" Value="Bclcc8A9IEKzeqI7Supe3jIjyQqAyJNCm3a9EGUqOnlUIxUCz0WJQ7Q1U2f6gMiBFoxM0KuClUixgZXTU5VpUbkoo5lcDOZKuGjI/8sf/8IGMi54KI/mTJCHmw6uWg5Yvy0YCoz5dk+nzp3Br2XIlw=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_9_1" Type="string" Value=""/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{054DD684-3F0A-4629-BB94-1E5A662EED8A}" Type="Real64" Value="0.94"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{054DD684-3F0A-4629-BB94-1E5A662EED8A}" Type="Real64" Value="0.24"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{082F199E-AA5F-42DE-A1D7-C9BFC973DB9D}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{0FCABA25-DB66-4E12-ABEC-6E75E92AD397}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{0FCABA25-DB66-4E12-ABEC-6E75E92AD397}" Type="Real64" Value="0.96"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{215424C5-9F3E-438A-AE24-4314B540C243}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{264C0657-8EE3-435B-9D01-246DABEB52D7}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{29928AF3-1DE3-475C-9CF6-9892FED27E34}" Type="Real64" Value="1"/>
|
||||
|
|
@ -191,12 +191,12 @@
|
|||
<Property Name="RTPC\GameParameterSimValue\{64F012EA-795C-4DDF-82F0-00DFA345043A}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{69088562-620A-4123-8C93-DDBD1437C6C9}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{72651D5D-22E1-4AEE-87FA-9F706D12B1DC}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{73534BF8-0FC9-4F33-92A9-D9E445654891}" Type="Real64" Value="0.71"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{73534BF8-0FC9-4F33-92A9-D9E445654891}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{778F5836-B82F-46F8-936A-E8581E9DA7A9}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{9D610C30-BA07-43EF-B2E3-6CEB72857C03}" Type="Real64" Value="0.54"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{9D610C30-BA07-43EF-B2E3-6CEB72857C03}" Type="Real64" Value="0.66"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{A5EACAF7-0E81-432C-A284-84437E8983B3}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B54383F3-A1EF-4FCA-94D5-24A7E4AC228C}" Type="Real64" Value="0.5"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B907BE30-367C-4955-AF3B-AF6B2806F9D5}" Type="Real64" Value="100"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B54383F3-A1EF-4FCA-94D5-24A7E4AC228C}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B907BE30-367C-4955-AF3B-AF6B2806F9D5}" Type="Real64" Value="74"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{D962E3DD-1F06-4C09-B49B-B4158D76A581}" Type="Real64" Value="0.01"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{DB985387-9685-4E6D-BF7E-AAE3C0C79457}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{E9101997-FD09-41DC-8BB2-B7519B030AE8}" Type="Real64" Value="1"/>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<Action Name="" ID="{59A8D214-3A73-42B3-8497-E153E1B0802F}" ShortID="751616969">
|
||||
<ReferenceList>
|
||||
<Reference Name="Target">
|
||||
<ObjectRef Name="cannon_hit" ID="{99F85F09-7AA1-4CFA-BD79-7789B22C8A8E}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
<ObjectRef Name="Cannon_hit" ID="{99F85F09-7AA1-4CFA-BD79-7789B22C8A8E}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
</Reference>
|
||||
</ReferenceList>
|
||||
</Action>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<Action Name="" ID="{127976EC-CD90-4439-A51B-0F23BCE5A61E}" ShortID="1057725604">
|
||||
<ReferenceList>
|
||||
<Reference Name="Target">
|
||||
<ObjectRef Name="cannon_fire" ID="{CC8D2668-6F4F-4272-86B2-9674CAEE2FCF}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
<ObjectRef Name="Cannon_fire" ID="{CC8D2668-6F4F-4272-86B2-9674CAEE2FCF}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
</Reference>
|
||||
</ReferenceList>
|
||||
</Action>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
<Action Name="" ID="{C021A046-E540-4833-B3FC-E427E56F799D}" ShortID="119140805">
|
||||
<ReferenceList>
|
||||
<Reference Name="Target">
|
||||
<ObjectRef Name="cannon_ship_destroyed" ID="{A5A74A9F-967D-4624-AC4B-3AD0573FE1C9}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
<ObjectRef Name="Cannon_ship_destroyed" ID="{A5A74A9F-967D-4624-AC4B-3AD0573FE1C9}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
</Reference>
|
||||
</ReferenceList>
|
||||
</Action>
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<Action Name="" ID="{82FFFDEC-C198-47D7-A92E-2CAA1ACB64A4}" ShortID="903929772">
|
||||
<ReferenceList>
|
||||
<Reference Name="Target">
|
||||
<ObjectRef Name="cannon_miss" ID="{481DB8D8-3BA3-428A-B8B3-DECF5A568D60}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
<ObjectRef Name="Cannon_miss" ID="{481DB8D8-3BA3-428A-B8B3-DECF5A568D60}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
|
||||
</Reference>
|
||||
</ReferenceList>
|
||||
</Action>
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
<ChildrenList>
|
||||
<Folder Name="Electric" ID="{E4F7CF4A-E48D-4D56-9517-6163AA4E8FB3}" ShortID="815512515">
|
||||
<ChildrenList>
|
||||
<Event Name="electric_drive_stop" ID="{1098DC5B-9284-4AE8-A4AA-5795A99C565A}">
|
||||
<Event Name="Electric_drive_stop" ID="{1098DC5B-9284-4AE8-A4AA-5795A99C565A}">
|
||||
<ChildrenList>
|
||||
<Action Name="" ID="{F59FB234-F55C-4609-B7FE-7F0371182A35}" ShortID="540391783">
|
||||
<PropertyList>
|
||||
|
|
@ -424,7 +424,7 @@
|
|||
</Action>
|
||||
</ChildrenList>
|
||||
</Event>
|
||||
<Event Name="electric_drive_play" ID="{C231C587-6292-47DD-BD73-AD4D8D14F12B}">
|
||||
<Event Name="Electric_drive_play" ID="{C231C587-6292-47DD-BD73-AD4D8D14F12B}">
|
||||
<ChildrenList>
|
||||
<Action Name="" ID="{E3A24AA9-0C6A-4220-83FA-8FEF95E4B809}" ShortID="31310572">
|
||||
<ReferenceList>
|
||||
|
|
@ -460,7 +460,7 @@
|
|||
</Folder>
|
||||
<Folder Name="Nuclear" ID="{B6CFCB5C-E6D0-4D12-8B5B-999E5714F839}" ShortID="340723961">
|
||||
<ChildrenList>
|
||||
<Event Name="nuclear_drive_stop" ID="{73F86CF2-764E-4EE6-83F3-A385BE96CCD1}">
|
||||
<Event Name="Nuclear_drive_stop" ID="{73F86CF2-764E-4EE6-83F3-A385BE96CCD1}">
|
||||
<ChildrenList>
|
||||
<Action Name="" ID="{5680FA19-3671-4B8E-ADE2-B136DB0A9A8F}" ShortID="775093477">
|
||||
<PropertyList>
|
||||
|
|
@ -504,7 +504,7 @@
|
|||
</Action>
|
||||
</ChildrenList>
|
||||
</Event>
|
||||
<Event Name="nuclear_drive_play" ID="{B92BC8AD-BEE8-4171-BDBF-AE18AEAEFF80}">
|
||||
<Event Name="Nuclear_drive_play" ID="{B92BC8AD-BEE8-4171-BDBF-AE18AEAEFF80}">
|
||||
<ChildrenList>
|
||||
<Action Name="" ID="{55634FE4-3E11-467F-BA15-D1509ACD9749}" ShortID="58886145">
|
||||
<ReferenceList>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
<SoundcasterSession Name="spaceship02" ID="{901A806C-BACF-44C7-A74C-C5AB11105856}">
|
||||
<ModuleList>
|
||||
<Module>
|
||||
<ObjectRef Name="electric_drive_play" ID="{C231C587-6292-47DD-BD73-AD4D8D14F12B}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<ObjectRef Name="Electric_drive_play" ID="{C231C587-6292-47DD-BD73-AD4D8D14F12B}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<Position X="0" Y="0"/>
|
||||
</Module>
|
||||
<Module>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<Position X="0" Y="4"/>
|
||||
</Module>
|
||||
<Module>
|
||||
<ObjectRef Name="electric_drive_stop" ID="{1098DC5B-9284-4AE8-A4AA-5795A99C565A}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<ObjectRef Name="Electric_drive_stop" ID="{1098DC5B-9284-4AE8-A4AA-5795A99C565A}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<Position X="1" Y="0"/>
|
||||
</Module>
|
||||
<Module>
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
<Position X="1" Y="3"/>
|
||||
</Module>
|
||||
<Module>
|
||||
<ObjectRef Name="nuclear_drive_play" ID="{B92BC8AD-BEE8-4171-BDBF-AE18AEAEFF80}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<ObjectRef Name="Nuclear_drive_play" ID="{B92BC8AD-BEE8-4171-BDBF-AE18AEAEFF80}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<Position X="2" Y="0"/>
|
||||
</Module>
|
||||
<Module>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
<Position X="2" Y="4"/>
|
||||
</Module>
|
||||
<Module>
|
||||
<ObjectRef Name="nuclear_drive_stop" ID="{73F86CF2-764E-4EE6-83F3-A385BE96CCD1}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<ObjectRef Name="Nuclear_drive_stop" ID="{73F86CF2-764E-4EE6-83F3-A385BE96CCD1}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<Position X="3" Y="0"/>
|
||||
</Module>
|
||||
<Module>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 1.3
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 40
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: -10
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 10
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 2.9
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 0.1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 139.4
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 150
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 50
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 0.4
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 0.25
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 54
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 0.1
|
||||
- _Depth: 2000
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Material:
|
|||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 1
|
||||
- _Depth: 10
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ Material:
|
|||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _Scale: 0.5
|
||||
- _Scale: 6.0524
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
|
|
|
|||
BIN
Assets/Resources/Settings.asset
(Stored with Git LFS)
BIN
Assets/Resources/Settings.asset
(Stored with Git LFS)
Binary file not shown.
|
|
@ -4226,6 +4226,93 @@ Camera:
|
|||
m_OcclusionCulling: 0
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!1 &332734005
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 332734006}
|
||||
- component: {fileID: 332734009}
|
||||
- component: {fileID: 332734008}
|
||||
- component: {fileID: 332734007}
|
||||
m_Layer: 5
|
||||
m_Name: Visible Friendly
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &332734006
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 332734005}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 965868420}
|
||||
- {fileID: 1541341821}
|
||||
m_Father: {fileID: 346000247}
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 74.8}
|
||||
m_SizeDelta: {x: 16, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &332734007
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 332734005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 79e1b49bde6c1c54aa6b5c2256e0e382, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NoiseAmplitude: 0
|
||||
NoiseFrequency: 0
|
||||
Canvas: {fileID: 761574180}
|
||||
BorderPixels: 10
|
||||
PointAtTarget: 1
|
||||
ScreenSpaceOffset: {x: 0, y: 25}
|
||||
EdgeMargin: 0.001
|
||||
Target: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &332734008
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 332734005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e39172b086df1a44c8da6b3962a5ecd3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Transform: {fileID: 332734006}
|
||||
Fill: {fileID: 965868421}
|
||||
Place: {fileID: 332734007}
|
||||
--- !u!114 &332734009
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 332734005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &342600466
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4439,6 +4526,7 @@ RectTransform:
|
|||
- {fileID: 1631662978}
|
||||
- {fileID: 146394775}
|
||||
- {fileID: 1787772780}
|
||||
- {fileID: 332734006}
|
||||
m_Father: {fileID: 761574181}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -8803,7 +8891,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 1, g: 0.625, b: 0.5, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
@ -14721,6 +14809,81 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &965868419
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 965868420}
|
||||
- component: {fileID: 965868422}
|
||||
- component: {fileID: 965868421}
|
||||
m_Layer: 5
|
||||
m_Name: Fill
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &965868420
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 965868419}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 332734006}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &965868421
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 965868419}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.5, g: 0.75, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 9e87ff4a45e1fff4e8f210c3c26551a0, type: 3}
|
||||
m_Type: 3
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 1
|
||||
m_FillAmount: 0.582
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 1
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &965868422
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 965868419}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &970624069
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -15552,6 +15715,7 @@ MonoBehaviour:
|
|||
GameplayUI: {fileID: 346000248}
|
||||
EventLog: {fileID: 1396909588}
|
||||
HostileTargetIndicator: {fileID: 1787772783}
|
||||
FriendlyTargetIndicator: {fileID: 332734009}
|
||||
ViewDot: {fileID: 146394778}
|
||||
LockIndicator: {fileID: 1876420642}
|
||||
Crosshairs:
|
||||
|
|
@ -23026,6 +23190,81 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1539162433}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1541341820
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1541341821}
|
||||
- component: {fileID: 1541341823}
|
||||
- component: {fileID: 1541341822}
|
||||
m_Layer: 5
|
||||
m_Name: Stroke
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1541341821
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1541341820}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 332734006}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1541341822
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1541341820}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0.5, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 9fa59801aac390542a1aab396485ab57, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &1541341823
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1541341820}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1542388327
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -30349,7 +30588,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2115559087}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b642ff60407fe724bafa6602199213c0, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -30367,15 +30606,15 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2115559087}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 899f97884c6d96b4ca20648ec109a37f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
pattern: 9
|
||||
patternScale: 1
|
||||
activeSample: {x: -0.0309703, y: -0.24158497, z: -0.1195988, w: -0.14001325}
|
||||
activeIndex: 9
|
||||
activeSample: {x: 0, y: 0, z: 0, w: 0}
|
||||
activeIndex: -2
|
||||
--- !u!114 &2115559098
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -30383,7 +30622,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2115559087}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 65f5677aa325c184f801528d78a73827, type: 3}
|
||||
m_Name:
|
||||
|
|
|
|||
|
|
@ -802,8 +802,8 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 741153267}
|
||||
m_LocalRotation: {x: 0.015506897, y: 0.9502416, z: -0.30741316, w: 0.047933206}
|
||||
m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026}
|
||||
m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.04793323}
|
||||
m_LocalPosition: {x: -117.51999, y: -77.08743, z: 149.09026}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 412917866}
|
||||
|
|
@ -1304,8 +1304,8 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 965376321}
|
||||
m_LocalRotation: {x: 0.015506897, y: 0.9502416, z: -0.30741316, w: 0.047933206}
|
||||
m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026}
|
||||
m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.04793323}
|
||||
m_LocalPosition: {x: -117.51999, y: -77.08743, z: 149.09026}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
|
|
@ -1369,7 +1369,9 @@ MonoBehaviour:
|
|||
m_ShowCustomSorter: 0
|
||||
breakBeforeColorGrading: 0
|
||||
m_BeforeTransparentBundles: []
|
||||
m_BeforeStackBundles: []
|
||||
m_BeforeStackBundles:
|
||||
- assemblyQualifiedName: UnityEngine.Rendering.PostProcessing.DepthOfField, Assembly-CSharp,
|
||||
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_AfterStackBundles: []
|
||||
--- !u!114 &965376326
|
||||
MonoBehaviour:
|
||||
|
|
@ -1453,8 +1455,8 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
pattern: 12
|
||||
patternScale: 1
|
||||
activeSample: {x: -0.25, y: 0.16666669, z: 0, w: -0.16666666}
|
||||
activeIndex: 1
|
||||
activeSample: {x: -0.375, y: -0.055555552, z: 0.25, w: -0.3888889}
|
||||
activeIndex: 3
|
||||
--- !u!114 &965376331
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2451,7 +2453,7 @@ PrefabInstance:
|
|||
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 60.98
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
|
|
@ -2476,7 +2478,7 @@ PrefabInstance:
|
|||
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 55.675
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -170,6 +170,7 @@ public class ActionGameManager : MonoBehaviour
|
|||
public CanvasGroup GameplayUI;
|
||||
public EventLog EventLog;
|
||||
public Prototype HostileTargetIndicator;
|
||||
public Prototype FriendlyTargetIndicator;
|
||||
public PlaceUIElementWorldspace ViewDot;
|
||||
public Prototype LockIndicator;
|
||||
public PlaceUIElementWorldspace[] Crosshairs;
|
||||
|
|
@ -209,7 +210,8 @@ public class ActionGameManager : MonoBehaviour
|
|||
private float3 _viewDirection;
|
||||
private (HardpointData[] hardpoints, Transform[] barrels, PlaceUIElementWorldspace crosshair)[] _articulationGroups;
|
||||
private (LockWeapon targetLock, PlaceUIElementWorldspace indicator, Rotate spin)[] _lockingIndicators;
|
||||
private Dictionary<Entity, VisibleHostileIndicator> _visibleHostileIndicators = new Dictionary<Entity, VisibleHostileIndicator>();
|
||||
private Dictionary<Entity, VisibleTargetIndicator> _visibleHostileIndicators = new Dictionary<Entity, VisibleTargetIndicator>();
|
||||
private Dictionary<Entity, VisibleTargetIndicator> _visibleFriendlyIndicators = new Dictionary<Entity, VisibleTargetIndicator>();
|
||||
private List<IDisposable> _shipSubscriptions = new List<IDisposable>();
|
||||
private List<IDisposable> _targetSubscriptions = new List<IDisposable>();
|
||||
private float _severeHeatstrokePhase;
|
||||
|
|
@ -362,6 +364,7 @@ public class ActionGameManager : MonoBehaviour
|
|||
{
|
||||
_uiHidden = !_uiHidden;
|
||||
GameplayUI.alpha = _uiHidden ? 0 : 1;
|
||||
ActionBar.gameObject.SetActive(!_uiHidden);
|
||||
};
|
||||
|
||||
Input.Player.OverrideShutdown.performed += context =>
|
||||
|
|
@ -393,33 +396,33 @@ public class ActionGameManager : MonoBehaviour
|
|||
|
||||
Input.Player.TargetReticle.performed += context =>
|
||||
{
|
||||
if (!CurrentEntity.VisibleHostiles.Any()) return;
|
||||
var underReticle = CurrentEntity.VisibleHostiles.Where(x => x != CurrentEntity)
|
||||
if (!CurrentEntity.VisibleEnemies.Any()) return;
|
||||
var underReticle = CurrentEntity.VisibleEnemies.Where(x => x != CurrentEntity)
|
||||
.MaxBy(x => dot(normalize(x.Position - CurrentEntity.Position), CurrentEntity.LookDirection));
|
||||
CurrentEntity.Target.Value = CurrentEntity.Target.Value == underReticle ? null : underReticle;
|
||||
};
|
||||
|
||||
Input.Player.TargetNearest.performed += context =>
|
||||
{
|
||||
if(CurrentEntity.VisibleHostiles.Any())
|
||||
if(CurrentEntity.VisibleEnemies.Any())
|
||||
{
|
||||
CurrentEntity.Target.Value = CurrentEntity.VisibleHostiles.Where(x => x != CurrentEntity)
|
||||
CurrentEntity.Target.Value = CurrentEntity.VisibleEnemies.Where(x => x != CurrentEntity)
|
||||
.MaxBy(x => length(x.Position - CurrentEntity.Position));
|
||||
}
|
||||
};
|
||||
|
||||
Input.Player.TargetNext.performed += context =>
|
||||
{
|
||||
if (!CurrentEntity.VisibleHostiles.Any()) return;
|
||||
var targets = CurrentEntity.VisibleHostiles.Where(x => x != CurrentEntity).OrderBy(x => length(x.Position - CurrentEntity.Position)).ToArray();
|
||||
if (!CurrentEntity.VisibleEnemies.Any()) return;
|
||||
var targets = CurrentEntity.VisibleEnemies.Where(x => x != CurrentEntity).OrderBy(x => length(x.Position - CurrentEntity.Position)).ToArray();
|
||||
var currentTargetIndex = Array.IndexOf(targets, CurrentEntity.Target.Value);
|
||||
CurrentEntity.Target.Value = targets[(currentTargetIndex + 1) % targets.Length];
|
||||
};
|
||||
|
||||
Input.Player.TargetPrevious.performed += context =>
|
||||
{
|
||||
if (!CurrentEntity.VisibleHostiles.Any()) return;
|
||||
var targets = CurrentEntity.VisibleHostiles.Where(x => x != CurrentEntity).OrderBy(x => length(x.Position - CurrentEntity.Position)).ToArray();
|
||||
if (!CurrentEntity.VisibleEnemies.Any()) return;
|
||||
var targets = CurrentEntity.VisibleEnemies.Where(x => x != CurrentEntity).OrderBy(x => length(x.Position - CurrentEntity.Position)).ToArray();
|
||||
var currentTargetIndex = Array.IndexOf(targets, CurrentEntity.Target.Value);
|
||||
CurrentEntity.Target.Value = targets[(currentTargetIndex + targets.Length - 1) % targets.Length];
|
||||
};
|
||||
|
|
@ -676,7 +679,7 @@ public class ActionGameManager : MonoBehaviour
|
|||
sectorZone,
|
||||
IsTutorial
|
||||
);
|
||||
sectorZone.Contents = new Zone(ItemManager, Settings.PlanetSettings, sectorZone.PackedContents, sectorZone);
|
||||
sectorZone.Contents = new Zone(ItemManager, Settings.PlanetSettings, sectorZone.PackedContents, sectorZone, CurrentSector);
|
||||
}
|
||||
Zone = sectorZone.Contents;
|
||||
PlayMusic(MusicType.Overworld);
|
||||
|
|
@ -916,12 +919,12 @@ public class ActionGameManager : MonoBehaviour
|
|||
|
||||
private void UnbindEntity()
|
||||
{
|
||||
foreach (var indicator in _visibleHostileIndicators)
|
||||
{
|
||||
Destroy(indicator.Value.gameObject);
|
||||
}
|
||||
|
||||
foreach (var indicator in _visibleHostileIndicators) Destroy(indicator.Value.gameObject);
|
||||
_visibleHostileIndicators.Clear();
|
||||
|
||||
foreach (var indicator in _visibleFriendlyIndicators) Destroy(indicator.Value.gameObject);
|
||||
_visibleFriendlyIndicators.Clear();
|
||||
|
||||
if(_lockingIndicators!=null) foreach(var (_, indicator, _) in _lockingIndicators)
|
||||
indicator.GetComponent<Prototype>().ReturnToPool();
|
||||
DisablePlayerInput();
|
||||
|
|
@ -1016,23 +1019,41 @@ public class ActionGameManager : MonoBehaviour
|
|||
}
|
||||
}));
|
||||
|
||||
foreach (var hostile in CurrentEntity.VisibleHostiles)
|
||||
foreach (var hostile in CurrentEntity.VisibleEnemies)
|
||||
{
|
||||
var indicator = HostileTargetIndicator.Instantiate<VisibleHostileIndicator>();
|
||||
var indicator = HostileTargetIndicator.Instantiate<VisibleTargetIndicator>();
|
||||
_visibleHostileIndicators.Add(hostile, indicator);
|
||||
}
|
||||
|
||||
_shipSubscriptions.Add(CurrentEntity.VisibleHostiles.ObserveAdd().Subscribe(addEvent =>
|
||||
_shipSubscriptions.Add(CurrentEntity.VisibleEnemies.ObserveAdd().Subscribe(addEvent =>
|
||||
{
|
||||
var indicator = HostileTargetIndicator.Instantiate<VisibleHostileIndicator>();
|
||||
var indicator = HostileTargetIndicator.Instantiate<VisibleTargetIndicator>();
|
||||
_visibleHostileIndicators.Add(addEvent.Value, indicator);
|
||||
}));
|
||||
|
||||
_shipSubscriptions.Add(CurrentEntity.VisibleHostiles.ObserveRemove().Subscribe(removeEvent =>
|
||||
_shipSubscriptions.Add(CurrentEntity.VisibleEnemies.ObserveRemove().Subscribe(removeEvent =>
|
||||
{
|
||||
_visibleHostileIndicators[removeEvent.Value].GetComponent<Prototype>().ReturnToPool();
|
||||
_visibleHostileIndicators.Remove(removeEvent.Value);
|
||||
}));
|
||||
|
||||
foreach (var friendly in CurrentEntity.VisibleFriendlies)
|
||||
{
|
||||
var indicator = FriendlyTargetIndicator.Instantiate<VisibleTargetIndicator>();
|
||||
_visibleFriendlyIndicators.Add(friendly, indicator);
|
||||
}
|
||||
|
||||
_shipSubscriptions.Add(CurrentEntity.VisibleFriendlies.ObserveAdd().Subscribe(addEvent =>
|
||||
{
|
||||
var indicator = FriendlyTargetIndicator.Instantiate<VisibleTargetIndicator>();
|
||||
_visibleFriendlyIndicators.Add(addEvent.Value, indicator);
|
||||
}));
|
||||
|
||||
_shipSubscriptions.Add(CurrentEntity.VisibleFriendlies.ObserveRemove().Subscribe(removeEvent =>
|
||||
{
|
||||
_visibleFriendlyIndicators[removeEvent.Value].GetComponent<Prototype>().ReturnToPool();
|
||||
_visibleFriendlyIndicators.Remove(removeEvent.Value);
|
||||
}));
|
||||
|
||||
_shipSubscriptions.Add(CurrentEntity.Death.Subscribe(Die));
|
||||
|
||||
|
|
@ -1175,6 +1196,19 @@ public class ActionGameManager : MonoBehaviour
|
|||
sin(TargetSpottedBlinkFrequency * Time.time) + TargetSpottedBlinkOffset > 0;
|
||||
}
|
||||
}
|
||||
foreach (var indicator in _visibleFriendlyIndicators)
|
||||
{
|
||||
indicator.Value.gameObject.SetActive(indicator.Key!=CurrentEntity.Target.Value);
|
||||
indicator.Value.Place.Target = indicator.Key.Position;
|
||||
if (!indicator.Key.Active)
|
||||
indicator.Value.Fill.enabled = false;
|
||||
else
|
||||
{
|
||||
indicator.Value.Fill.enabled = true;
|
||||
indicator.Value.Fill.fillAmount =
|
||||
saturate(indicator.Key.EntityInfoGathered[CurrentEntity] / Settings.GameplaySettings.TargetDetectionInfoThreshold);
|
||||
}
|
||||
}
|
||||
var look = Input.Player.Look.ReadValue<Vector2>();
|
||||
_entityYawPitch = float2(_entityYawPitch.x + look.x * Sensitivity.x, clamp(_entityYawPitch.y + look.y * Sensitivity.y, -.45f * PI, .45f * PI));
|
||||
_viewDirection = mul(float3(0, 0, 1), Unity.Mathematics.float3x3.Euler(float3(_entityYawPitch.yx, 0), RotationOrder.YXZ));
|
||||
|
|
|
|||
|
|
@ -446,8 +446,7 @@ public class EntityInstance : MonoBehaviour
|
|||
}
|
||||
}));
|
||||
|
||||
// TODO: ActionGameManager.CurrentSector.FactionRelationships[orbital.Faction]
|
||||
if (entity is OrbitalEntity orbital && orbital.SecurityRadius > 1)// && (int) orbital.SecurityLevel > (int) SecurityLevel.Secure)
|
||||
if (entity is OrbitalEntity orbital && orbital.IsSecureArea)
|
||||
{
|
||||
_influenceInstance = Instantiate(InfluencePrefab);
|
||||
_influenceInstance.transform.localScale = Vector3.one * orbital.SecurityRadius;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class Minion : Agent
|
|||
() => Task is PatrolOrbitsTask,
|
||||
() => patrolState.Task = Task as PatrolOrbitsTask);
|
||||
|
||||
Ship.VisibleHostiles.ObserveAdd().Where(_ => Ship.Target.Value == null).Subscribe(add => Ship.Target.Value = add.Value);
|
||||
Ship.VisibleEnemies.ObserveAdd().Where(_ => Ship.Target.Value == null).Subscribe(add => Ship.Target.Value = add.Value);
|
||||
|
||||
var combatState = new CombatState(this);
|
||||
_rootState.AddTransition(combatState,
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ public class TurretController : Behavior, IInitializableBehavior
|
|||
if (x.Firing)
|
||||
x.Deactivate();
|
||||
}
|
||||
Entity.Target.Value = Entity.VisibleHostiles.FirstOrDefault(e => e is Ship);
|
||||
Entity.Target.Value = Entity.VisibleEnemies.FirstOrDefault(e => e is Ship);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ public class Faction : DatabaseEntry, INamedEntry
|
|||
[InspectableDatabaseLink(typeof(PersonalityAttribute)), JsonProperty("personality"), Key(5)]
|
||||
public Dictionary<Guid, float> Personality = new Dictionary<Guid, float>();
|
||||
|
||||
[Inspectable, JsonProperty("hostile"), Key(6)]
|
||||
public bool PlayerHostile;
|
||||
// [Inspectable, JsonProperty("hostile"), Key(6)]
|
||||
// public bool PlayerHostile;
|
||||
|
||||
[InspectableColor, JsonProperty("primaryColor"), Key(7)]
|
||||
public float3 PrimaryColor;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ public abstract class Entity
|
|||
public readonly ReactiveCollection<EquippedCargoBay> CargoBays = new ReactiveCollection<EquippedCargoBay>();
|
||||
public readonly ReactiveCollection<EquippedDockingBay> DockingBays = new ReactiveCollection<EquippedDockingBay>();
|
||||
public readonly ReactiveCollection<Entity> VisibleEntities = new ReactiveCollection<Entity>();
|
||||
public readonly ReactiveCollection<Entity> VisibleHostiles = new ReactiveCollection<Entity>();
|
||||
public readonly ReactiveDictionary<Entity, bool> EntityHostility = new ReactiveDictionary<Entity, bool>();
|
||||
public readonly ReactiveCollection<Entity> VisibleEnemies = new ReactiveCollection<Entity>();
|
||||
public readonly ReactiveCollection<Entity> VisibleFriendlies = new ReactiveCollection<Entity>();
|
||||
|
||||
public Entity Parent;
|
||||
public List<Entity> Children = new List<Entity>();
|
||||
|
|
@ -127,6 +129,8 @@ public abstract class Entity
|
|||
public Subject<Unit> HypothermiaDeath = new Subject<Unit>();
|
||||
public Subject<Entity> TargetedBy = new Subject<Entity>();
|
||||
public ReactiveProperty<int> TargetedByCount = new ReactiveProperty<int>(0);
|
||||
public ReactiveProperty<SecurityLevel> CurrentSecurityLevel = new ReactiveProperty<SecurityLevel>(SecurityLevel.Open);
|
||||
public ReadOnlyReactiveProperty<bool> PresencePermitted;
|
||||
|
||||
public UniRx.IObservable<EquippedItem> ItemDestroyed;
|
||||
public UniRx.IObservable<int2> HullArmorDepleted;
|
||||
|
|
@ -135,6 +139,7 @@ public abstract class Entity
|
|||
public UniRx.IObservable<CauseOfDeath> Death;
|
||||
|
||||
private List<IDisposable> _subscriptions = new List<IDisposable>();
|
||||
private Dictionary<Entity, List<IDisposable>> _watchedEntitySubscriptions = new Dictionary<Entity, List<IDisposable>>();
|
||||
|
||||
public virtual void Activate()
|
||||
{
|
||||
|
|
@ -147,19 +152,84 @@ public abstract class Entity
|
|||
if(behavior is IInitializableBehavior initializableBehavior)
|
||||
initializableBehavior.Initialize();
|
||||
}
|
||||
foreach(var entity in Zone.Entities) EntityInfoGathered[entity] = 0;
|
||||
_subscriptions.Add(Zone.Entities.ObserveAdd().Subscribe(add => EntityInfoGathered[add.Value] = 0));
|
||||
foreach(var entity in Zone.Entities)
|
||||
{
|
||||
EntityInfoGathered[entity] = 0;
|
||||
EntityHostility[entity] = IsHostileTo(entity);
|
||||
}
|
||||
_subscriptions.Add(Zone.Entities.ObserveAdd().Subscribe(add =>
|
||||
{
|
||||
EntityInfoGathered[add.Value] = 0;
|
||||
EntityHostility[add.Value] = IsHostileTo(add.Value);
|
||||
}));
|
||||
_subscriptions.Add(Zone.Entities.ObserveRemove().Subscribe(remove =>
|
||||
{
|
||||
if (Target.Value == remove.Value) Target.Value = null;
|
||||
EntityInfoGathered.Remove(remove.Value);
|
||||
EntityHostility.Remove(remove.Value);
|
||||
VisibleEntities.Remove(remove.Value);
|
||||
VisibleHostiles.Remove(remove.Value);
|
||||
VisibleEnemies.Remove(remove.Value);
|
||||
VisibleFriendlies.Remove(remove.Value);
|
||||
}));
|
||||
_subscriptions.Add(VisibleEntities.ObserveRemove().Subscribe(remove =>
|
||||
_subscriptions.Add(VisibleEnemies.ObserveRemove().Subscribe(remove =>
|
||||
{
|
||||
if (Target.Value == remove.Value) Target.Value = null;
|
||||
}));
|
||||
_subscriptions.Add(Target.Subscribe(entity => entity?.TargetedBy.OnNext(this)));
|
||||
_subscriptions.Add(TargetedBy.Subscribe(enemy =>
|
||||
{
|
||||
TargetedByCount.Value++;
|
||||
enemy.Target.Where(t => t != this).Take(1).Subscribe(_ => TargetedByCount.Value--);
|
||||
}));
|
||||
|
||||
//
|
||||
_subscriptions.Add(EntityInfoGathered.ObserveReplace().Subscribe(replace =>
|
||||
{
|
||||
if (replace.OldValue < ItemManager.GameplaySettings.TargetDetectionInfoThreshold &&
|
||||
replace.NewValue > ItemManager.GameplaySettings.TargetDetectionInfoThreshold)
|
||||
{
|
||||
VisibleEntities.Add(replace.Key);
|
||||
if(EntityHostility[replace.Key])
|
||||
VisibleEnemies.Add(replace.Key);
|
||||
else VisibleFriendlies.Add(replace.Key);
|
||||
}
|
||||
if (replace.OldValue > ItemManager.GameplaySettings.TargetDetectionInfoThreshold &&
|
||||
replace.NewValue < ItemManager.GameplaySettings.TargetDetectionInfoThreshold)
|
||||
{
|
||||
VisibleEntities.Remove(replace.Key);
|
||||
VisibleEnemies.Remove(replace.Key);
|
||||
VisibleFriendlies.Remove(replace.Key);
|
||||
}
|
||||
}));
|
||||
|
||||
// Create subscriptions to events occurring on any visible entity
|
||||
_subscriptions.Add(VisibleEntities.ObserveAdd()
|
||||
.Select(add=>add.Value)
|
||||
.Subscribe(entity =>
|
||||
{
|
||||
var newVisibleEntitySubscriptions = new List<IDisposable>
|
||||
{
|
||||
// Respond to changes in the target's hostility status by updating the contents of VisibleEnemies and VisibleFriendlies
|
||||
EntityHostility.ObserveReplace()
|
||||
.Where(replace => replace.Key == entity)
|
||||
.Select(replace => replace.NewValue)
|
||||
.Subscribe(isHostile =>
|
||||
{
|
||||
(isHostile ? VisibleEnemies : VisibleFriendlies).Add(entity);
|
||||
(isHostile ? VisibleFriendlies : VisibleEnemies).Remove(entity);
|
||||
})
|
||||
};
|
||||
|
||||
_watchedEntitySubscriptions[entity] = newVisibleEntitySubscriptions;
|
||||
}));
|
||||
|
||||
// Cleanup visible entity subscriptions
|
||||
_subscriptions.Add(VisibleEntities.ObserveRemove().Subscribe(disappearingEntity =>
|
||||
{
|
||||
foreach(var subscription in _watchedEntitySubscriptions[disappearingEntity.Value]) subscription.Dispose();
|
||||
_watchedEntitySubscriptions.Remove(disappearingEntity.Value);
|
||||
}));
|
||||
|
||||
if(WeaponGroups.All(wg=>!wg.items.Any()))
|
||||
GenerateWeaponGroups();
|
||||
}
|
||||
|
|
@ -169,10 +239,13 @@ public abstract class Entity
|
|||
//ItemManager.Log($"Entity {Name} is deactivating!");
|
||||
foreach(var s in _subscriptions) s.Dispose();
|
||||
_subscriptions.Clear();
|
||||
foreach(var ss in _watchedEntitySubscriptions.Values) foreach(var s in ss) s.Dispose();
|
||||
_watchedEntitySubscriptions.Clear();
|
||||
_active = false;
|
||||
EntityInfoGathered.Clear();
|
||||
VisibleEntities.Clear();
|
||||
VisibleHostiles.Clear();
|
||||
VisibleEnemies.Clear();
|
||||
VisibleFriendlies.Clear();
|
||||
}
|
||||
|
||||
public Entity(ItemManager itemManager, Zone zone, EquippableItem hull, EntitySettings settings)
|
||||
|
|
@ -196,33 +269,30 @@ public abstract class Entity
|
|||
.Merge(HypothermiaDeath.Select(_ => CauseOfDeath.Hypothermia))
|
||||
.Merge(ItemDestroyed.Where(i=>i.GetBehavior<Cockpit>()!=null).Select(_ => CauseOfDeath.CockpitDestroyed));
|
||||
|
||||
Target.Subscribe(entity => entity?.TargetedBy.OnNext(this));
|
||||
TargetedBy.Subscribe(enemy =>
|
||||
{
|
||||
TargetedByCount.Value++;
|
||||
enemy.Target.Where(t => t != this).Take(1).Subscribe(_ => TargetedByCount.Value--);
|
||||
});
|
||||
|
||||
EntityInfoGathered.ObserveReplace().Subscribe(replace =>
|
||||
{
|
||||
if (replace.OldValue < ItemManager.GameplaySettings.TargetDetectionInfoThreshold &&
|
||||
replace.NewValue > ItemManager.GameplaySettings.TargetDetectionInfoThreshold)
|
||||
{
|
||||
VisibleEntities.Add(replace.Key);
|
||||
if(IsHostileTo(replace.Key))
|
||||
VisibleHostiles.Add(replace.Key);
|
||||
}
|
||||
if (replace.OldValue > ItemManager.GameplaySettings.TargetDetectionInfoThreshold &&
|
||||
replace.NewValue < ItemManager.GameplaySettings.TargetDetectionInfoThreshold)
|
||||
{
|
||||
VisibleEntities.Remove(replace.Key);
|
||||
if(IsHostileTo(replace.Key))
|
||||
VisibleHostiles.Remove(replace.Key);
|
||||
}
|
||||
});
|
||||
EntityInfoGathered.ObserveRemove().Subscribe(remove => VisibleEntities.Remove(remove.Key));
|
||||
// The entity's presence is permitted when its faction owns the zone, or the current security level at its location is low enough
|
||||
PresencePermitted = new ReadOnlyReactiveProperty<bool>(CurrentSecurityLevel.Select(security =>
|
||||
IsPresencePermitted(GetFactionRelationship(Zone.SectorZone.Owner), security)), true);
|
||||
}
|
||||
|
||||
public bool IsHostileTo(Entity other, bool recursive = false)
|
||||
{
|
||||
if (Faction == null)
|
||||
return !recursive && other.Faction != null && other.IsHostileTo(this, true);
|
||||
|
||||
// TODO: Inter-faction hostility
|
||||
// When the entity faction owns the zone, they are hostile to trespassers or those hostile to them
|
||||
if (Faction.ID == Zone.SectorZone.Owner.ID)
|
||||
return recursive ? !other.PresencePermitted.Value : !other.PresencePermitted.Value || other.IsHostileTo(this, true);
|
||||
|
||||
return !recursive && other.IsHostileTo(this, true);
|
||||
}
|
||||
|
||||
// TODO: Inter-faction relationships
|
||||
public FactionRelationship GetFactionRelationship(Faction faction) =>
|
||||
this is Ship {IsPlayerShip: true} ? Zone.Sector.FactionRelationships[faction] : faction==Faction ? FactionRelationship.Beloved : FactionRelationship.Neutral;
|
||||
|
||||
public static bool IsPresencePermitted(FactionRelationship relationship, SecurityLevel securityLevel) => (int) relationship - (int) securityLevel > 0;
|
||||
|
||||
public void ActivateConsumable(ConsumableItem item)
|
||||
{
|
||||
_activeConsumables.Add(new ConsumableItemEffect(item, this));
|
||||
|
|
@ -251,16 +321,6 @@ public abstract class Entity
|
|||
return true;
|
||||
}
|
||||
|
||||
public bool IsHostileTo(Entity other)
|
||||
{
|
||||
if (Faction == null)
|
||||
{
|
||||
return other.Faction != null;
|
||||
}
|
||||
|
||||
return Faction.PlayerHostile && other.Faction == null;
|
||||
}
|
||||
|
||||
private void MapEntity()
|
||||
{
|
||||
var hullData = ItemManager.GetData(Hull) as HullData;
|
||||
|
|
@ -809,6 +869,17 @@ public abstract class Entity
|
|||
|
||||
TargetRange = Target.Value == null ? -1 : length(Position - Target.Value.Position);
|
||||
|
||||
var localSecurityLevel = Zone.GetSecurityLevel(Position.xz);
|
||||
if (CurrentSecurityLevel.Value != localSecurityLevel) CurrentSecurityLevel.Value = localSecurityLevel;
|
||||
|
||||
foreach (var entity in Zone.Entities)
|
||||
{
|
||||
var previousHostility = EntityHostility[entity];
|
||||
var newHostility = IsHostileTo(entity);
|
||||
if (newHostility != previousHostility)
|
||||
EntityHostility[entity] = newHostility;
|
||||
}
|
||||
|
||||
foreach (var v in VisibilitySources.Keys.ToArray())
|
||||
{
|
||||
VisibilitySources[v] = AetheriaMath.Decay(VisibilitySources[v], ItemManager.GameplaySettings.VisibilityDecay, delta);
|
||||
|
|
|
|||
|
|
@ -30,4 +30,14 @@ public class OrbitalEntity : Entity
|
|||
|
||||
base.Update(delta);
|
||||
}
|
||||
|
||||
public bool IsSecureArea
|
||||
{
|
||||
get
|
||||
{
|
||||
if (SecurityRadius < 1) return false;
|
||||
if (Faction == null) return false;
|
||||
return !IsPresencePermitted(Zone.Sector.FactionRelationships[Faction], SecurityLevel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ public class PlanetSettings
|
|||
public ExponentialLerp AsteroidRespawnTime;
|
||||
public float GravityStrength;
|
||||
public float MiningDifficulty = 500f;
|
||||
public float SecureAreaRadiusMultiplier = .45f;
|
||||
|
||||
public ExponentialCurve OrbitPeriod;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,11 +42,13 @@ public class Zone
|
|||
}
|
||||
public ZonePack Pack { get; }
|
||||
public SectorZone SectorZone { get; }
|
||||
public Sector Sector { get; }
|
||||
|
||||
public Zone(ItemManager itemManager, PlanetSettings settings, ZonePack pack, SectorZone sectorZone)
|
||||
public Zone(ItemManager itemManager, PlanetSettings settings, ZonePack pack, SectorZone sectorZone, Sector sector)
|
||||
{
|
||||
_time = pack.Time;
|
||||
SectorZone = sectorZone;
|
||||
Sector = sector;
|
||||
Pack = pack;
|
||||
_itemManager = itemManager;
|
||||
Settings = settings;
|
||||
|
|
@ -306,6 +308,24 @@ public class Zone
|
|||
//miner.AddCargo(newSimpleCommodity);
|
||||
}
|
||||
}
|
||||
|
||||
public SecurityLevel GetSecurityLevel(float2 pos)
|
||||
{
|
||||
if (SectorZone.Owner==null) return SecurityLevel.Open;
|
||||
|
||||
var security = SecurityLevel.Open;
|
||||
foreach (var entity in Entities)
|
||||
{
|
||||
if (entity is OrbitalEntity orbitalEntity && orbitalEntity.SecurityRadius > 1 && entity.Faction.ID == SectorZone.Owner.ID)
|
||||
{
|
||||
if (orbitalEntity.SecurityLevel > security && length(orbitalEntity.Position.xz - pos) < orbitalEntity.SecurityRadius * Settings.SecureAreaRadiusMultiplier)
|
||||
security = orbitalEntity.SecurityLevel;
|
||||
}
|
||||
}
|
||||
|
||||
return security;
|
||||
}
|
||||
|
||||
public float GetHeight(float2 position)
|
||||
{
|
||||
var result = -PowerPulse(length(position)/(Pack.Radius*2), Settings.ZoneDepthExponent) * Settings.ZoneDepth;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class VisibleHostileIndicator : MonoBehaviour
|
||||
public class VisibleTargetIndicator : MonoBehaviour
|
||||
{
|
||||
public RectTransform Transform;
|
||||
public Image Fill;
|
||||
|
|
@ -3,6 +3,7 @@ Properties {
|
|||
_Color ("Color", Color) = (1,1,1,1)
|
||||
_Depth ("Depth", Float) = 0.5
|
||||
_Power("Power", Float) = 2
|
||||
_Cutoff("Cutoff", Range(0,1)) = 1
|
||||
}
|
||||
|
||||
Category {
|
||||
|
|
@ -23,7 +24,8 @@ Category {
|
|||
|
||||
fixed4 _Color;
|
||||
float _Depth;
|
||||
float _Power;
|
||||
half _Power;
|
||||
half _Cutoff;
|
||||
|
||||
struct appdata_t {
|
||||
float4 vertex : POSITION;
|
||||
|
|
@ -57,7 +59,7 @@ Category {
|
|||
fixed4 frag (v2f i) : SV_Target
|
||||
{
|
||||
float dist = length(i.texcoord-float2(.5,.5))*2;
|
||||
return _Depth * powerPulse(dist,_Power) * _Color * smoothstep(1, .95, dist);
|
||||
return _Depth * min(_Cutoff, powerPulse(dist,_Power)) * _Color * smoothstep(1, .95, dist);
|
||||
}
|
||||
ENDCG
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,8 +117,8 @@
|
|||
|
||||
float surface = tex2Dlod(_Surface, half4(uv, 0, 0)).r;
|
||||
float dist = pos.y + surface - _GridFloorOffset;
|
||||
float4 lightTint = tex2Dlod(_TintTexture, half4(uv, 0, dist/30));
|
||||
float fillDensity = saturate(-pos.y * _GridFillDensity);
|
||||
float4 lightTint = tex2Dlod(_TintTexture, half4(uv, 0, dist/30));
|
||||
float fillDensity = saturate(-pos.y * _GridFillDensity);
|
||||
|
||||
if(dist < _SafetyDistance)
|
||||
{
|
||||
|
|
|
|||
BIN
Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
(Stored with Git LFS)
BIN
Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
(Stored with Git LFS)
Binary file not shown.
BIN
GameData/PlayerSettings.msgpack
(Stored with Git LFS)
BIN
GameData/PlayerSettings.msgpack
(Stored with Git LFS)
Binary file not shown.
BIN
UserSettings/EditorUserSettings.asset
(Stored with Git LFS)
BIN
UserSettings/EditorUserSettings.asset
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in a new issue