itai.sharim/TagFight - Change CG73LGDDWA4UBELKXPUJBNDMGVO3JRE2A6QUNURTJVEEZAJJM6FAC

Disable RuneRefEditor, replace with ClassTypeReference in EffectRef

Created by itai.sharim on October 13, 2022

CG73LGDDWA4UBELKXPUJBNDMGVO3JRE2A6QUNURTJVEEZAJJM6FAC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/Combat/Runes/RuneRefEditor.cs at line 7 [5.293]
∅:D[4.416] → [5.431:433]
B:BD[5.431] → [5.431:433]
[4.416]
[4.417]
```
/*
```
Insertion in Assets/Scripts/Combat/Runes/RuneRefEditor.cs at line 96 [5.293]
[5.4644]
```
*/
```
Deletion in Assets/Scripts/Combat/Runes/Rune.cs at line 2 [6.3265]
B:BD[6.3281] → [6.3281:3308]
```
using System.Collections;
```
Deletion in Assets/Scripts/Combat/Runes/Rune.cs at line 3 [6.3265]
B:BD[6.3343] → [6.3343:3363]
```
using UnityEngine;
```

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 23 [6.3265]

B:BD[6.3787] → [7.669:796]

            _effects.AddRange(effects.Where(effectRef => effectRef.EffectType != "").Select(effectRef => effectRef.Build()));

[6.3787]

[6.3828]

            _effects.AddRange(effects.Where(effectRef => effectRef.EffectType.Type != null).Select(effectRef => effectRef.Build()));

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 34 [6.3265]
B:BD[6.4006] → [6.4006:4051]
```
        foreach ( var effect in _effects) {
```
[6.4006]
[6.4051]
```
        foreach (var effect in _effects) {
```
Deletion in Assets/Scripts/Combat/Runes/Rune.cs at line 38 [6.3265]
B:BD[6.4106] → [6.4106:4110]
Deletion in Assets/Scripts/Combat/Runes/EffectRef.cs at line 1 [8.998]
B:BD[8.998] → [8.999:1081]
```
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
```
Replacement in Assets/Scripts/Combat/Runes/EffectRef.cs at line 2 [8.998]
B:BD[8.1096] → [5.8547:8567]
```
using System.Linq;
```
[8.1096]
[8.1098]
```
using TypeReferences;
```
Deletion in Assets/Scripts/Combat/Runes/EffectRef.cs at line 4 [8.998]
B:BD[8.1100] → [8.1100:1102]

Replacement in Assets/Scripts/Combat/Runes/EffectRef.cs at line 7 [8.998]

B:BD[8.1152] → [8.1152:1185]

    public string EffectType;

[8.1152]

[2.3882]

    [ClassImplements(typeof(IEffect))]
    public ClassTypeReference EffectType;

Deletion in Assets/Scripts/Combat/Runes/EffectRef.cs at line 20 [8.998]
B:BD[8.1388] → [5.8766:8820]
∅:D[2.4134] → [8.1388:1390]
∅:D[5.8820] → [8.1388:1390]
B:BD[8.1388] → [8.1388:1390]
```
    public const string EffectTypeSuffix = "Effect";
```

Replacement in Assets/Scripts/Combat/Runes/EffectRef.cs at line 21 [8.998]

B:BD[8.1420] → [5.8821:9099]

∅:D[2.4413] → [8.1883:1894]

∅:D[5.9099] → [8.1883:1894]

B:BD[8.1883] → [8.1883:1894]

B:BD[8.1894] → [2.4414:4484]

        Type effectType =   typeof(IEffect).Assembly.GetTypes().Where(t => typeof(IEffect).IsAssignableFrom(t) && !t.IsInterface && t.Name == EffectType + EffectTypeSuffix).FirstOrDefault();
        if (effectType == null) {
            throw new IndexOutOfRangeException();
        }
        var iEffect = (IEffect)Activator.CreateInstance(effectType);

[8.1420]

[2.4484]

        var iEffect = (IEffect)Activator.CreateInstance(EffectType.Type);

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

B:BD[9.780121071] → [3.20246:20324]

  m_LocalRotation: {x: 0.22914575, y: -0.0707091, z: 0.01669215, w: 0.970677}

[9.780121071]

[10.33888019]

  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}

Insertion in Assets/Scenes/SampleScene.unity at line 2663 [9.780110080]
[11.7142]
[9.780146030]
```
  f:
  - 0
```

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

B:BD[9.780162310] → [3.20572:20650]

  m_LocalRotation: {x: 0.22914575, y: -0.0707091, z: 0.01669215, w: 0.970677}

[9.780162310]

[10.33918016]

  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}

Replacement in Assets/ClassTypeReference/Editor/ClassTypeReferencePropertyDrawer.cs at line 93 [3.1603]

B:BD[3.4985] → [3.4985:5072]

		private static Dictionary<string, Type> s_TypeMap = new Dictionary<string, Type>();

[3.4985]

[3.5072]

		private static Dictionary<string, Type> s_TypeMap = new();

Replacement in Assets/ClassTypeReference/Editor/ClassTypeReferencePropertyDrawer.cs at line 96 [3.1603]

B:BD[3.5128] → [3.5128:5330]

			Type type;
			if (!s_TypeMap.TryGetValue(classRef, out type)) {
				type = !string.IsNullOrEmpty(classRef) ? Type.GetType(classRef) : null;
				s_TypeMap[classRef] = type;
			}
			return type;

[3.5128]

[3.5330]

            if (!s_TypeMap.TryGetValue(classRef, out Type type)) {
                type = !string.IsNullOrEmpty(classRef) ? Type.GetType(classRef) : null;
                s_TypeMap[classRef] = type;
            }
            return type;

Replacement in Assets/ClassTypeReference/Editor/ClassTypeReferencePropertyDrawer.cs at line 108 [3.1603]
B:BD[3.5502] → [3.5502:5565]
```
		private static GUIContent s_TempContent = new GUIContent();
```
[3.5502]
[3.5565]
```
		private static GUIContent s_TempContent = new();
```

Replacement in Assets/ClassTypeReference/Editor/ClassTypeReferencePropertyDrawer.cs at line 223 [3.1603]

B:BD[3.9193] → [3.9193:9287]

						name = name.Substring(0, lastPeriodIndex) + "/" + name.Substring(lastPeriodIndex + 1);

[3.9193]

[3.9287]

						name = name[..lastPeriodIndex] + "/" + name[(lastPeriodIndex + 1)..];

Disable RuneRefEditor, replace with ClassTypeReference in EffectRef

Dependencies

In channels

Change contents

Replacement in Assets/Scripts/Combat/Runes/RuneRefEditor.cs at line 7 [5.293]

Insertion in Assets/Scripts/Combat/Runes/RuneRefEditor.cs at line 96 [5.293]

Deletion in Assets/Scripts/Combat/Runes/Rune.cs at line 2 [6.3265]

Deletion in Assets/Scripts/Combat/Runes/Rune.cs at line 3 [6.3265]

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 23 [6.3265]

Replacement in Assets/Scripts/Combat/Runes/Rune.cs at line 34 [6.3265]

Deletion in Assets/Scripts/Combat/Runes/Rune.cs at line 38 [6.3265]

Deletion in Assets/Scripts/Combat/Runes/EffectRef.cs at line 1 [8.998]

Replacement in Assets/Scripts/Combat/Runes/EffectRef.cs at line 2 [8.998]

Deletion in Assets/Scripts/Combat/Runes/EffectRef.cs at line 4 [8.998]