dungdajhjep/d2go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #70 from CarlPoppa1/friendly-mon-fix

Browse Source 
Amend monster categorisation
This commit is contained in:
Neo-Silver
2026-03-03 19:31:19 +01:00
committed by GitHub
parent a49f6eff4f 1059ee7d3c
commit 6c3b135688
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/data/npc.go
View File

@@ -162,7 +162,7 @@ func (m Monster) IsMerc() bool {
func (m Monster) IsPet() bool {
// Necromancer revive.
if m.States.HasState(state.Revive) {
if m.States.HasState(state.Revive) || m.States.HasState(state.BindDemon) || m.States.HasState(state.BindDemonUnderling) {
return true
}
@@ -171,7 +171,7 @@ func (m Monster) IsPet() bool {
npc.OakSage, npc.DruBear, npc.DruPlaguePoppy, npc.VineCreature,
npc.DruCycleOfLife, npc.ClayGolem, npc.BloodGolem, npc.IronGolem,
npc.FireGolem, npc.NecroSkeleton, npc.NecroMage, npc.Valkyrie, npc.Decoy,
npc.ShadowWarrior, npc.ShadowMaster:
npc.ShadowWarrior, npc.ShadowMaster, npc.Tainted3, npc.WarGoatman, npc.WarDefiler:
return true
}

2
pkg/memory/player.go
View File

@@ -212,7 +212,7 @@ func (gd *GameReader) getSkills(skillListPtr uintptr) map[skill.ID]skill.Points
func (gd *GameReader) GetStates(statsListExPtr uintptr) state.States {
var states state.States
for i := 0; i < 6; i++ {
for i := 0; i < 8; i++ {
offset := i * 4
stateByte := gd.Process.ReadUInt(statsListExPtr+0xAF0+uintptr(offset), Uint32)