Skip to content

Commit 300b449

Browse files
revert spell spellweaving
1 parent a0ad0eb commit 300b449

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/ClassicUO.Client/Dust765/External/OnCastingGump.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ public void Start(uint _spell_id, uint _re = 0)
5454
{
5555
_startTime = Time.Ticks;
5656
uint circle;
57-
System.TimeSpan spellTime;
5857

5958
if (!ProfileManager.CurrentProfile.OnCastingGump_hidden)
60-
{
59+
{s
6160
IsVisible = true;
6261
}
6362

@@ -69,13 +68,12 @@ public void Start(uint _spell_id, uint _re = 0)
6968
if (World.Player.IsBuffIconExists(BuffIconType.Protection))
7069
{
7170
protection_delay = 1;
72-
if (circle != 9)
71+
if (circle < 9)
7372
{
74-
protection_delay = protection_delay + 2;
73+
protection_delay = protection_delay ;
7574
} else
7675
{
77-
protection_delay = protection_delay + 5;
78-
circle = circle + 2;
76+
protection_delay = protection_delay + 4;
7977
}
8078
}
8179
_endTime = _startTime + 400 + (circle + protection_delay) * 250 + _re; // (0.5+ 0.25 * circle) * 1000

src/ClassicUO.Client/Dust765/Shared/SpellManager.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public enum SpellCircle
3737
Sixth,
3838
Seventh,
3939
Eighth,
40-
Nine
40+
Ninth
4141
}
4242

4343
public enum SpellAction : ushort
@@ -268,6 +268,9 @@ public static SpellCircle GetCircle(SpellAction spell)
268268
case SpellAction.DryadAllure:
269269
case SpellAction.EtherealVoyage:
270270
case SpellAction.WordofDeath:
271+
case SpellAction.Wildfire:
272+
case SpellAction.EssenceofWind:
273+
271274
return SpellCircle.Third;
272275

273276
case SpellAction.ArchCure:
@@ -288,6 +291,8 @@ public static SpellCircle GetCircle(SpellAction spell)
288291
case SpellAction.PoisonStrike:
289292
case SpellAction.Wither:
290293
case SpellAction.MindRot:
294+
case SpellAction.GiftofLife:
295+
case SpellAction.AttuneWeapon:
291296
return SpellCircle.Fourth;
292297

293298
case SpellAction.BladeSpirits:
@@ -336,11 +341,7 @@ public static SpellCircle GetCircle(SpellAction spell)
336341
case SpellAction.WaterElemental:
337342
return SpellCircle.Eighth;
338343
case SpellAction.GiftofRenewal:
339-
case SpellAction.AttuneWeapon:
340-
case SpellAction.GiftofLife:
341-
case SpellAction.Wildfire:
342-
case SpellAction.EssenceofWind:
343-
return SpellCircle.Nine;
344+
return SpellCircle.Ninth;
344345
}
345346
throw new InvalidOperationException();
346347
}

0 commit comments

Comments
 (0)