MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modify modtools/force.lua 

avoid segfault in case of invalid or abscent cv argument
remove CivAttack. It was broken in 40.0X
develop
sv-esk 2016-03-04 20:22:19 +02:00
parent 8eb39cc1d0
commit 3dee6a87cf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/modtools/force.lua
Unescape Escape View File

@ -6,7 +6,7 @@
modtools/force modtools/force
============== ==============
This tool triggers events like megabeasts, caravans, invaders, and migrants. This tool triggers events like megabeasts, caravans, and migrants.
=end]] =end]]
local utils = require 'utils' local utils = require 'utils'
@ -44,7 +44,6 @@ arguments:
WildlifeCurious WildlifeCurious
WildlifeMischievous WildlifeMischievous
WildlifeFlier WildlifeFlier
CivAttack
NightCreature NightCreature
-civ entity -civ entity
specify the civ of the event, if applicable specify the civ of the event, if applicable
@ -54,7 +53,7 @@ arguments:
EVIL EVIL
28 28
]]) ]])
print('force: -eventType [Megabeast, Migrants, Caravan, Diplomat, WildlifeCurious, WildlifeMischievous, WildlifeFlier, CivAttack, NightCreature] -civ [player,ENTITY_ID]') print('force: -eventType [Megabeast, Migrants, Caravan, Diplomat, WildlifeCurious, WildlifeMischievous, WildlifeFlier, NightCreature] -civ [player,ENTITY_ID]')
return return
end end
@ -67,7 +66,13 @@ end
if args.civ == 'player' then if args.civ == 'player' then
args.civ = df.historical_entity.find(df.global.ui.civ_id) args.civ = df.historical_entity.find(df.global.ui.civ_id)
elseif args.civ then elseif args.civ then
local civ = args.civ
args.civ = findCiv(args.civ) args.civ = findCiv(args.civ)
if not args.civ then
error('Invalid civ: ' .. civ)
end
elseif args.eventType == 'Caravan' or args.eventType == 'Diplomat' then
error('Specify civ for this eventType')
end end
if args.eventType == 'Migrants' then if args.eventType == 'Migrants' then