Skip to content

feat(character): delete attached entities on /rc command #51

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
Local9 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(character): delete attached entities on /rc command #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca616fb
feat(character): delete attached entities on `/rc` command
Local9 Jan 7, 2023
42e1173
tweak(rc): tweak some logic around `/rc` command
Local9 Jan 7, 2023
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
40 changes: 23 additions & 17 deletions VORP-Character/vorpcharacter_cl/Script/LoadPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,34 +40,40 @@ public LoadPlayer()
}), false);
#endif

API.RegisterCommand("rc", new Action<int, List<object>, string>((source, args, raw) =>
API.RegisterCommand("rc", new Action<int, List<object>, string>(async (source, args, raw) =>
{
bool isDead = API.IsPlayerDead(API.PlayerId());
if (isDead) return; // TODO: Add notification

int pHealth = Utilities.GetAttributeCoreValue(API.PlayerPedId(), eAttributeCore.Health);
int pStamina = Utilities.GetAttributeCoreValue(API.PlayerPedId(), eAttributeCore.Stamina);
// We only need to grab this player ped ID once, we shouldn't wait CPU cycles
int playerPedId = Cache.PlayerPedId;

if (isDead) return; // need notification
int pHealth = Utilities.GetAttributeCoreValue(playerPedId, eAttributeCore.Health);
int pStamina = Utilities.GetAttributeCoreValue(playerPedId, eAttributeCore.Stamina);

bool isCuffed = Utilities.IsPedCuffed(Cache.PlayerPedId);
bool isHogtied = Utilities.IsPedHogtied(Cache.PlayerPedId);
bool isCuffed = Utilities.IsPedCuffed(playerPedId);
bool isHogtied = Utilities.IsPedHogtied(playerPedId);

if (isCuffed || isHogtied) return; // need notification

if (args.Count == 0)
while (API.IsEntityAttached(playerPedId))
{
ReloadCharacterSkin(string.Empty);

Utilities.SetAttributeCoreValue(API.PlayerPedId(), eAttributeCore.Health, pHealth);
Utilities.SetAttributeCoreValue(API.PlayerPedId(), eAttributeCore.Stamina, pStamina);

return;
await BaseScript.Delay(0);
int entity = API.GetEntityAttachedTo(playerPedId);
if (API.DoesEntityExist(entity))
API.DeleteEntity(ref entity);
}

ReloadCharacterSkin($"{args[0]}");

Utilities.SetAttributeCoreValue(API.PlayerPedId(), eAttributeCore.Health, pHealth);
Utilities.SetAttributeCoreValue(API.PlayerPedId(), eAttributeCore.Stamina, pStamina);
if (args.Count == 0)
ReloadCharacterSkin(string.Empty);
else
ReloadCharacterSkin($"{args[0]}");

// update Player Ped ID as it changes due to the model being reloaded
playerPedId = Cache.PlayerPedId;

Utilities.SetAttributeCoreValue(playerPedId, eAttributeCore.Health, pHealth);
Utilities.SetAttributeCoreValue(playerPedId, eAttributeCore.Stamina, pStamina);


}), false);
Expand Down