Skip to content

Commit 41e8ec4

Browse files
CGarrison89CGarrison89
committed
Conflicts: ESPSharp/ESPSharp.csproj
2 parents 1f8dbbb + 02d80a1 commit 41e8ec4

23 files changed

Lines changed: 1727 additions & 3 deletions

‎ESPSharp.sln‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,4 @@ Global
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
28-
GlobalSection(Performance) = preSolution
29-
HasPerformanceSessions = true
30-
EndGlobalSection
3128
EndGlobal

‎ESPSharp/ESPSharp.csproj‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
<Compile Include="Enums\CreatureSoundType.cs" />
109109
<Compile Include="Enums\CreatureType.cs" />
110110
<Compile Include="Enums\CriticalStage.cs" />
111+
<Compile Include="Enums\DialogType.cs" />
111112
<Compile Include="Enums\EffectType.cs" />
112113
<Compile Include="Enums\EmbeddedWeaponActorValue.cs" />
113114
<Compile Include="Enums\EnchantType.cs" />
@@ -125,6 +126,7 @@
125126
<Compile Include="Enums\Flags\DecalDataFlags.cs" />
126127
<Compile Include="Enums\Flags\DestructableFlags.cs" />
127128
<Compile Include="Enums\Flags\DestructionStageFlags.cs" />
129+
<Compile Include="Enums\Flags\DialogFlags.cs" />
128130
<Compile Include="Enums\Flags\DoorFlags.cs" />
129131
<Compile Include="Enums\Flags\EnchantFlags.cs" />
130132
<Compile Include="Enums\Flags\GrassFlags.cs" />
@@ -140,6 +142,9 @@
140142
<Compile Include="Enums\Flags\NPCFlags.cs" />
141143
<Compile Include="Enums\Flags\PlaceableWaterFlags.cs" />
142144
<Compile Include="Enums\Flags\ProjectileFlags.cs" />
145+
<Compile Include="Enums\Flags\QuestFlags.cs" />
146+
<Compile Include="Enums\Flags\QuestStageFlags.cs" />
147+
<Compile Include="Enums\Flags\QuestTargetFlags.cs" />
143148
<Compile Include="Enums\Flags\RaceFlags.cs" />
144149
<Compile Include="Enums\Flags\RegionDataFlags.cs" />
145150
<Compile Include="Enums\Flags\RegionObjectFlags.cs" />
@@ -289,6 +294,11 @@
289294
<DesignTime>True</DesignTime>
290295
<DependentUpon>Creature.tt</DependentUpon>
291296
</Compile>
297+
<Compile Include="Records\GeneratedCode\DialogTopic.cs">
298+
<AutoGen>True</AutoGen>
299+
<DesignTime>True</DesignTime>
300+
<DependentUpon>DialogTopic.tt</DependentUpon>
301+
</Compile>
292302
<Compile Include="Records\GeneratedCode\Door.cs">
293303
<AutoGen>True</AutoGen>
294304
<DesignTime>True</DesignTime>
@@ -496,11 +506,17 @@
496506
<Compile Include="RecordView.cs" />
497507
<Compile Include="Subrecord.cs" />
498508
<Compile Include="SubrecordCollection.cs" />
509+
<Compile Include="SubrecordCollections\GeneratedCode\AddedQuest.cs">
510+
<AutoGen>True</AutoGen>
511+
<DesignTime>True</DesignTime>
512+
<DependentUpon>AddedQuest.tt</DependentUpon>
513+
</Compile>
499514
<Compile Include="SubrecordCollections\GeneratedCode\BodyModel.cs">
500515
<AutoGen>True</AutoGen>
501516
<DesignTime>True</DesignTime>
502517
<DependentUpon>BodyModel.tt</DependentUpon>
503518
</Compile>
519+
<<<<<<< HEAD
504520
<Compile Include="SubrecordCollections\GeneratedCode\RegionArea.cs">
505521
<AutoGen>True</AutoGen>
506522
<DesignTime>True</DesignTime>
@@ -510,6 +526,27 @@
510526
<AutoGen>True</AutoGen>
511527
<DesignTime>True</DesignTime>
512528
<DependentUpon>RegionDataEntry.tt</DependentUpon>
529+
=======
530+
<Compile Include="SubrecordCollections\GeneratedCode\QuestLogEntry.cs">
531+
<AutoGen>True</AutoGen>
532+
<DesignTime>True</DesignTime>
533+
<DependentUpon>QuestLogEntry.tt</DependentUpon>
534+
</Compile>
535+
<Compile Include="SubrecordCollections\GeneratedCode\QuestObjective.cs">
536+
<AutoGen>True</AutoGen>
537+
<DesignTime>True</DesignTime>
538+
<DependentUpon>QuestObjective.tt</DependentUpon>
539+
</Compile>
540+
<Compile Include="SubrecordCollections\GeneratedCode\QuestTarget.cs">
541+
<AutoGen>True</AutoGen>
542+
<DesignTime>True</DesignTime>
543+
<DependentUpon>QuestTarget.tt</DependentUpon>
544+
</Compile>
545+
<Compile Include="SubrecordCollections\GeneratedCode\SharedInfo.cs">
546+
<AutoGen>True</AutoGen>
547+
<DesignTime>True</DesignTime>
548+
<DependentUpon>SharedInfo.tt</DependentUpon>
549+
>>>>>>> 02d80a1718f2288c77352352b478e5cac40e01b4
513550
</Compile>
514551
<Compile Include="Subrecords\GeneratedCode\ClimateTiming.cs">
515552
<AutoGen>True</AutoGen>
@@ -660,6 +697,10 @@
660697
<Generator>TextTemplatingFileGenerator</Generator>
661698
<LastGenOutput>Creature.cs</LastGenOutput>
662699
</None>
700+
<None Include="Records\GeneratedCode\DialogTopic.tt">
701+
<Generator>TextTemplatingFileGenerator</Generator>
702+
<LastGenOutput>DialogTopic.cs</LastGenOutput>
703+
</None>
663704
<None Include="Records\GeneratedCode\Door.tt">
664705
<Generator>TextTemplatingFileGenerator</Generator>
665706
<LastGenOutput>Door.cs</LastGenOutput>
@@ -784,13 +825,35 @@
784825
<Generator>TextTemplatingFileGenerator</Generator>
785826
<LastGenOutput>Weather.cs</LastGenOutput>
786827
</None>
828+
<<<<<<< HEAD
787829
<None Include="SubrecordCollections\GeneratedCode\RegionArea.tt">
788830
<Generator>TextTemplatingFileGenerator</Generator>
789831
<LastGenOutput>RegionArea.cs</LastGenOutput>
790832
</None>
791833
<None Include="SubrecordCollections\GeneratedCode\RegionDataEntry.tt">
792834
<Generator>TextTemplatingFileGenerator</Generator>
793835
<LastGenOutput>RegionDataEntry.cs</LastGenOutput>
836+
=======
837+
<None Include="SubrecordCollections\GeneratedCode\AddedQuest.tt">
838+
<Generator>TextTemplatingFileGenerator</Generator>
839+
<LastGenOutput>AddedQuest.cs</LastGenOutput>
840+
</None>
841+
<None Include="SubrecordCollections\GeneratedCode\QuestLogEntry.tt">
842+
<Generator>TextTemplatingFileGenerator</Generator>
843+
<LastGenOutput>QuestLogEntry.cs</LastGenOutput>
844+
</None>
845+
<None Include="SubrecordCollections\GeneratedCode\QuestObjective.tt">
846+
<Generator>TextTemplatingFileGenerator</Generator>
847+
<LastGenOutput>QuestObjective.cs</LastGenOutput>
848+
</None>
849+
<None Include="SubrecordCollections\GeneratedCode\QuestTarget.tt">
850+
<Generator>TextTemplatingFileGenerator</Generator>
851+
<LastGenOutput>QuestTarget.cs</LastGenOutput>
852+
</None>
853+
<None Include="SubrecordCollections\GeneratedCode\SharedInfo.tt">
854+
<Generator>TextTemplatingFileGenerator</Generator>
855+
<LastGenOutput>SharedInfo.cs</LastGenOutput>
856+
>>>>>>> 02d80a1718f2288c77352352b478e5cac40e01b4
794857
</None>
795858
<None Include="Subrecords\GeneratedCode\ClimateTiming.tt">
796859
<Generator>TextTemplatingFileGenerator</Generator>
@@ -962,6 +1025,11 @@
9621025
<DesignTime>True</DesignTime>
9631026
<DependentUpon>DestructionStageData.tt</DependentUpon>
9641027
</Compile>
1028+
<Compile Include="Subrecords\GeneratedCode\DialogTopicData.cs">
1029+
<AutoGen>True</AutoGen>
1030+
<DesignTime>True</DesignTime>
1031+
<DependentUpon>DialogTopicData.tt</DependentUpon>
1032+
</Compile>
9651033
<Compile Include="Subrecords\GeneratedCode\EffectData.cs">
9661034
<AutoGen>True</AutoGen>
9671035
<DesignTime>True</DesignTime>
@@ -1072,6 +1140,11 @@
10721140
<DesignTime>True</DesignTime>
10731141
<DependentUpon>ProjectileData.tt</DependentUpon>
10741142
</Compile>
1143+
<Compile Include="Subrecords\GeneratedCode\QuestTargetData.cs">
1144+
<AutoGen>True</AutoGen>
1145+
<DesignTime>True</DesignTime>
1146+
<DependentUpon>QuestTargetData.tt</DependentUpon>
1147+
</Compile>
10751148
<Compile Include="Subrecords\GeneratedCode\RaceData.cs">
10761149
<AutoGen>True</AutoGen>
10771150
<DesignTime>True</DesignTime>
@@ -1257,6 +1330,10 @@
12571330
<Generator>TextTemplatingFileGenerator</Generator>
12581331
<LastGenOutput>CreatureData.cs</LastGenOutput>
12591332
</None>
1333+
<None Include="Subrecords\GeneratedCode\DialogTopicData.tt">
1334+
<Generator>TextTemplatingFileGenerator</Generator>
1335+
<LastGenOutput>DialogTopicData.cs</LastGenOutput>
1336+
</None>
12601337
<None Include="Subrecords\GeneratedCode\EnvironmentalColors.tt">
12611338
<Generator>TextTemplatingFileGenerator</Generator>
12621339
<LastGenOutput>EnvironmentalColors.cs</LastGenOutput>
@@ -1313,9 +1390,15 @@
13131390
<Generator>TextTemplatingFileGenerator</Generator>
13141391
<LastGenOutput>ProjectileData.cs</LastGenOutput>
13151392
</None>
1393+
<<<<<<< HEAD
13161394
<None Include="Subrecords\GeneratedCode\RegionDataHeader.tt">
13171395
<Generator>TextTemplatingFileGenerator</Generator>
13181396
<LastGenOutput>RegionDataHeader.cs</LastGenOutput>
1397+
=======
1398+
<None Include="Subrecords\GeneratedCode\QuestTargetData.tt">
1399+
<Generator>TextTemplatingFileGenerator</Generator>
1400+
<LastGenOutput>QuestTargetData.cs</LastGenOutput>
1401+
>>>>>>> 02d80a1718f2288c77352352b478e5cac40e01b4
13191402
</None>
13201403
<None Include="Subrecords\GeneratedCode\TerminalData.tt">
13211404
<Generator>TextTemplatingFileGenerator</Generator>

‎ESPSharp/Enums/DialogType.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace ESPSharp.Enums
8+
{
9+
public enum DialogType: byte
10+
{
11+
Topic,
12+
Conversation,
13+
Combat,
14+
Persuasion,
15+
Detection,
16+
Service,
17+
Miscellaneous,
18+
Radio
19+
}
20+
}

‎ESPSharp/Enums/Flags/DialogFlags.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace ESPSharp.Enums.Flags
8+
{
9+
public enum DialogFlags : byte
10+
{
11+
Rumors = 0x01,
12+
TopLevel = 0x02
13+
}
14+
}

‎ESPSharp/Enums/Flags/QuestFlags.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace ESPSharp.Enums.Flags
8+
{
9+
[Flags]
10+
public enum QuestFlags : byte
11+
{
12+
StartGameEnabled = 0x01,
13+
AllowRepeatedConversationTopics = 0x04,
14+
AllowRepeatedStages = 0x08
15+
}
16+
}

‎ESPSharp/Enums/Flags/QuestStageFlags.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace ESPSharp.Enums.Flags
8+
{
9+
[Flags]
10+
public enum QuestStageFlags : byte
11+
{
12+
CompleteQuest = 0x01,
13+
FailQuest = 0x02
14+
}
15+
}

‎ESPSharp/Enums/Flags/QuestTargetFlags.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace ESPSharp.Enums.Flags
8+
{
9+
[Flags]
10+
public enum QuestTargetFlags : byte
11+
{
12+
CompassMarkerIgnoresLocks = 0x01
13+
}
14+
}

0 commit comments

Comments
 (0)