Skip to content

Refactor Appearance, added documentation, rebuild migration #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tacbyte wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor Appearance, added documentation, rebuild migration #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Characters.Client/Characters.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Models\Appearance.cs" />
<Compile Include="Models\Character.cs" />
<Compile Include="Models\Apparel.cs" />
<Compile Include="Models\CharacterFacialTrait.cs" />
<Compile Include="Models\CharacterHeritage.cs" />
<Compile Include="Models\CharacterSession.cs" />
<Compile Include="Models\FaceShape.cs" />
<Compile Include="Models\Heritage.cs" />
<Compile Include="Models\CharacterStyle.cs" />
<Compile Include="Models\CharacterTrait.cs" />
<Compile Include="Overlays\CharacterOverlay.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="CharactersService.cs" />
Expand Down
18 changes: 16 additions & 2 deletions Characters.Client/CharactersService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private async void OnCreate(object sender, CreateOverlayEventArgs e)
{
if (string.IsNullOrWhiteSpace(e.Character.Middlename)) e.Character.Middlename = null;

e.Character.WalkingStyle = "move_m@drunk@verydrunk";
e.Character.WalkingStyle = (e.Character.Gender == 0 ? "move_m@generic" : "move_f@generic");
e.Character.Model = ((uint)(e.Character.Gender == 0 ? PedHash.FreemodeMale01 : PedHash.FreemodeFemale01)).ToString();

// Send new character
Expand Down Expand Up @@ -238,8 +238,22 @@ private void SaveCharacter()
{
if (!this.isPlaying) return;

this.activeCharacter.Position = Game.Player.Character.Position.ToVector3().ToPosition();
var player = Game.PlayerPed;

this.activeCharacter.Position = player.Position.ToVector3().ToPosition();
this.activeCharacter.Model = ((uint)player.Model.Hash).ToString();

this.Rpc.Event(CharacterEvents.SaveCharacter).Trigger(this.activeCharacter);

this.Rpc.Event(CharacterEvents.SaveStyle).Trigger(this.activeCharacter.Id, CharacterStyle.ConvertStyle(player.Style, this.activeCharacter.Id));

// FreeMode Models only
if (!(this.activeCharacter.ModelHash == PedHash.FreemodeMale01 ||
this.activeCharacter.ModelHash == PedHash.FreemodeFemale01)) return;

this.Rpc.Event(CharacterEvents.SaveFacialTrait).Trigger(this.activeCharacter.Id, CharacterFacialTrait.ConvertFacialTrait(player.Handle));
this.Rpc.Event(CharacterEvents.SaveHeritage).Trigger(this.activeCharacter.Id, CharacterHeritage.ConvertHeritage(player.GetHeadBlendData(), this.activeCharacter.Created));
this.Rpc.Event(CharacterEvents.SaveTrait).Trigger(this.activeCharacter.Id, CharacterTrait.ConvertTrait(player));
}

private void SavePosition()
Expand Down
35 changes: 0 additions & 35 deletions Characters.Client/Models/Apparel.cs
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions Characters.Client/Models/Appearance.cs
View file
Open in desktop

This file was deleted.

Loading