Changed ability counts to NUM_ABILITIES pt.2

IngoHHacks · IngoHHacks · commit f4326308e0a5 · 2021-12-15T00:04:14.000+01:00
diff --git a/Models/New/NewAbility.cs b/Models/New/NewAbility.cs
@@ -16,7 +16,7 @@ public class NewAbility
 
 		public NewAbility(AbilityInfo info, Type abilityBehaviour, Texture tex, AbilityIdentifier id = null)
 		{
-			ability = (Ability) 100 + abilities.Count;
+			ability = (Ability) Ability.NUM_ABILITIES + 1 + abilities.Count;
 			info.ability = ability;
 			this.info = info;
 			this.abilityBehaviour = abilityBehaviour;
diff --git a/Models/New/NewSpecialAbility.cs b/Models/New/NewSpecialAbility.cs
@@ -19,7 +19,7 @@ public NewSpecialAbility(
 			StatIconInfo statIconInfo = null
 		)
 		{
-			specialTriggeredAbility = (SpecialTriggeredAbility)26 + specialAbilities.Count;
+			specialTriggeredAbility = (SpecialTriggeredAbility.NUM_ABILITIES + 1) + specialAbilities.Count;
 			var logNameOrIdNumber = specialTriggeredAbility.ToString();
 			if (statIconInfo)
 			{

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class NewAbility`
`16`	`16`
`17`	`17`	`public NewAbility(AbilityInfo info, Type abilityBehaviour, Texture tex, AbilityIdentifier id = null)`
`18`	`18`	`{`
`19`		`- ability = (Ability) 100 + abilities.Count;`
	`19`	`+ ability = (Ability) Ability.NUM_ABILITIES + 1 + abilities.Count;`
`20`	`20`	`info.ability = ability;`
`21`	`21`	`this.info = info;`
`22`	`22`	`this.abilityBehaviour = abilityBehaviour;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public NewSpecialAbility(`
`19`	`19`	`StatIconInfo statIconInfo = null`
`20`	`20`	`)`
`21`	`21`	`{`
`22`		`- specialTriggeredAbility = (SpecialTriggeredAbility)26 + specialAbilities.Count;`
	`22`	`+ specialTriggeredAbility = (SpecialTriggeredAbility.NUM_ABILITIES + 1) + specialAbilities.Count;`
`23`	`23`	`var logNameOrIdNumber = specialTriggeredAbility.ToString();`
`24`	`24`	`if (statIconInfo)`
`25`	`25`	`{`