Skip to content

Commit

Permalink
collision fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@EliphasNUIT
EliphasNUIT committed Nov 23, 2024
1 parent 512e234 commit 70b9d4b
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion GW2EIBuilders/GW2EIBuilders.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion GW2EIDPSReport/GW2EIDPSReport.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion GW2EIDiscord/GW2EIDiscord.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<DefineConstants>DEBUG</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down
4 changes: 2 additions & 2 deletions GW2EIEvtcParser/EIData/DamageModifiers/DamageModifiersContainer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ internal DamageModifiersContainer(CombatData combatData, FightLogic.ParseModeEnu
{
var e = x.GetEnumerator(); e.MoveNext();
var first = e.Current;
if (e.MoveNext()) { throw new InvalidDataException("Same name present multiple times in damage mods - " + first.ID); }
if (e.MoveNext()) { throw new InvalidDataException("Same id present multiple times in damage mods - " + first.ID); }
return first;
});
//
Expand Down Expand Up @@ -141,7 +141,7 @@ internal DamageModifiersContainer(CombatData combatData, FightLogic.ParseModeEnu
{
var e = x.GetEnumerator(); e.MoveNext();
var first = e.Current;
if (e.MoveNext()) { throw new InvalidDataException("Same name present multiple times in damage mods - " + first.ID); }
if (e.MoveNext()) { throw new InvalidDataException("Same id present multiple times in damage mods - " + first.ID); }
return first;
});
}
Expand Down
2 changes: 1 addition & 1 deletion GW2EIEvtcParser/EIData/ProfHelpers/Guardian/GuardianHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ internal static class GuardianHelper
.WithBuilds(GW2Builds.StartOfLife, GW2Builds.May2021Balance),
new BuffOnActorDamageModifier(Mod_InspiredVirtue, NumberOfBoons, "Inspired Virtue", "1% per boon", DamageSource.NoPets, 1.0, DamageType.Strike, DamageType.All, Source.Guardian, ByStack, BuffImages.InspiredVirtue, DamageModifierMode.All)
.WithBuilds(GW2Builds.May2021Balance),
new BuffOnActorDamageModifier(Mod_InspiredVirtue, InspiringVirtue, "Inspiring Virtue", "10% (6s) after activating a virtue ", DamageSource.NoPets, 10.0, DamageType.Strike, DamageType.All, Source.Guardian, ByPresence, BuffImages.VirtuousSolace, DamageModifierMode.All)
new BuffOnActorDamageModifier(Mod_InspiringVirtue, InspiringVirtue, "Inspiring Virtue", "10% (6s) after activating a virtue ", DamageSource.NoPets, 10.0, DamageType.Strike, DamageType.All, Source.Guardian, ByPresence, BuffImages.VirtuousSolace, DamageModifierMode.All)
.WithBuilds(GW2Builds.February2020Balance),
];

Expand Down
2 changes: 1 addition & 1 deletion GW2EIEvtcParser/GW2EIEvtcParser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down
3 changes: 2 additions & 1 deletion GW2EIEvtcParser/ParserHelpers/DamageModifierIDs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public static class DamageModifierIDs
public const int Mod_FireRune = 42;
public const int Mod_RageRune = 43;
public const int Mod_RelicOfTheThief = 44;
public const int Mod_RelicOfFireworks = 44;
public const int Mod_RelicOfNourys = 45;
public const int Mod_RelicOfTheBrawler = 46;
public const int Mod_RelicOfTheDeadeye = 47;
Expand Down Expand Up @@ -323,5 +322,7 @@ public static class DamageModifierIDs
public const int Mod_FierySurge = 309;
public const int Mod_AugmentedPower = 310;
public const int Mod_StrengthenedBondGuldhem = 311;
public const int Mod_RelicOfFireworks = 312;
public const int Mod_InspiringVirtue = 313;
}

2 changes: 1 addition & 1 deletion GW2EIEvtcParser/Tracing.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#if TRACE
#if TRACING
#define EI_TRACING
#define EI_TRACING_STATS
#endif
Expand Down
2 changes: 1 addition & 1 deletion GW2EIGW2API/GW2EIGW2API.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion GW2EIParser.tst/GW2EIParser.tst.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DebugType>none</DebugType>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
<DebugSymbols>false</DebugSymbols>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions GW2EIParser/GW2EIParser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>DEBUG</DefineConstants>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>DEBUG</DefineConstants>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand All @@ -57,7 +57,7 @@
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
<PlatformTarget>AnyCPU</PlatformTarget>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
Expand Down
2 changes: 1 addition & 1 deletion GW2EIParserCLI/GW2EIParserCLI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion GW2EIParserCommons/GW2EIParserCommons.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion GW2EIWingman/GW2EIWingman.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Trace|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACING</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoRewards|AnyCPU'">
Expand Down

0 comments on commit 70b9d4b

Please sign in to comment.