From fdef7000012c90949df00cac567971219d2d47b2 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 29 Sep 2017 18:23:38 -0400 Subject: [PATCH 1/2] Fixes AI law weights infinite loop --- code/datums/ai_laws.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 2222a959bc..2e5296cff7 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -243,9 +243,15 @@ /datum/ai_laws/proc/pick_weighted_lawset() var/datum/ai_laws/lawtype +<<<<<<< HEAD while(!lawtype && config.law_weights.len) var/possible_id = pickweight(config.law_weights) +======= + var/list/law_weights = CONFIG_GET(keyed_number_list/law_weight) + while(!lawtype && law_weights.len) + var/possible_id = pickweight(law_weights) +>>>>>>> f7171e7... Fixes AI law weights infinite loop lawtype = lawid_to_type(possible_id) if(!lawtype) config.law_weights -= possible_id From 6c4934a34ac8e80828a0abd9977d5b145250c6b5 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Sep 2017 14:22:12 -0500 Subject: [PATCH 2/2] Update ai_laws.dm --- code/datums/ai_laws.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 2e5296cff7..0a0ac72411 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -243,15 +243,9 @@ /datum/ai_laws/proc/pick_weighted_lawset() var/datum/ai_laws/lawtype -<<<<<<< HEAD - - while(!lawtype && config.law_weights.len) - var/possible_id = pickweight(config.law_weights) -======= var/list/law_weights = CONFIG_GET(keyed_number_list/law_weight) while(!lawtype && law_weights.len) var/possible_id = pickweight(law_weights) ->>>>>>> f7171e7... Fixes AI law weights infinite loop lawtype = lawid_to_type(possible_id) if(!lawtype) config.law_weights -= possible_id