mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-06-10 22:44:36 +02:00
Merge branch 'ai-open' into develop
# Conflicts: # FFXIVClassic Lobby Server/Database.cs # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/actors/chara/player/Inventory.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/dataobjects/Session.cs # FFXIVClassic World Server/Server.cs
This commit is contained in:
Filip Maj
commit
1e4a1cf263
402 changed files with 20078 additions and 1348 deletions
|
|
@ -10,9 +10,10 @@
|
|||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>FFXIVClassic_Map_Server</RootNamespace>
|
||||
<AssemblyName>FFXIVClassic Map Server</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<NuGetPackageImportStamp>1d22ec4a</NuGetPackageImportStamp>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
|
|
@ -24,6 +25,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
|
|
@ -38,15 +40,33 @@
|
|||
<PropertyGroup>
|
||||
<RunPostBuildEvent>Always</RunPostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\x64\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cyotek.Collections.Generic.CircularBuffer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=58daa28b0b2de221, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Cyotek.CircularBuffer.1.0.0.0\lib\net20\Cyotek.Collections.Generic.CircularBuffer.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Dapper, Version=1.40.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapper.1.42\lib\net45\Dapper.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="FFXIVClassic.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\FFXIVClassic Common Class Lib\bin\Debug\FFXIVClassic.Common.dll</HintPath>
|
||||
|
|
@ -58,16 +78,21 @@
|
|||
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.4.3.5\lib\net45\NLog.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="SharpNav, Version=1.0.0.1, Culture=neutral, PublicKeyToken=b467138d8cacd85b, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>navmesh\SharpNav.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -79,17 +104,49 @@
|
|||
<Compile Include="actors\area\PrivateAreaContent.cs" />
|
||||
<Compile Include="actors\area\SpawnLocation.cs" />
|
||||
<Compile Include="actors\area\Zone.cs" />
|
||||
<Compile Include="actors\chara\ai\BattleTrait.cs" />
|
||||
<Compile Include="actors\chara\ai\controllers\AllyController.cs" />
|
||||
<Compile Include="actors\chara\ai\helpers\ActionQueue.cs" />
|
||||
<Compile Include="actors\chara\ai\AIContainer.cs" />
|
||||
<Compile Include="actors\chara\ai\controllers\Controller.cs" />
|
||||
<Compile Include="actors\chara\ai\controllers\BattleNpcController.cs" />
|
||||
<Compile Include="actors\chara\ai\controllers\PetController.cs" />
|
||||
<Compile Include="actors\chara\ai\controllers\PlayerController.cs" />
|
||||
<Compile Include="actors\chara\ai\HateContainer.cs" />
|
||||
<Compile Include="actors\chara\ai\helpers\PathFind.cs" />
|
||||
<Compile Include="actors\chara\ai\BattleCommand.cs" />
|
||||
<Compile Include="actors\chara\ai\state\AbilityState.cs" />
|
||||
<Compile Include="actors\chara\ai\state\AttackState.cs" />
|
||||
<Compile Include="actors\chara\ai\state\DeathState.cs" />
|
||||
<Compile Include="actors\chara\ai\state\DespawnState.cs" />
|
||||
<Compile Include="actors\chara\ai\state\InactiveState.cs" />
|
||||
<Compile Include="actors\chara\ai\state\ItemState.cs" />
|
||||
<Compile Include="actors\chara\ai\state\MagicState.cs" />
|
||||
<Compile Include="actors\chara\ai\state\State.cs" />
|
||||
<Compile Include="actors\chara\ai\state\WeaponSkillState.cs" />
|
||||
<Compile Include="actors\chara\ai\StatusEffect.cs" />
|
||||
<Compile Include="actors\chara\ai\StatusEffectContainer.cs" />
|
||||
<Compile Include="actors\chara\ai\helpers\TargetFind.cs" />
|
||||
<Compile Include="actors\chara\ai\utils\AttackUtils.cs" />
|
||||
<Compile Include="actors\chara\ai\utils\BattleUtils.cs" />
|
||||
<Compile Include="actors\chara\Modifier.cs" />
|
||||
<Compile Include="actors\chara\ModifierList.cs" />
|
||||
<Compile Include="actors\chara\npc\ActorClass.cs" />
|
||||
<Compile Include="actors\chara\npc\Ally.cs" />
|
||||
<Compile Include="actors\chara\npc\BattleNpc.cs" />
|
||||
<Compile Include="actors\chara\npc\MobModifier.cs" />
|
||||
<Compile Include="actors\chara\npc\NpcWork.cs" />
|
||||
<Compile Include="actors\chara\AetheryteWork.cs" />
|
||||
<Compile Include="actors\chara\npc\Retainer.cs" />
|
||||
<Compile Include="actors\chara\npc\Pet.cs" />
|
||||
<Compile Include="actors\chara\player\Equipment.cs" />
|
||||
<Compile Include="actors\chara\player\Inventory.cs" />
|
||||
<Compile Include="actors\chara\SubState.cs" />
|
||||
<Compile Include="actors\chara\Work.cs" />
|
||||
<Compile Include="actors\debug\Debug.cs" />
|
||||
<Compile Include="actors\director\Director.cs" />
|
||||
<Compile Include="actors\director\GuildleveDirector.cs" />
|
||||
<Compile Include="actors\director\Work\GuildleveWork.cs" />
|
||||
<Compile Include="actors\director\work\GuildleveWork.cs" />
|
||||
<Compile Include="actors\EventList.cs" />
|
||||
<Compile Include="actors\group\GLContentGroup.cs" />
|
||||
<Compile Include="actors\group\ContentGroup.cs" />
|
||||
|
|
@ -100,11 +157,11 @@
|
|||
<Compile Include="actors\group\MonsterParty.cs" />
|
||||
<Compile Include="actors\group\Party.cs" />
|
||||
<Compile Include="actors\group\Relation.cs" />
|
||||
<Compile Include="actors\group\Work\GroupGlobalSave.cs" />
|
||||
<Compile Include="actors\group\Work\GroupGlobalTemp.cs" />
|
||||
<Compile Include="actors\group\Work\GroupMemberSave.cs" />
|
||||
<Compile Include="actors\group\Work\PartyWork.cs" />
|
||||
<Compile Include="actors\group\Work\RelationWork.cs" />
|
||||
<Compile Include="actors\group\work\GroupGlobalSave.cs" />
|
||||
<Compile Include="actors\group\work\GroupGlobalTemp.cs" />
|
||||
<Compile Include="actors\group\work\GroupMemberSave.cs" />
|
||||
<Compile Include="actors\group\work\PartyWork.cs" />
|
||||
<Compile Include="actors\group\work\RelationWork.cs" />
|
||||
<Compile Include="actors\judge\Judge.cs" />
|
||||
<Compile Include="actors\quest\Quest.cs" />
|
||||
<Compile Include="actors\StaticActors.cs" />
|
||||
|
|
@ -162,10 +219,11 @@
|
|||
<Compile Include="packets\send\actor\ActorDoEmotePacket.cs" />
|
||||
<Compile Include="packets\send\actor\ActorInstantiatePacket.cs" />
|
||||
<Compile Include="packets\send\actor\ActorSpecialGraphicPacket.cs" />
|
||||
<Compile Include="packets\send\actor\battle\BattleAction.cs" />
|
||||
<Compile Include="packets\send\actor\battle\BattleActionX00Packet.cs" />
|
||||
<Compile Include="packets\send\actor\battle\BattleActionX18Packet.cs" />
|
||||
<Compile Include="packets\send\actor\battle\BattleActionX10Packet.cs" />
|
||||
<Compile Include="packets\send\actor\battle\CommandResult.cs" />
|
||||
<Compile Include="packets\send\actor\battle\CommandResultContainer.cs" />
|
||||
<Compile Include="packets\send\actor\battle\CommandResultX00Packet.cs" />
|
||||
<Compile Include="packets\send\actor\battle\CommandResultX18Packet.cs" />
|
||||
<Compile Include="packets\send\actor\battle\CommandResultX10Packet.cs" />
|
||||
<Compile Include="packets\send\actor\DeleteAllActorsPacket.cs" />
|
||||
<Compile Include="packets\send\actor\events\SetEventStatus.cs" />
|
||||
<Compile Include="packets\send\actor\events\SetNoticeEventCondition.cs" />
|
||||
|
|
@ -192,7 +250,7 @@
|
|||
<Compile Include="packets\send\actor\StartCountdownPacket.cs" />
|
||||
<Compile Include="packets\send\actor\_0x132Packet.cs" />
|
||||
<Compile Include="packets\send\actor\SetActorIsZoningPacket.cs" />
|
||||
<Compile Include="packets\send\actor\battle\BattleActionX01Packet.cs" />
|
||||
<Compile Include="packets\send\actor\battle\CommandResultX01Packet.cs" />
|
||||
<Compile Include="packets\send\actor\inventory\EquipmentListX01Packet.cs" />
|
||||
<Compile Include="packets\send\actor\inventory\InventoryBeginChangePacket.cs" />
|
||||
<Compile Include="packets\send\actor\inventory\InventoryEndChangePacket.cs" />
|
||||
|
|
@ -203,7 +261,7 @@
|
|||
<Compile Include="packets\send\actor\inventory\EquipmentListX08Packet.cs" />
|
||||
<Compile Include="packets\send\actor\RemoveActorPacket.cs" />
|
||||
<Compile Include="packets\send\actor\SetActorIconPacket.cs" />
|
||||
<Compile Include="packets\send\actor\SetActorSubStatPacket.cs" />
|
||||
<Compile Include="packets\send\actor\SetActorSubStatePacket.cs" />
|
||||
<Compile Include="packets\send\actor\SetActorStatusPacket.cs" />
|
||||
<Compile Include="packets\send\actor\SetActorBGPropertiesPacket.cs" />
|
||||
<Compile Include="packets\send\actor\_0xFPacket.cs" />
|
||||
|
|
@ -329,6 +387,7 @@
|
|||
<Compile Include="Server.cs" />
|
||||
<Compile Include="utils\ActorPropertyPacketUtil.cs" />
|
||||
<Compile Include="utils\CharacterUtils.cs" />
|
||||
<Compile Include="utils\NavmeshUtils.cs" />
|
||||
<Compile Include="utils\SQLGeneration.cs" />
|
||||
<Compile Include="actors\area\Area.cs" />
|
||||
<Compile Include="WorldManager.cs" />
|
||||
|
|
@ -351,6 +410,9 @@
|
|||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="navmesh\" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue