Skip to content
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

Fix Makeown-ing an enemy of civilization constantly producing vengeful thoughts #1212

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Fix Makeown-ing an enemy of civilization constantly producing vengeful thoughts #1212

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2057829
makeown - fix army controller, enemy status slot and adjust professio…
Crystalwarrior Jun 28, 2024
dcd26bb
Clear enemy-of-civ/group status on makeown-ed units
Crystalwarrior Jun 28, 2024
e41d381
Flip the giants LARGE_PREDATOR caste flag off!
Crystalwarrior Jun 28, 2024
5f57e53
Revert "Flip the giants LARGE_PREDATOR caste flag off!"
Crystalwarrior Jul 2, 2024
f1f4208
Merge branch 'master' into makeown-plus
Crystalwarrior Jul 2, 2024
80502c9
Apply suggestions from code review
Crystalwarrior Jul 2, 2024
f81bcdc
fixUnitEnemyStatus as a module script yeeeeee
Crystalwarrior Jul 2, 2024
b6f50f6
docs
Crystalwarrior Jul 2, 2024
33cc4fc
Implement suggestions
Crystalwarrior Jul 16, 2024
bac03d8
Resolve master merge conflicts
Crystalwarrior Jan 27, 2025
9130166
fix/loyaltycascade no longer necessary to change
Crystalwarrior Jan 27, 2025
698d8a3
fix changelog entry not being correct anymore
Crystalwarrior Jan 27, 2025
16500a4
Check if el is a thing before testing it
Crystalwarrior Jan 29, 2025
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
2 changes: 1 addition & 1 deletion makeown.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ local function fix_histfig(unit)
::continue::
end
-- If you're makeown-ing an enemy of your civilization or group, people will feel vengeful without this
if df.histfig_entity_link_enemyst:is_instance(el) then
if el and df.histfig_entity_link_enemyst:is_instance(el) then
Copy link
Member

@myk002 myk002 Jan 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not fix the problem. el can be a stale reference. the call to entity_link above can delete the memory that el points to.

local eid = el.entity_id
if eid == civ_id or eid == group_id then
hf.entity_links:erase(k)
Expand Down