Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Health rework #6152

Merged
merged 324 commits into from
Mar 7, 2021
Merged

Health rework #6152

merged 324 commits into from
Mar 7, 2021

Conversation

Bod9001
Copy link
Member

@Bod9001 Bod9001 commented Mar 1, 2021 •
edited by PerfectTangent

ok, lots of stuff not quite completed but very burnt out.,

need to check I didn't Accidentally Overwrite people's changes when Rebasing last

closes #3331

Changelog:

CL: Health

@github-actions github-actions bot added Status: Merge Conflicts No one likes conflicts, solve them! Scene Changes Any changes that affect scenes (e.g. lobby or maps) Sprite Work UI labels Mar 1, 2021
Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Plugins/SerializableDictionary/SerializableDictionary.cs
}
set
{
if (key == null)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

humm can get rid of this if this is no longer an issue?

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Core/Input System/InteractionV2/InteractionUtils.cs Outdated
@@ -50,7 +50,7 @@ public static void RequestInteract<T>(T interaction, IBaseInteractable<T> intera
// we defer to the server for deciding what interaction was triggered, unless this is
// an AimApply in which case there's no reason for such a thing (no shooting-like interactions
// should have multiple interactable AimApply components)
RequestInteract(interaction, typeof(T) == typeof(AimApply) ? interactable : null);
RequestInteract(interaction, typeof(T) == typeof(AimApply) ? null : interactable );
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accidental change needed changes back

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Core/Sprite Handler/SpriteHandler.cs Outdated
@@ -22,9 +22,6 @@ public class SpriteHandler : MonoBehaviour
[SerializeField] private SpriteDataSO PresentSpriteSet;
private SpriteDataSO.Frame PresentFrame = null;

[Tooltip("If checked, a random sprite SO will be selected during initialization from the catalogue of sprite SOs.")]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah looks like this got messed up with the with the rebase

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Items/ClothingItem.cs
var unequippedClothing = GameObjectReference.GetComponent<ClothingV2>();

if (unequippedClothing == null)
if (spriteHandler != null)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clothing needs to be put into a slot on the body part And handle from there but this can be later on

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Items/Food/Edible.cs

private static readonly StandardProgressActionConfig ProgressConfig
= new StandardProgressActionConfig(StandardProgressActionType.Restrain);

[FormerlySerializedAs("NutrientsHealAmount")]
public int NutritionLevel = 10;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

food needs a reagent container next to it

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Messages/Client/SpriteMessages/SpriteRequestCurrentStateMessage.cs
@@ -13,7 +13,7 @@ public override void Process()
LoadNetworkObject(SpriteHandlerManager);
if (SentByPlayer == ConnectedPlayer.Invalid)
return;

//TODO Need some safeguards
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not mega important but if someone can do it that would be great

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Player/ExaminablePlayer.cs
@@ -20,10 +20,10 @@ public class ExaminablePlayer : MonoBehaviour, IExaminable

private PlayerScript script;

public PlayerHealth Health => script.playerHealth;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be integrated

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Shuttles/ShuttleFuelSystem.cs Outdated
@@ -37,7 +37,7 @@ public override void UpdateMe()
{
if (Connector == null)
{
Logger.LogError($"{nameof(Connector)} was null on {this}!");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

humm Needs Reverting

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Systems/Inventory/ItemSlot.cs
@@ -50,7 +50,7 @@ public class ItemSlot
/// <summary>
/// Net ID of the ItemStorage this slot exists in
/// </summary>
public uint ItemStorageNetID => itemStorage.GetComponent<NetworkIdentity>().netId;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accidental rebase stuff

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/Assets/Scripts/Tilemaps/Behaviours/Objects/RegisterPlayer.cs Outdated
{
spriteRenderer.sortingLayerName = "Bodies";
}
// foreach (SpriteRenderer spriteRenderer in spriteRenderers)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clean

Bod9001
Bod9001 commented Mar 1, 2021
View reviewed changes
UnityProject/ProjectSettings/Packages/com.xeleh.enhancer/Settings.asset Outdated
@@ -18,7 +18,7 @@ MonoBehaviour:
autoEnable: 1
sidebar:
foldout: 1
enabled: 1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah,
accidental changes here

@Bod9001
Copy link
Member Author

Bod9001 commented Mar 1, 2021

note there might be some stuff that's getting Over written still that I haven't found

@ThatDan123
Copy link
Contributor

If you reimport the mirror folder then it works.

Also you have the quick load still turned on and theres some logging that is on which should be disabled or put to a category

@Bod9001
Copy link
Member Author

Bod9001 commented Mar 6, 2021

ok cool

@ThatDan123
Copy link
Contributor

Also theres a few codacy stuff which should be done, to keep stuff clean.

@github-actions github-actions bot added Scene Changes Any changes that affect scenes (e.g. lobby or maps) Scene: BoxStation This PR makes changes on BoxStation map Scene: FallStation This PR makes changes on FallStation map Scene: OutpostStation This PR makes changes on OutpostStation map Scene: PogStation This PR makes changes on PogStation map Scene: SquareStation This PR makes changes on SquareStation map Status: Merge Conflicts No one likes conflicts, solve them! labels Mar 6, 2021
@github-actions github-actions bot removed Scene: FallStation This PR makes changes on FallStation map Scene: OutpostStation This PR makes changes on OutpostStation map Documentation Scene: BoxStation This PR makes changes on BoxStation map Scene: PogStation This PR makes changes on PogStation map Scene: SquareStation This PR makes changes on SquareStation map labels Mar 6, 2021
@corp-0 corp-0 removed the Status: Merge Conflicts No one likes conflicts, solve them! label Mar 6, 2021
@Bod9001 Bod9001 merged commit e1f1176 into develop Mar 7, 2021
@PetMudstone PetMudstone mentioned this pull request Mar 12, 2021
Merged
@PerfectTangent PerfectTangent added the System: Health Tasks related to medical role label Mar 23, 2021
@PerfectTangent PerfectTangent mentioned this pull request Mar 24, 2021
Closed
@PerfectTangent PerfectTangent added the System: Chemistry Tasks related to chemistry role label Apr 2, 2021
@NoooneyDude NoooneyDude deleted the Health-ReworkRebase branch April 25, 2021 07:27
@waffielz
Copy link

a

@PerfectTangent PerfectTangent added System: Damage Relating to damage system and removed Status: DNM "Do Not Merge". Don't merge this Pull Request, as changes where requor further additions are needed. labels Jun 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Scene Changes Any changes that affect scenes (e.g. lobby or maps) Sprite Work System: Chemistry Tasks related to chemistry role System: Damage Relating to damage system System: Health Tasks related to medical role UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Different character races to choose from!
7 participants
@Bod9001 @ThatDan123 @waffielz @corp-0 @PerfectTangent @Fortune117 @PetMudstone