2025/12/03 Update

Finished Hidden Talent.
Tweaked Factotum abilities to hopefully not run out of uses.
Tweaked Twinfiends skill function.
Hopefully fixed the Factotum's Inspiration not generating issues.
Hopefullly fixed Double Chakra bind.
Hopefully fixed Totemist's Double Totem Bind.
Hopefully fixed Girallon Arms.
Fixed Kuthrik Claws not granting Weapon Finesse.
Added missing medium centaur hoof slam uti.
Added new tentacle slam creature weapon (works the same, looks better).
Updated Spell Effect NUI to ignore system spells (@Rakiov).
Fixed typo in Guided Strike.
This commit is contained in:
Jaysyn904
2025-12-03 15:33:47 -05:00
parent b920b58fe0
commit 3b6c74985e
89 changed files with 39939 additions and 36404 deletions

View File

@@ -11,8 +11,8 @@ void TriggerInspiration(object oPC, int nCombat)
// We just entered combat
if (nCurrent == TRUE && nCombat == FALSE)
SetInspiration(oPC);
/*else if (nCurrent == FALSE && nCombat == TRUE) // Just left combat
ClearInspiration(oPC);*/
else if (nCurrent == FALSE && nCombat == TRUE) // Just left combat
ClearInspiration(oPC);
DelayCommand(0.25, TriggerInspiration(oPC, nCurrent));
}

View File

@@ -107,6 +107,13 @@ int UpdateBindsAndCheckRefresh(int nuiToken)
return TRUE;
}
string GetSpellNameFromEffect(effect selectedEffect)
{
int spellId = GetEffectSpellId(selectedEffect);
int featId = StringToInt(Get2DACache("spells", "FeatID", spellId));
return GetSpellName(spellId, 0, featId);
}
json CreateEffectEntry(effect selectedEffect)
{
json jRow = JsonArray();
@@ -140,7 +147,9 @@ json CreateEffectEntry(effect selectedEffect)
if (GetIsEffectValid(selectedEffect))
{
spellId = GetEffectSpellId(selectedEffect);
spellName = GetSpellName(spellId);
spellName = GetSpellNameFromEffect(selectedEffect);
if (spellName == "Bad Strref")
spellName = ("SpellID: " + IntToString(spellId));
json spellList = GetLocalJson(OBJECT_SELF, NUI_DURATION_TRACKED_SPELLS);
if (spellList == JsonNull())
spellList = JsonObject();
@@ -281,7 +290,7 @@ void main()
// Set the binds to their default values
NuiSetBind(OBJECT_SELF, nToken, "geometry", geometry);
NuiSetBind(OBJECT_SELF, nToken, "resizable", JsonBool(TRUE));
NuiSetBind(OBJECT_SELF, nToken, "resizable", JsonBool(FALSE));
NuiSetBind(OBJECT_SELF, nToken, "closable", JsonBool(TRUE));
NuiSetBind(OBJECT_SELF, nToken, "transparent", JsonBool(FALSE));
NuiSetBind(OBJECT_SELF, nToken, "border", JsonBool(TRUE));