itai.sharim/TagFight - Change HUULCHM5GFGZ7GKLCULFHC333LQ3LBI62VKII3YL5O4C5CDGCT4AC

Change naming for easier explicit Unit conversion

Created by itai.sharim on October 11, 2022

HUULCHM5GFGZ7GKLCULFHC333LQ3LBI62VKII3YL5O4C5CDGCT4AC

Dependencies

In channels

main

Change contents

File deletion: PawnResourceViewer.cs.meta

BF:BFD[3.218] → [3.2905:2955]

BF:BFD[3.2955] → [3.2660:2660]

B:BD[3.2660] → [3.2661:2904]

fileFormatVersion: 2
guid: adbc7a3b7d26f694bba40a280168e7be
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: PawnResourceViewer.cs

BF:BFD[3.218] → [3.3427:3472]

BF:BFD[3.3472] → [3.2957:2957]

B:BD[3.2957] → [3.2958:3426]

using TagFighter.PawnResources;
using UnityEngine;
using UnityEngine.UI;
namespace TagFighter.UI
{
    [RequireComponent(typeof(Image))]
    public class PawnResourceViewer : MonoBehaviour, IPawnResourceViewer
    {
        Image fill;
        protected void Awake() {
            fill = GetComponent<Image>();
        }
        public void UpdateView(OnChangeArgs e) {
            fill.fillAmount = (float)e.Current / e.Capacity;
        }
    }
}

File addition: ImageFillResourceViewer.cs.meta (---x------)

[3.218]

fileFormatVersion: 2
guid: adbc7a3b7d26f694bba40a280168e7be
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: ImageFillResourceViewer.cs (---x------)

[3.218]

using TagFighter.Resources;
using UnityEngine;
using UnityEngine.UI;
namespace TagFighter.UI
{
    [RequireComponent(typeof(Image))]
    public class ImageFillResourceViewer : MonoBehaviour, IResourceViewer
    {
        Image fill;
        protected void Awake() {
            fill = GetComponent<Image>();
        }
        public void UpdateView(OnChangeArgs e) {
            fill.fillAmount = (float)e.Current / e.Capacity;
        }
    }
}

Replacement in Assets/Scripts/UI/HUD/PartyView.cs at line 1 [4.29456]
B:BD[4.29456] → [3.39418:39451]
```
using TagFighter.PawnResources;
```
[4.29456]
[4.29519]
```
using TagFighter.Resources;
```

Replacement in Assets/Scripts/UI/HUD/PartyView.cs at line 35 [4.29456]

B:BD[5.68895] → [3.39754:39893]

                PawnResourceWatcher[] partyMemberResources = partyMemberPortraitTransform.GetComponentsInChildren<PawnResourceWatcher>();

[5.68895]

[3.39893]

                ResourceWatcher[] partyMemberResources = partyMemberPortraitTransform.GetComponentsInChildren<ResourceWatcher>();

Replacement in Assets/Scripts/Tester.cs at line 4 [6.286]
B:BD[6.349] → [2.29163:29196]
```
using TagFighter.PawnResources;
```
[6.349]
[5.75814]
```
using TagFighter.Resources;
```

Replacement in Assets/Scripts/Tester.cs at line 43 [6.286]

B:BD[2.29568] → [2.29568:29724]

                    affected.GetComponent<BlueTag>().Current += (TagFighter.SpendableResources.SpendableResource<TagFighter.SpendableResources.BlueTag>)1;

[2.29568]

[2.29724]

                    affected.GetComponent<BlueTag>().Current++;

Replacement in Assets/Scripts/Tester.cs at line 46 [6.286]

B:BD[2.29777] → [2.29777:29931]

                    affected.GetComponent<RedTag>().Current += (TagFighter.SpendableResources.SpendableResource<TagFighter.SpendableResources.RedTag>)1;

[2.29777]

[2.29931]

                    affected.GetComponent<RedTag>().Current += (Unit<RedTagUnit>)1;

Replacement in Assets/Scripts/Tester.cs at line 49 [6.286]

B:BD[2.29984] → [2.29984:30142]

                    affected.GetComponent<GreenTag>().Current += (TagFighter.SpendableResources.SpendableResource<TagFighter.SpendableResources.GreenTag>)1;

[2.29984]

[2.30142]

                    affected.GetComponent<GreenTag>().Current += (Unit<GreenTagUnit>)1;

File deletion: PawnResourceWatcher.cs.meta

BF:BFD[3.4211] → [2.1895:1946]

BF:BFD[2.1946] → [2.1650:1650]

B:BD[2.1650] → [2.1651:1894]

fileFormatVersion: 2
guid: 94efccc62caea1a4580ab6f122e09ce2
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: PawnResourceWatcher.cs

BF:BFD[3.4211] → [2.3928:3974]

BF:BFD[2.3974] → [2.1948:1948]

B:BD[2.1948] → [2.1949:3927]

using TagFighter.PawnResources;
using UnityEngine;
namespace TagFighter.UI
{
    [RequireComponent(typeof(IPawnResourceViewer))]
    public class PawnResourceWatcher : MonoBehaviour
    {
        IWatchableResource _watchedResource;
        IPawnResourceViewer _resourceDisplay;
        static readonly OnChangeArgs Default = new(0, 1, 0, 0);
        public IWatchableResource WatchedResource {
            get => _watchedResource;
            set {
                if (_watchedResource != null) {
                    _watchedResource.OnCapacityChanged -= OnCapacityChanged;
                    _watchedResource.OnCurrentChanged -= OnCurrentChanged;
                    _watchedResource.OnRegenerationAmountChanged -= OnRegenerationAmountChanged;
                }
                _watchedResource = value;
                OnChangeArgs status = Default;
                if (_watchedResource != null) {
                    _watchedResource.OnCapacityChanged += OnCapacityChanged;
                    _watchedResource.OnCurrentChanged += OnCurrentChanged;
                    _watchedResource.OnRegenerationAmountChanged += OnRegenerationAmountChanged;
                    status = _watchedResource.Status;
                }
                _resourceDisplay.UpdateView(status);
            }
        }
        protected void Awake() {
            _resourceDisplay = GetComponent<IPawnResourceViewer>();
        }
        protected virtual void OnCapacityChanged(object sender, OnChangeArgs e) {
            _resourceDisplay.UpdateView(e);
        }
        protected virtual void OnCurrentChanged(object sender, OnChangeArgs e) {
            _resourceDisplay.UpdateView(e);
        }
        protected virtual void OnRegenerationAmountChanged(object sender, OnChangeArgs e) {
            _resourceDisplay.UpdateView(e);
        }
        protected void OnDestroy() {
            _resourceDisplay = null;
        }
    }
}

File deletion: IPawnResourceViewer.cs.meta

BF:BFD[3.4211] → [2.4221:4272]

BF:BFD[2.4272] → [2.3976:3976]

B:BD[2.3976] → [2.3977:4220]

fileFormatVersion: 2
guid: dd2006828ab220e4eafe7e265905282d
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: IPawnResourceViewer.cs

BF:BFD[3.4211] → [2.4447:4493]

BF:BFD[2.4493] → [2.4274:4274]

B:BD[2.4274] → [2.4275:4446]

using TagFighter.PawnResources;
namespace TagFighter.UI
{
    public interface IPawnResourceViewer
    {
        public void UpdateView(OnChangeArgs e);
    }
}

File deletion: PawnResource.cs.meta

BF:BFD[3.4211] → [3.4483:4527]

BF:BFD[3.4527] → [3.4238:4238]

B:BD[3.4238] → [3.4239:4482]

fileFormatVersion: 2
guid: bede5cbc2cf21a3499cd0b5e3a262d95
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: PawnResource.cs

BF:BFD[3.4211] → [3.7079:7118]

BF:BFD[3.7118] → [3.4529:4529]

B:BD[3.4529] → [3.4530:4912]

B:BD[3.4912] → [2.30317:30403]

∅:D[2.30403] → [3.4912:5622]

B:BD[3.4912] → [3.4912:5622]

∅:D[2.30688] → [3.5720:5739]

B:BD[3.5720] → [3.5720:5739]

B:BD[3.5875] → [3.5875:6065]

∅:D[2.30769] → [3.6144:6492]

B:BD[3.6144] → [3.6144:6492]

∅:D[2.30902] → [3.6627:7078]

B:BD[3.6627] → [3.6627:7078]

B:BD[3.6492] → [2.30770:30902]

B:BD[3.6065] → [2.30689:30769]

B:BD[3.5622] → [2.30404:30688]

using System;
using System.Collections;
using TagFighter.SpendableResources;
using UnityEngine;
namespace TagFighter.PawnResources
{
    [Serializable]
    public class PawnResource<T> : MonoBehaviour, IWatchableResource where T : ISpendableResource
    {
        [SerializeField] SpendableResource<T> _current;
        [SerializeField] SpendableResource<T> _capacity;
        readonly SpendableResource<T> _minimumCapacity = (SpendableResource<T>) 0;
        [SerializeField] SpendableResource<T> regenerationAmount;
        [Range(0.1f, 10f)] public float RegenerationRate;
        public OnChangeArgs Status => (OnChangeArgs)this;
        public SpendableResource<T> Capacity {
            get => _capacity;
            set {
                if (Capacity == value) {
                    return;
                }
                _capacity = value;
                OnCapacityChanged?.Invoke(this, (OnChangeArgs)this);
                if (Current < Capacity) {
                    Current = Capacity;
                }
            }
        }
        public SpendableResource<T> Current {
            get => _current;
            set {
                }
            }
        }
        public SpendableResource<T> RegenerationAmount {
            get => regenerationAmount;
            set {
                regenerationAmount = value;
            }
        }
        public event EventHandler<OnChangeArgs> OnCurrentChanged;
        public event EventHandler<OnChangeArgs> OnCapacityChanged;
        public event EventHandler<OnChangeArgs> OnRegenerationAmountChanged;
        public static explicit operator OnChangeArgs(PawnResource<T> resource) {
            return new(
                resource.RegenerationRate);
        }
        private IEnumerator Regenerate() {
            while (true) {
                yield return new WaitForSeconds(RegenerationRate);
                Current += RegenerationAmount;
                // print($"Regenerated {typeof(T).Name}, value = {Current}");
            }
        }
        protected void Start() {
            StartCoroutine(Regenerate());
        }
    }
}
                (int)resource.Current,
                (int)resource.Capacity,
                (int)resource.RegenerationAmount,
                OnRegenerationAmountChanged?.Invoke(this, (OnChangeArgs)this);
                var valueToSet = (SpendableResource<T>) Math.Clamp((int)value, (int)_minimumCapacity, (int) Capacity);
                if (_current != valueToSet) {
                    _current = valueToSet;
                    OnCurrentChanged?.Invoke(this, (OnChangeArgs)this);

File deletion: IPawnResource.cs.meta

BF:BFD[3.4211] → [3.9104:9149]

BF:BFD[3.9149] → [3.8859:8859]

B:BD[3.8859] → [3.8860:9103]

fileFormatVersion: 2
guid: b0f1bdcc41f94a746a8a2478bf829888
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: IPawnResource.cs

BF:BFD[3.4211] → [3.12303:12343]

BF:BFD[3.12343] → [3.9151:9151]

B:BD[3.9151] → [3.9152:10368]

∅:D[2.30974] → [3.10700:10816]

B:BD[3.10700] → [3.10700:10816]

∅:D[2.31040] → [3.11121:12301]

B:BD[3.11121] → [3.11121:12301]

B:BD[3.12301] → [2.31041:31194]

∅:D[2.31194] → [3.12301:12302]

B:BD[3.12301] → [3.12301:12302]

B:BD[3.10816] → [2.30975:31040]

B:BD[3.10368] → [2.30909:30974]


using System;
using UnityEngine;
namespace TagFighter.SpendableResources
{
    [Serializable]
    public struct SpendableResource<T> where T : ISpendableResource
    {
        [SerializeField] int _value;
        private SpendableResource(int value) => _value = value;
        public static explicit operator SpendableResource<T>(int value) => new(value);
        public static explicit operator int(SpendableResource<T> resource) => resource._value;
        public static bool operator ==(SpendableResource<T> a, SpendableResource<T> b) => a._value == b._value;
        public static bool operator >(SpendableResource<T> a, SpendableResource<T> b) => a._value > b._value;
        public static bool operator <(SpendableResource<T> a, SpendableResource<T> b) => a._value < b._value;
        public static bool operator !=(SpendableResource<T> a, SpendableResource<T> b) => !(a == b);
        public static bool operator >=(SpendableResource<T> a, SpendableResource<T> b) => !(a < b);
        public static bool operator <=(SpendableResource<T> a, SpendableResource<T> b) => !(a > b);
        public static SpendableResource<T> operator +(SpendableResource<T> a, SpendableResource<T> b) {
        }
        public static SpendableResource<T> operator -(SpendableResource<T> a, SpendableResource<T> b) {
        }
        public static float operator /(SpendableResource<T> a, SpendableResource<T> b) => a._value / (float)b._value;
        public static SpendableResource<T> operator /(SpendableResource<T> a, int b) => a / (float)b;
        public static SpendableResource<T> operator /(SpendableResource<T> a, float b) {
            SpendableResource<T> returnPoints;
            if (b == 0) {
                returnPoints = (SpendableResource<T>)int.MaxValue;
            }
            else {
                returnPoints = (SpendableResource<T>)(a._value / b);
            }
            return returnPoints;
        }
        public override bool Equals(object obj) {
            return obj is SpendableResource<T> points &&
                   _value == points._value;
        }
        public override int GetHashCode() {
            return HashCode.Combine(_value);
        }
        public override string ToString() => _value.ToString();
    }
    public interface ISpendableResource { }
    public class Pain : ISpendableResource { }
    public class Fatigue : ISpendableResource { }
    public class Strain : ISpendableResource { }
    public class RedTag : ISpendableResource { }
    public class BlueTag : ISpendableResource { }
    public class GreenTag : ISpendableResource { }
}
            return (SpendableResource<T>)(a._value - b._value);
            return (SpendableResource<T>)(a._value + b._value);

File addition: Unit.cs.meta (---x------)

[3.4211]

fileFormatVersion: 2
guid: b0f1bdcc41f94a746a8a2478bf829888
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: Unit.cs (---x------)

[3.4211]


using System;
using UnityEngine;
namespace TagFighter.Resources
{
    [Serializable]
    public struct Unit<T> where T : IUnit
    {
        [SerializeField] int _value;
        private Unit(int value) => _value = value;
        public static explicit operator Unit<T>(int value) => new(value);
        public static explicit operator int(Unit<T> resource) => resource._value;
        public static bool operator ==(Unit<T> a, Unit<T> b) => a._value == b._value;
        public static bool operator >(Unit<T> a, Unit<T> b) => a._value > b._value;
        public static bool operator <(Unit<T> a, Unit<T> b) => a._value < b._value;
        public static bool operator !=(Unit<T> a, Unit<T> b) => !(a == b);
        public static bool operator >=(Unit<T> a, Unit<T> b) => !(a < b);
        public static bool operator <=(Unit<T> a, Unit<T> b) => !(a > b);
        public static Unit<T> operator ++(Unit<T> a) {
            return (Unit<T>)(++a._value);
        }
        public static Unit<T> operator --(Unit<T> a) {
            return (Unit<T>)(--a._value);
        }
        public static Unit<T> operator +(Unit<T> a, Unit<T> b) {
            return (Unit<T>)(a._value + b._value);
        }
        public static Unit<T> operator -(Unit<T> a, Unit<T> b) {
            return (Unit<T>)(a._value - b._value);
        }
        public static float operator /(Unit<T> a, Unit<T> b) => a._value / (float)b._value;
        public static Unit<T> operator /(Unit<T> a, int b) => a / (float)b;
        public static Unit<T> operator /(Unit<T> a, float b) {
            Unit<T> returnPoints;
            if (b == 0) {
                returnPoints = (Unit<T>)int.MaxValue;
            }
            else {
                returnPoints = (Unit<T>)(a._value / b);
            }
            return returnPoints;
        }
        public override bool Equals(object obj) {
            return obj is Unit<T> points &&
                   _value == points._value;
        }
        public override int GetHashCode() {
            return HashCode.Combine(_value);
        }
        public override string ToString() => _value.ToString();
    }
    public interface IUnit { }
    public class PainUnit : IUnit { }
    public class FatigueUnit : IUnit { }
    public class StrainUnit : IUnit { }
    public class RedTagUnit : IUnit { }
    public class BlueTagUnit : IUnit { }
    public class GreenTagUnit : IUnit { }
}

Replacement in Assets/Scripts/PawnResources/Tags/RedTag.cs at line 3 [2.513]
B:BD[2.531] → [2.531:567]
```
namespace TagFighter.PawnResources
```
[2.531]
[2.567]
```
namespace TagFighter.Resources
```

Replacement in Assets/Scripts/PawnResources/Tags/RedTag.cs at line 6 [2.513]

B:BD[2.590] → [2.590:661]

    public class RedTag : PawnResource<SpendableResources.RedTag> { }

[2.590]

[2.661]

    public class RedTag : Resource<RedTagUnit> { }

Replacement in Assets/Scripts/PawnResources/Tags/GreenTag.cs at line 3 [2.985]
B:BD[2.1003] → [2.1003:1039]
```
namespace TagFighter.PawnResources
```
[2.1003]
[2.1039]
```
namespace TagFighter.Resources
```

Replacement in Assets/Scripts/PawnResources/Tags/GreenTag.cs at line 6 [2.985]

B:BD[2.1062] → [2.1062:1137]

    public class GreenTag : PawnResource<SpendableResources.GreenTag> { }

[2.1062]

[2.1137]

    public class GreenTag : Resource<GreenTagUnit> { }

Replacement in Assets/Scripts/PawnResources/Tags/BlueTag.cs at line 3 [2.1462]
B:BD[2.1480] → [2.1480:1516]
```
namespace TagFighter.PawnResources
```
[2.1480]
[2.1516]
```
namespace TagFighter.Resources
```

Replacement in Assets/Scripts/PawnResources/Tags/BlueTag.cs at line 6 [2.1462]

B:BD[2.1539] → [2.1539:1612]

    public class BlueTag : PawnResource<SpendableResources.BlueTag> { }

[2.1539]

[2.1612]

    public class BlueTag : Resource<BlueTagUnit> { }

File addition: ResourceWatcher.cs.meta (---x------)

[3.4211]

fileFormatVersion: 2
guid: 94efccc62caea1a4580ab6f122e09ce2
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: ResourceWatcher.cs (---x------)

[3.4211]

using TagFighter.Resources;
using UnityEngine;
namespace TagFighter.UI
{
    [RequireComponent(typeof(IResourceViewer))]
    public class ResourceWatcher : MonoBehaviour
    {
        IWatchableResource _watchedResource;
        IResourceViewer _resourceDisplay;
        static readonly OnChangeArgs Default = new(0, 1, 0, 0);
        public IWatchableResource WatchedResource {
            get => _watchedResource;
            set {
                if (_watchedResource != null) {
                    _watchedResource.OnCapacityChanged -= OnCapacityChanged;
                    _watchedResource.OnCurrentChanged -= OnCurrentChanged;
                    _watchedResource.OnRegenerationAmountChanged -= OnRegenerationAmountChanged;
                }
                _watchedResource = value;
                OnChangeArgs status = Default;
                if (_watchedResource != null) {
                    _watchedResource.OnCapacityChanged += OnCapacityChanged;
                    _watchedResource.OnCurrentChanged += OnCurrentChanged;
                    _watchedResource.OnRegenerationAmountChanged += OnRegenerationAmountChanged;
                    status = _watchedResource.Status;
                }
                _resourceDisplay.UpdateView(status);
            }
        }
        protected void Awake() {
            _resourceDisplay = GetComponent<IResourceViewer>();
        }
        protected virtual void OnCapacityChanged(object sender, OnChangeArgs e) {
            _resourceDisplay.UpdateView(e);
        }
        protected virtual void OnCurrentChanged(object sender, OnChangeArgs e) {
            _resourceDisplay.UpdateView(e);
        }
        protected virtual void OnRegenerationAmountChanged(object sender, OnChangeArgs e) {
            _resourceDisplay.UpdateView(e);
        }
        protected void OnDestroy() {
            _resourceDisplay = null;
        }
    }
}

File addition: Resource.cs.meta (---x------)

[3.4211]

fileFormatVersion: 2
guid: bede5cbc2cf21a3499cd0b5e3a262d95
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: Resource.cs (---x------)

[3.4211]

using System;
using System.Collections;
using UnityEngine;
namespace TagFighter.Resources
{
    [Serializable]
    public class Resource<T> : MonoBehaviour, IWatchableResource where T : IUnit
    {
        [SerializeField] Unit<T> _current;
        [SerializeField] Unit<T> _capacity;
        readonly Unit<T> _minimumCapacity = (Unit<T>) 0;
        [SerializeField] Unit<T> regenerationAmount;
        [Range(0.1f, 10f)] public float RegenerationRate;
        public OnChangeArgs Status => (OnChangeArgs)this;
        public Unit<T> Capacity {
            get => _capacity;
            set {
                if (Capacity == value) {
                    return;
                }
                _capacity = value;
                OnCapacityChanged?.Invoke(this, (OnChangeArgs)this);
                if (Current < Capacity) {
                    Current = Capacity;
                }
            }
        }
        public Unit<T> Current {
            get => _current;
            set {
                var valueToSet = (Unit<T>) Math.Clamp((int)value, (int)_minimumCapacity, (int) Capacity);
                if (_current != valueToSet) {
                    _current = valueToSet;
                    OnCurrentChanged?.Invoke(this, (OnChangeArgs)this);
                }
            }
        }
        public Unit<T> RegenerationAmount {
            get => regenerationAmount;
            set {
                regenerationAmount = value;
                OnRegenerationAmountChanged?.Invoke(this, (OnChangeArgs)this);
            }
        }
        public event EventHandler<OnChangeArgs> OnCurrentChanged;
        public event EventHandler<OnChangeArgs> OnCapacityChanged;
        public event EventHandler<OnChangeArgs> OnRegenerationAmountChanged;
        public static explicit operator OnChangeArgs(Resource<T> resource) {
            return new(
                (int)resource.Current,
                (int)resource.Capacity,
                (int)resource.RegenerationAmount,
                resource.RegenerationRate);
        }
        private IEnumerator Regenerate() {
            while (true) {
                yield return new WaitForSeconds(RegenerationRate);
                Current += RegenerationAmount;
                // print($"Regenerated {typeof(T).Name}, value = {Current}");
            }
        }
        protected void Start() {
            StartCoroutine(Regenerate());
        }
    }
}

Replacement in Assets/Scripts/PawnResources/Pain.cs at line 3 [3.7403]
B:BD[3.7421] → [3.7421:7457]
```
namespace TagFighter.PawnResources
```
[3.7421]
[3.7457]
```
namespace TagFighter.Resources
```

Replacement in Assets/Scripts/PawnResources/Pain.cs at line 6 [3.7403]

B:BD[3.7480] → [3.7480:7559]

    public class Pain : PawnResource<SpendableResources.Pain>
    {
    }

[3.7480]

[3.7559]

    public class Pain : Resource<PainUnit> { }

Replacement in Assets/Scripts/PawnResources/IWatchableResource.cs at line 4 [3.7891]
B:BD[3.7911] → [3.7911:7947]
```
namespace TagFighter.PawnResources
```
[3.7911]
[3.7947]
```
namespace TagFighter.Resources
```

File addition: IResourceViewer.cs.meta (---x------)

[3.4211]

fileFormatVersion: 2
guid: dd2006828ab220e4eafe7e265905282d
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: IResourceViewer.cs (---x------)

[3.4211]

using TagFighter.Resources;
namespace TagFighter.UI
{
    public interface IResourceViewer
    {
        public void UpdateView(OnChangeArgs e);
    }
}

Replacement in Assets/Scripts/PawnResources/Fatigue.cs at line 3 [3.12631]
B:BD[3.12649] → [3.12649:12685]
```
namespace TagFighter.PawnResources
```
[3.12649]
[3.12685]
```
namespace TagFighter.Resources
```

Replacement in Assets/Scripts/PawnResources/Fatigue.cs at line 6 [3.12631]

B:BD[3.12708] → [2.31197:31270]

    public class Fatigue : PawnResource<SpendableResources.Fatigue> { }

[3.12708]

[3.12790]

    public class Fatigue : Resource<FatigueUnit> { }

Replacement in Assets/Scripts/Combat/Tags/TagViewer.cs at line 1 [2.4783]
B:BD[2.4783] → [2.4784:4817]
```
using TagFighter.PawnResources;
```
[2.4783]
[2.4817]
```
using TagFighter.Resources;
```

Replacement in Assets/Scripts/Combat/Tags/TagViewer.cs at line 8 [2.4783]

B:BD[2.4890] → [2.4890:4955]

    public class TagViewer : MonoBehaviour, IPawnResourceViewer

[2.4890]

[2.4955]

    public class TagViewer : MonoBehaviour, IResourceViewer

Replacement in Assets/Scripts/Combat/Tags/TagUIController.cs at line 1 [7.20178]
B:BD[7.20178] → [2.31311:31344]
```
using TagFighter.PawnResources;
```
[7.20178]
[7.20241]
```
using TagFighter.Resources;
```

Replacement in Assets/Scripts/Combat/Tags/TagUIController.cs at line 15 [7.20178]

B:BD[2.31588] → [2.31588:31969]

            transform.Find($"RedTag").GetComponent<PawnResourceWatcher>().WatchedResource = GetComponentInParent<RedTag>();
            transform.Find($"GreenTag").GetComponent<PawnResourceWatcher>().WatchedResource = GetComponentInParent<GreenTag>();
            transform.Find($"BlueTag").GetComponent<PawnResourceWatcher>().WatchedResource = GetComponentInParent<BlueTag>();

[2.31588]

[7.21187]

            transform.Find($"RedTag").GetComponent<ResourceWatcher>().WatchedResource = GetComponentInParent<RedTag>();
            transform.Find($"GreenTag").GetComponent<ResourceWatcher>().WatchedResource = GetComponentInParent<GreenTag>();
            transform.Find($"BlueTag").GetComponent<ResourceWatcher>().WatchedResource = GetComponentInParent<BlueTag>();

Replacement in Assets/Scenes/SampleScene.unity at line 2623 [9.780110080]
B:BD[6.5024] → [8.45433:45449]
```
  m_IsActive: 0
```
[6.5024]
[6.5040]
```
  m_IsActive: 1
```

Change naming for easier explicit Unit conversion

Dependencies

In channels

Change contents

File deletion: PawnResourceViewer.cs.meta

File deletion: PawnResourceViewer.cs

File addition: ImageFillResourceViewer.cs.meta (---x------)

File addition: ImageFillResourceViewer.cs (---x------)

Replacement in Assets/Scripts/UI/HUD/PartyView.cs at line 1 [4.29456]

Replacement in Assets/Scripts/UI/HUD/PartyView.cs at line 35 [4.29456]

Replacement in Assets/Scripts/Tester.cs at line 4 [6.286]

Replacement in Assets/Scripts/Tester.cs at line 43 [6.286]

Replacement in Assets/Scripts/Tester.cs at line 46 [6.286]

Replacement in Assets/Scripts/Tester.cs at line 49 [6.286]

File deletion: PawnResourceWatcher.cs.meta

File deletion: PawnResourceWatcher.cs

File deletion: IPawnResourceViewer.cs.meta

File deletion: IPawnResourceViewer.cs

File deletion: PawnResource.cs.meta

File deletion: PawnResource.cs

File deletion: IPawnResource.cs.meta

File deletion: IPawnResource.cs

File addition: Unit.cs.meta (---x------)

File addition: Unit.cs (---x------)

Replacement in Assets/Scripts/PawnResources/Tags/RedTag.cs at line 3 [2.513]

Replacement in Assets/Scripts/PawnResources/Tags/RedTag.cs at line 6 [2.513]

Replacement in Assets/Scripts/PawnResources/Tags/GreenTag.cs at line 3 [2.985]

Replacement in Assets/Scripts/PawnResources/Tags/GreenTag.cs at line 6 [2.985]

Replacement in Assets/Scripts/PawnResources/Tags/BlueTag.cs at line 3 [2.1462]

Replacement in Assets/Scripts/PawnResources/Tags/BlueTag.cs at line 6 [2.1462]

File addition: ResourceWatcher.cs.meta (---x------)

File addition: ResourceWatcher.cs (---x------)

File addition: Resource.cs.meta (---x------)

File addition: Resource.cs (---x------)

Replacement in Assets/Scripts/PawnResources/Pain.cs at line 3 [3.7403]

Replacement in Assets/Scripts/PawnResources/Pain.cs at line 6 [3.7403]

Replacement in Assets/Scripts/PawnResources/IWatchableResource.cs at line 4 [3.7891]

File addition: IResourceViewer.cs.meta (---x------)

File addition: IResourceViewer.cs (---x------)

Replacement in Assets/Scripts/PawnResources/Fatigue.cs at line 3 [3.12631]

Replacement in Assets/Scripts/PawnResources/Fatigue.cs at line 6 [3.12631]

Replacement in Assets/Scripts/Combat/Tags/TagViewer.cs at line 1 [2.4783]

Replacement in Assets/Scripts/Combat/Tags/TagViewer.cs at line 8 [2.4783]

Replacement in Assets/Scripts/Combat/Tags/TagUIController.cs at line 1 [7.20178]

Replacement in Assets/Scripts/Combat/Tags/TagUIController.cs at line 15 [7.20178]

Replacement in Assets/Scenes/SampleScene.unity at line 2623 [9.780110080]