itai.sharim/TagFight - Change JZVIQ3IPEXQ5OWCAKZQW666LXIZLMP5U247YI6Y2EJ7MDNWPGCZQC

Attach effect system

Created by RaniSharim on October 15, 2022

JZVIQ3IPEXQ5OWCAKZQW666LXIZLMP5U247YI6Y2EJ7MDNWPGCZQC

Dependencies

In channels

main

Change contents

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 190 [4.294]

B:BD[3.47182] → [3.47182:47273]

                                   _runeBindingSequence.Select(clicker => clicker.Rune));

[3.47182]

[5.633]

                                   _runeBindingSequence.Select(clicker => clicker.Rune), null, null);

Replacement in Assets/Scripts/Tester.cs at line 44 [7.286]

B:BD[6.51102] → [6.51102:51248]

            effectSystem.AppalyTagsEffect(new TagCounter(){}, affected, new AreaOfEffect() { shape = AoeShape.Radius ,length = 15, width = 15});

[6.51102]

[3.76071]

            effectSystem.ApplyTagsEffect(new TagCounter(){}, affected, new AreaOfEffect() { shape = AoeShape.Radius ,length = 15, width = 15});

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 11 [6.750]

B:BD[6.935] → [6.935:1033]

    public void AppalyTagsEffect(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

[6.935]

[6.1033]

    public void ApplyTagsEffect(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 13 [6.750]

B:BD[6.1072] → [6.1072:1158]

B:BD[6.1158] → [2.3523:3613]

∅:D[2.3613] → [6.1158:1252]

B:BD[6.1158] → [6.1158:1252]

B:BD[6.1252] → [2.3614:3704]

            case AoeShape.SingleTarget: AppalyTagsEffectSingle(tags, origin); break;
            case AoeShape.Path: AppalyTagsEffectPath(tags, origin, areaOfEffect); break;
            case AoeShape.Radius: AppalyTagsEffectRadius(tags, origin, areaOfEffect); break;
            case AoeShape.Cone: AppalyTagsEffectCone(tags, origin, areaOfEffect); break;

[6.1072]

[6.1252]

            case AoeShape.SingleTarget: ApplyTagsEffectSingle(tags, origin); break;
            case AoeShape.Path: ApplyTagsEffectPath(tags, origin, areaOfEffect); break;
            case AoeShape.Radius: ApplyTagsEffectRadius(tags, origin, areaOfEffect); break;
            case AoeShape.Cone: ApplyTagsEffectCone(tags, origin, areaOfEffect); break;

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 20 [6.750]

B:BD[6.1272] → [6.1272:1350]

    private void AppalyTagsEffectSingle(TagCounter tags, Transform origin) {

[6.1272]

[2.3705]

    private void ApplyTagsEffectSingle(TagCounter tags, Transform origin) {

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 25 [6.750]

B:BD[6.1361] → [2.3752:3855]

    private void AppalyTagsEffectPath(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

[6.1361]

[2.3855]

    private void ApplyTagsEffectPath(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 27 [6.750]

∅:D[2.3862] → [6.1361:1466]

B:BD[6.1361] → [6.1361:1466]

    private void AppalyTagsEffectRadius(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

[2.3862]

[6.1466]

    private void ApplyTagsEffectRadius(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

Replacement in Assets/Scripts/Effects/EffectSystem.cs at line 36 [6.750]

B:BD[6.1825] → [2.3863:3966]

    private void AppalyTagsEffectCone(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

[6.1825]

[2.3966]

    private void ApplyTagsEffectCone(TagCounter tags, Transform origin, AreaOfEffect areaOfEffect) {

Replacement in Assets/Scripts/Controllers/UnitController.cs at line 98 [3.26412]

B:BD[8.11642] → [8.11642:11707]

        SelectedWeaver.TryQueueWeave(new(e.Weave), TargetUnit);

[8.11642]

[8.11707]

        SelectedWeaver.TryQueueWeave(new(e.Weave, SelectedWeaver.transform, TargetUnit), TargetUnit);

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeavingBank.cs at line 57 [10.1301]

B:BD[9.32853] → [9.32853:33061]

    public RuneWeavingContainer(RuneWeavingContainer toCopy) {
        runeWeaving = new RuneWeaving(toCopy.runeWeaving.martialSequence.GetSequence(), toCopy.runeWeaving.runeBindingSequence.GetSequence());

[9.32853]

[9.33061]

    public RuneWeavingContainer(RuneWeavingContainer toCopy, Transform caster, Transform target) {
        runeWeaving = new RuneWeaving(toCopy.runeWeaving.martialSequence.GetSequence(), toCopy.runeWeaving.runeBindingSequence.GetSequence(), caster, target);

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 12 [11.761]

B:BD[10.6395] → [5.3250:3353]

    public RuneWeaving(IEnumerable<CombatMove> combatMovesSequence, IEnumerable<Rune> runeSequence) {

[10.6395]

[5.3353]

    public RuneWeaving(IEnumerable<CombatMove> combatMovesSequence, IEnumerable<Rune> runeSequence, Transform caster, Transform target) {

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 14 [11.761]
B:BD[5.3406] → [5.3406:3456]
```
        runeBindingSequence = new(runeSequence);
```
[5.3406]
[10.6484]
```
        runeBindingSequence = new(runeSequence, caster, target);
```

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 19 [11.1601]

B:BD[12.13477] → [5.3512:3578]

    public RuneBindingSequence(IEnumerable<Rune> runeSequence) {

[12.13477]

[5.3578]

    public RuneBindingSequence(IEnumerable<Rune> runeSequence, Transform caster, Transform target) {

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 21 [11.1601]

[5.3618]


         // TODO: Inject this for real
        context = new EffectContext(null, new EffectSystem( GameObject.Find("RippleOutVfx").GetComponent<ParticleSystem>())) {
            EffectLocation = target,
            Caster = caster
        };

Replacement in Assets/Scripts/Combat/Weaving/Sequences/RuneBindingSequence.cs at line 32 [11.1601]

B:BD[12.13586] → [12.13586:13734]

        // TODO : need to set caster / target
        context = new EffectContext() { /* caster = caster, effectLocation = effectLocation */ };

[12.13586]

[12.13734]

        context.Reset();

Replacement in Assets/Scripts/Combat/Tags/TagSystem.cs at line 23 [13.22348]

B:BD[13.23297] → [14.1790:1862]

                _eventAggregator.InvokeOnTagsChanged(this, eventArgs);

[13.23297]

[13.23354]

                if (_eventAggregator != null) {
                    _eventAggregator.InvokeOnTagsChanged(this, eventArgs);
                }

Insertion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 26 [12.6210]

[12.6532]

[15.837]

    public EffectContext(TagSystem tagSystem, EffectSystem effectSystem) {
        TagSystem = tagSystem;
        EffectSystem = effectSystem;
    }

Insertion in Assets/Scripts/Combat/Runes/Effects/EffectContext.cs at line 46 [12.6210]
[16.1284]
[15.1256]
```
    public void Reset() {
        ResetEffects();
    }
```
Insertion in Assets/Scripts/Combat/Runes/Effects/CountTagsImmidiateEffect.cs at line 12 [2.865]
[2.1129]
[2.1129]
```
        Debug.Log("CountTagsImmidiateEffect: Effect");
```

Replacement in Assets/Scripts/Combat/Runes/Effects/CountTagsImmidiateEffect.cs at line 24 [2.865]

B:BD[2.1581] → [2.1581:1673]

        context.EffectSystem.AppalyTagsEffect(tags, context.EffectLocation, AreaOfEffect);

[2.1581]

[2.1673]

        context.EffectSystem.ApplyTagsEffect(tags, context.EffectLocation, AreaOfEffect);

Insertion in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 15 [12.7015]
[2.4697]
[16.1612]
```
        Debug.Log("CountTagsEffect: Apply");
```

Replacement in Assets/Scripts/Combat/Runes/Effects/CountTagsEffect.cs at line 29 [12.7015]

B:BD[2.4769] → [2.4769:4869]

        context.EffectSystem.AppalyTagsEffect(tags, context.EffectLocation, context.AreaOfEffect);

[2.4769]

[12.7752]

        context.EffectSystem.ApplyTagsEffect(tags, context.EffectLocation, context.AreaOfEffect);

Replacement in Assets/Scripts/Combat/Runes/Effects/ApplyTagsEffect.cs at line 16 [16.295]

B:BD[16.640] → [15.1358:1441]

        context.TagSystem.ApplyTags(targets, context.CurrentTags.AsEnumerable());

[16.640]

[2.5018]

        context.TagSystem?.ApplyTags(targets, context.CurrentTags.AsEnumerable());

Replacement in Assets/Scripts/Combat/Runes/Effects/ApplyTagsEffect.cs at line 19 [16.295]

B:BD[2.5063] → [2.5063:5178]

        context.EffectSystem.AppalyTagsEffect(context.CurrentTags, context.EffectLocation, context.AreaOfEffect);

[2.5063]

[16.724]

        context.EffectSystem.ApplyTagsEffect(context.CurrentTags, context.EffectLocation, context.AreaOfEffect);