Skip to content

Blocked spelleffect (area or field) on ridden chars and other fixes#1237

Merged
cbnolok merged 2 commits intoSphereserver:devfrom
Te-Rha:master
Jul 20, 2024
Merged

Blocked spelleffect (area or field) on ridden chars and other fixes#1237
cbnolok merged 2 commits intoSphereserver:devfrom
Te-Rha:master

Conversation

@DavideRei
Copy link
Copy Markdown
Contributor

@DavideRei DavideRei commented Apr 18, 2024

Blocked spelleffect on ridden chars if the spell has field or area flags.
Fixed duration of hallucination spell.
Fixed wrong layer for potion delay.
Fixed wrong sound id for changing monster sounds schema.
Fixed Attacker_GetHighestThreat: return -1 would make the NPC threat lesser than the ATTACKER_THREAT_TOLDBYMASTER and make CChar::NPC_GetAttackMotivation not work correctly for attacking pets.
Fixed NPC_Act_Follow use combat target even if the npc is not in combat. Maybe related to #1215

…ags.

Fixed duration of hallucination spell.
Fixed wrong layer for potion delay.
Fixed wrong sound id for changing monster sounds schema.
Fixed Attacker_GetHighestThreat: return -1 would make the NPC threat lesser than the ATTACKER_THREAT_TOLDBYMASTER and make CChar::NPC_GetAttackMotivation not work correctly for attacking pets.
Fixed NPC_Act_Follow use combat target even if the npc is not in combat.
@cbnolok cbnolok changed the base branch from master to dev June 26, 2024 16:23
@cbnolok
Copy link
Copy Markdown
Contributor

cbnolok commented Jun 26, 2024

Could you fix the conflicts please? It looks good to be merged

@DavideRei
Copy link
Copy Markdown
Contributor Author

done

@cbnolok cbnolok merged commit c9665c2 into Sphereserver:dev Jul 20, 2024
cbnolok pushed a commit that referenced this pull request Aug 6, 2024
…ags. (#1237)

Fixed duration of hallucination spell.
Fixed wrong layer for potion delay.
Fixed wrong sound id for changing monster sounds schema.
Fixed Attacker_GetHighestThreat: return -1 would make the NPC threat lesser than the ATTACKER_THREAT_TOLDBYMASTER and make CChar::NPC_GetAttackMotivation not work correctly for attacking pets.
Fixed NPC_Act_Follow use combat target even if the npc is not in combat.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants