Skip to content

Commit

Permalink
Merge pull request #551 from 20k/make-monarch
Browse files Browse the repository at this point in the history
Update make-monarch to use assignment_vector_idx
  • Loading branch information
myk002 committed Jan 22, 2023
2 parents ab2f956 + 29ed836 commit 12431a3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions make-monarch.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ for k,v in pairs(my_entity.positions.own) do
end
if not monarch_id then qerror("No monarch found!") end
local old_id
for pos_id,v in pairs(my_entity.positions.assignments) do
if v.position_id==monarch_id then
old_id=v.histfig
v.histfig=newfig.id
for assignment_idx,assignment in ipairs(my_entity.positions.assignments) do
if assignment.position_id==monarch_id then
old_id=assignment.histfig
assignment.histfig=newfig.id
local oldfig=df.historical_figure.find(old_id)

for k,v in pairs(oldfig.entity_links) do
if df.histfig_entity_link_positionst:is_instance(v) and v.assignment_id==pos_id and v.entity_id==df.global.plotinfo.civ_id then --hint:df.histfig_entity_link_positionst
if df.histfig_entity_link_positionst:is_instance(v) and v.assignment_id==assignment.id and v.entity_id==df.global.plotinfo.civ_id then --hint:df.histfig_entity_link_positionst
oldfig.entity_links:erase(k)
break
end
end
newfig.entity_links:insert("#",{new=df.histfig_entity_link_positionst,entity_id=df.global.plotinfo.civ_id,
link_strength=100,assignment_id=pos_id,start_year=df.global.cur_year})
link_strength=100,assignment_id=assignment.id,assignment_vector_idx=assignment_idx,start_year=df.global.cur_year})
break
end
end

0 comments on commit 12431a3

Please sign in to comment.