From 3a9ee2ccf775bdee7268fcaeaf867b0e6dcf5f99 Mon Sep 17 00:00:00 2001 From: Reinier Vens Date: Mon, 1 Feb 2021 08:13:14 +0000 Subject: [PATCH] Damage System Rewrite New damage system, much easier to understand Splash damage support Hardpoint armor consolidated with hull armor Minimap shows view cone New industry standard palette for temperature display Temperature range display contains palette Restoring loadouts now ignores temperature and armor Items can ignore thermal mass when adding heat Burst weapons can consume single ammo (mainly shotguns) New missile type that follows crosshairs New airburst projectile type that deals splash damage Auto Shotgun and Charged Shotgun --- .../.idea/contentModel.xml | 2364 ++++---- Assembly-CSharp-Editor-firstpass.csproj | 8 +- Assembly-CSharp-Editor.csproj | 8 +- Assembly-CSharp-firstpass.csproj | 8 +- Assembly-CSharp.csproj | 44 +- .../Materials/ExplosionDistortion.mat | 13 +- Assets/Prefabs/UI/Inventory.prefab | 327 +- Assets/Resources/Gradients/Ironbow.png | 3 + Assets/Resources/Gradients/Ironbow.png.meta | 108 + Assets/Resources/Gradients/IronbowSprite.png | 3 + .../Gradients/IronbowSprite.png.meta | 108 + .../Prefabs/Weapons/Auto Shotgun.prefab | 5165 +++++++++++++++++ ...n.prefab.meta => Auto Shotgun.prefab.meta} | 2 +- .../Prefabs/Weapons/Charged Shotgun.prefab | 321 + .../Weapons/Charged Shotgun.prefab.meta | 7 + .../Prefabs/Weapons/Flak Cannon.prefab | 336 ++ .../Prefabs/Weapons/Flak Cannon.prefab.meta | 7 + .../Prefabs/Weapons/Machine Gun.prefab | 293 - .../Resources/Prefabs/Weapons/Revolver.prefab | 320 + .../Prefabs/Weapons/Revolver.prefab.meta | 7 + Assets/Resources/Prefabs/Weapons/SRM.prefab | 5093 ++++++++++++++++ .../Resources/Prefabs/Weapons/SRM.prefab.meta | 7 + Assets/Scenes/ARPG.unity | 1074 +++- Assets/Scripts/Editor/DatabaseInspector.cs | 50 +- Assets/Scripts/Gameplay/ActionGameManager.cs | 90 +- Assets/Scripts/Gameplay/HullCollider.cs | 20 + .../Gameplay/Weapons/GuidedProjectile.cs | 56 +- .../Weapons/GuidedProjectileManager.cs | 25 + Assets/Scripts/Gameplay/Weapons/Projectile.cs | 27 +- .../Gameplay/Weapons/ProjectileManager.cs | 4 + .../Scripts/Sector Display/SectorRenderer.cs | 219 +- .../ServerShared/Behaviors/Behaviors.cs | 2 +- .../ServerShared/Behaviors/ChargedWeapon.cs | 46 +- .../ServerShared/Behaviors/InstantWeapon.cs | 70 +- .../ServerShared/Behaviors/Launcher.cs | 39 +- .../ServerShared/Behaviors/LockWeapon.cs | 10 +- .../ServerShared/Behaviors/Radiator.cs | 2 +- Assets/Scripts/ServerShared/Entity.cs | 40 +- .../Scripts/ServerShared/EntitySerializer.cs | 19 +- Assets/Scripts/ServerShared/Ship.cs | 23 +- Assets/Scripts/UI/InventoryMenu.cs | 4 +- Assets/Scripts/UI/InventoryPanel.cs | 59 +- Assets/Scripts/{ => UI}/MapMenuInput.cs | 0 Assets/Scripts/{ => UI}/MapMenuInput.cs.meta | 0 Assets/Scripts/{ => UI}/MapRenderer.cs | 0 Assets/Scripts/{ => UI}/MapRenderer.cs.meta | 0 Assets/Scripts/{ => UI}/MenuPanel.cs | 0 Assets/Scripts/{ => UI}/MenuPanel.cs.meta | 0 Assets/Scripts/{ => UI}/MenuTabButton.cs | 0 Assets/Scripts/{ => UI}/MenuTabButton.cs.meta | 0 Assets/Scripts/UI/MinimapCameraTrack.cs | 3 + Assets/Scripts/{ => UI}/TradeMenu.cs | 3 +- Assets/Scripts/{ => UI}/TradeMenu.cs.meta | 0 Economy.Shared.Unity.csproj | 12 +- GameData/Presets/Djinni.preset | Bin 5182 -> 5088 bytes 55 files changed, 14248 insertions(+), 2201 deletions(-) create mode 100644 Assets/Resources/Gradients/Ironbow.png create mode 100644 Assets/Resources/Gradients/Ironbow.png.meta create mode 100644 Assets/Resources/Gradients/IronbowSprite.png create mode 100644 Assets/Resources/Gradients/IronbowSprite.png.meta create mode 100644 Assets/Resources/Prefabs/Weapons/Auto Shotgun.prefab rename Assets/Resources/Prefabs/Weapons/{Machine Gun.prefab.meta => Auto Shotgun.prefab.meta} (74%) create mode 100644 Assets/Resources/Prefabs/Weapons/Charged Shotgun.prefab create mode 100644 Assets/Resources/Prefabs/Weapons/Charged Shotgun.prefab.meta create mode 100644 Assets/Resources/Prefabs/Weapons/Flak Cannon.prefab create mode 100644 Assets/Resources/Prefabs/Weapons/Flak Cannon.prefab.meta delete mode 100644 Assets/Resources/Prefabs/Weapons/Machine Gun.prefab create mode 100644 Assets/Resources/Prefabs/Weapons/Revolver.prefab create mode 100644 Assets/Resources/Prefabs/Weapons/Revolver.prefab.meta create mode 100644 Assets/Resources/Prefabs/Weapons/SRM.prefab create mode 100644 Assets/Resources/Prefabs/Weapons/SRM.prefab.meta rename Assets/Scripts/{ => UI}/MapMenuInput.cs (100%) rename Assets/Scripts/{ => UI}/MapMenuInput.cs.meta (100%) rename Assets/Scripts/{ => UI}/MapRenderer.cs (100%) rename Assets/Scripts/{ => UI}/MapRenderer.cs.meta (100%) rename Assets/Scripts/{ => UI}/MenuPanel.cs (100%) rename Assets/Scripts/{ => UI}/MenuPanel.cs.meta (100%) rename Assets/Scripts/{ => UI}/MenuTabButton.cs (100%) rename Assets/Scripts/{ => UI}/MenuTabButton.cs.meta (100%) rename Assets/Scripts/{ => UI}/TradeMenu.cs (99%) rename Assets/Scripts/{ => UI}/TradeMenu.cs.meta (100%) diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml index 2da22d981..f9c3afc80 100644 --- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml +++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml @@ -204,6 +204,1182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -256,1189 +1432,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1988,7 +1982,6 @@ - @@ -2015,7 +2008,11 @@ + + + + @@ -2037,6 +2034,7 @@ + diff --git a/Assembly-CSharp-Editor-firstpass.csproj b/Assembly-CSharp-Editor-firstpass.csproj index c1712d804..4bea8ec54 100644 --- a/Assembly-CSharp-Editor-firstpass.csproj +++ b/Assembly-CSharp-Editor-firstpass.csproj @@ -828,6 +828,10 @@ {dd909206-f54e-1c12-ed74-b4e22d464f6a} Substance.EditorHelper + + {c511ef21-dc27-883d-b027-9a4b6f36bae4} + MessagePack + {2ca9591a-f6e2-fafd-e598-0f0563c5ae57} Substance.Platform @@ -840,10 +844,6 @@ {4d885cb7-1f9e-abb3-b070-7265b432ecda} UniRx - - {c511ef21-dc27-883d-b027-9a4b6f36bae4} - MessagePack -