itai.sharim/TagFight - Change XRWOXKR3MD3O73SH33CWRUYMTS6KVWGN6U2AIKNVNGHN37MY7UYQC

Runes as scriptable objects

Created by RaniSharim on August 27, 2022

XRWOXKR3MD3O73SH33CWRUYMTS6KVWGN6U2AIKNVNGHN37MY7UYQC

Dependencies

[2] DTKCWM4J7PFNWAAES3RZHQGDA6PTDNX4TZVOXAKF5V7LCZBI3XUAC

In channels

main

Change contents

Replacement in Assets/Scripts/Combat/Runes/RuneRef.cs at line 9 [2.2420]
B:BD[2.2615] → [2.2615:2648]
```
    [SerializeField] Rune rune;
```
[2.2615]
[2.2648]
```
    public Rune rune;
```

Replacement in Assets/Scripts/Combat/Runes/RuneRef.cs at line 12 [2.2420]

B:BD[2.2726] → [2.2726:2834]

    private void OnEnable() {
        if (rune != null) {
            rune.Populate();
        }
    }

[2.2726]

[2.2834]

    // private void OnEnable() {
    //     if (rune != null) {
    //         rune.Populate();
    //     }
    // }

Replacement in Assets/Scripts/Combat/Runes/RuneRef.cs at line 18 [2.2420]

B:BD[2.2836] → [2.2836:2942]

    private void OnDisable() {
        if (rune != null) {
            rune.Clear();
        }
    }

[2.2836]

[2.2942]

    // private void OnDisable() {
    //     if (rune != null) {
    //         rune.Clear();
    //     }
    // }

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 12 [2.3265]

B:BD[2.3427] → [2.3427:3477]

    [SerializeField]
    List<IEffect> effects;

[2.3427]

[2.3477]

    public List<EffectRef> effects = new  List<EffectRef>();

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 15 [2.3265]

B:BD[2.3530] → [2.3530:3653]

    [SerializeField]
    public float speed { get; set; }
    [SerializeField]
    public float manaCost { get; set; }

[2.3530]

[2.3653]

    public string name;
    public float speed;
    public float manaCost;

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 26 [2.3265]

B:BD[2.3787] → [2.3787:3828]

            _effects.AddRange(effects);

[2.3787]

[2.3828]

            _effects.AddRange(effects.Select(effectRef => effectRef.Build()));

File deletion: ApplyDamage.cs.meta

BF:BFD[2.4359] → [2.10574:10617]

BF:BFD[2.10617] → [2.10329:10329]

B:BD[2.10329] → [2.10330:10573]

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

File deletion: ApplyDamage.cs

BF:BFD[2.4359] → [2.11030:11068]

BF:BFD[2.11068] → [2.10619:10619]

B:BD[2.10619] → [2.10620:11029]

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ApplyDamage : IEffect
{
  
    [SerializeField] 
    AreaOfEffect area {get; set;}
    [SerializeField] 
    bool friendOrFoeOff { get; set;}
    public void Effect(EffectContext context) {
        var targets = area.GetEffectedUnits(context.caster);
        // TODO: Do damage
    }
  
}

Deletion in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 7 [2.4675]
B:BD[2.4804] → [2.4804:4827]
```
    [SerializeField] 
```
Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 8 [2.4675]
B:BD[2.4859] → [2.4859:4919]
```
    [SerializeField] 
    float divider  {get; set;} = 1;
```
[2.4859]
[2.4919]
```
    float multiplicative  {get; set;} = 1;
```
Deletion in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 10 [2.4675]
B:BD[2.4921] → [2.4921:4944]
```
    [SerializeField] 
```
Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 12 [2.4675]
B:BD[2.4975] → [2.4975:5041]
```
    [SerializeField] 
    bool devideBeforeSubtract {get; set;}
```
[2.4975]
[2.5041]
```
    bool multiplicativeBeforeFlat {get; set;}
```

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 18 [2.4675]

B:BD[2.5102] → [2.5102:5222]

        if (devideBeforeSubtract) {
            context.addedTags[color] = context.addedTags[color] / divider - flat;

[2.5102]

[2.5222]

        if (multiplicativeBeforeFlat) {
            context.addedTags[color] = context.addedTags[color] / multiplicative - flat;

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 21 [2.4675]

B:BD[2.5240] → [2.5240:5326]

             context.addedTags[color] = (context.addedTags[color] - flat) * divider;

[2.5240]

[2.5326]

             context.addedTags[color] = (context.addedTags[color] - flat) * multiplicative;

Deletion in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 7 [2.7015]
B:BD[2.7143] → [2.7143:7166]
```
    [SerializeField] 
```
Deletion in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 9 [2.7015]
B:BD[2.7200] → [2.7200:7223]
```
    [SerializeField] 
```
Deletion in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 11 [2.7015]
B:BD[2.7260] → [2.7260:7283]
```
    [SerializeField] 
```
Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 7 [2.8100]
[2.8220]
[2.8220]
```
[Serializable]
```
Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 12 [2.8100]
[2.8287]
[2.8287]
```
[Serializable]
```
Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 16 [2.8100]
B:BD[2.8365] → [2.8365:8418]
```
    [SerializeField] 
    float length {get; set;}
```
[2.8365]
[2.8418]
```
    public float length;
```
Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 18 [2.8100]
B:BD[2.8420] → [2.8420:8472]
```
    [SerializeField] 
    float width {get; set;}
```
[2.8420]
[2.8472]
```
    public float width;
```
Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 20 [2.8100]
B:BD[2.8474] → [2.8474:8529]
```
    [SerializeField] 
    AoeShape shape {get; set;}
```
[2.8474]
[2.8529]
```
    public AoeShape shape;
```
Deletion in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 9 [2.11362]
B:BD[2.11519] → [2.11519:11542]
```
    [SerializeField] 
```
Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 10 [2.11362]
B:BD[2.11574] → [2.11574:11632]
```
    [SerializeField] 
    float multiplier  {get; set;}
```
[2.11574]
[2.11632]
```
    float multiplicative  {get; set;}
```
Deletion in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 12 [2.11362]
B:BD[2.11634] → [2.11634:11657]
```
    [SerializeField] 
```
Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 14 [2.11362]
B:BD[2.11688] → [2.11688:11751]
```
    [SerializeField] 
    bool multiplyBeforeAdd {get; set;}
```
[2.11688]
[2.11751]
```
    bool multiplicativeBeforeFlat {get; set;}
```

Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 20 [2.11362]

B:BD[2.11812] → [2.11812:11932]

        if (multiplyBeforeAdd) {
            context.addedTags[color] = context.addedTags[color] * multiplier + flat;

[2.11812]

[2.11932]

        if (multiplicativeBeforeFlat) {
            context.addedTags[color] = context.addedTags[color] * multiplicative + flat;

Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 23 [2.11362]

B:BD[2.11950] → [2.11950:12039]

             context.addedTags[color] = (context.addedTags[color] + flat) * multiplier;

[2.11950]

[2.12039]

             context.addedTags[color] = (context.addedTags[color] + flat) * multiplicative;

Runes as scriptable objects

Dependencies

In channels

Change contents

Replacement in Assets/Scripts/Combat/Runes/RuneRef.cs at line 9 [2.2420]

Replacement in Assets/Scripts/Combat/Runes/RuneRef.cs at line 12 [2.2420]

Replacement in Assets/Scripts/Combat/Runes/RuneRef.cs at line 18 [2.2420]

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 12 [2.3265]

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 15 [2.3265]

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 26 [2.3265]

File deletion: ApplyDamage.cs.meta

File deletion: ApplyDamage.cs

Deletion in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 7 [2.4675]

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 8 [2.4675]

Deletion in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 10 [2.4675]

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 12 [2.4675]

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 18 [2.4675]

Replacement in Assets/Scripts/Combat/Runes/Effects/RemoveTagsEffect.cs at line 21 [2.4675]

Deletion in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 7 [2.7015]

Deletion in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 9 [2.7015]

Deletion in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 11 [2.7015]

Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 7 [2.8100]

Insertion in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 12 [2.8100]

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 16 [2.8100]

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 18 [2.8100]

Replacement in Assets/Scripts/Combat/Runes/Effects/AreaOfEffect.cs at line 20 [2.8100]

Deletion in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 9 [2.11362]

Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 10 [2.11362]

Deletion in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 12 [2.11362]

Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 14 [2.11362]

Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 20 [2.11362]

Replacement in Assets/Scripts/Combat/Runes/Effects/AddTagsEffect.cs at line 23 [2.11362]