Skip to content
Snippets Groups Projects
Commit 8f5ed660 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'fix' into 'pregmod-master' 

fix murder attempt followup not appearing

Closes #2418

See merge request !8075
parents 1f9bcb00 e979753c
No related branches found
No related tags found
1 merge request!8075fix murder attempt followup not appearing
Hide whitespace changes
Inline Side-by-side
src/uncategorized/nonRandomEvent.tw
+ 3
− 3
View file @ 8f5ed660
...@@ -190,13 +190,13 @@ ...@@ -190,13 +190,13 @@
<<elseif _effectiveWeek >= $murderAttemptWeek && $tempEventToggle>> <<elseif _effectiveWeek >= $murderAttemptWeek && $tempEventToggle>>
<<goto "Murder Attempt">> <<goto "Murder Attempt">>
<<elseif $illegalDeals.slave !== 0>> <<elseif $illegalDeals.slave !== 0>>
<<set $Event = "slave trade">> <<set $event = "slave trade">>
<<goto "Murder Attempt">> <<goto "Murder Attempt">>
<<elseif $illegalDeals.trade !== 0 && _effectiveWeek >= $illegalDeals.trade.week>> <<elseif $illegalDeals.trade !== 0 && _effectiveWeek >= $illegalDeals.trade.week>>
<<set $Event = "trade deal">> <<set $event = "trade deal">>
<<goto "Murder Attempt">> <<goto "Murder Attempt">>
<<elseif $illegalDeals.military !== 0 && _effectiveWeek >= $illegalDeals.military.week>> <<elseif $illegalDeals.military !== 0 && _effectiveWeek >= $illegalDeals.military.week>>
<<set $Event = "military deal">> <<set $event = "military deal">>
<<goto "Murder Attempt">> <<goto "Murder Attempt">>
<<else>> <<else>>
<<if random(1,100) > _effectiveWeek+25>> <<if random(1,100) > _effectiveWeek+25>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment