From 541b47e556b30cb90aaded762253a9637856ef6b Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 31 Jan 2019 21:27:13 -0500 Subject: [PATCH] show me "merge conflict" --- src/pregmod/seBurst.tw | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw index 914f12f2239..06e1b7e9c2d 100644 --- a/src/pregmod/seBurst.tw +++ b/src/pregmod/seBurst.tw @@ -167,23 +167,21 @@ taken to the medical suite. <</if>> - <<set $mom = $slaves[_b]>> <<if _cToIncub > 0 || _cToNursery > 0>> <<for _cb = 0; _cb < _curBabies; _cb++>> /* if there is no reserved children, code in loop will not trigger */ - <<if $mom.curBabies[_cb].reserve == "incubator">> - <<set $slaves[_b] = generateChild($mom, $mom.curBabies[_cb], 1)>> + <<if $slaves[_b].curBabies[_cb].reserve == "incubator">> + <<set $slaves[_b] = generateChild($slaves[_b], $slaves[_b].curBabies[_cb], 1)>> <<include "Incubator Workaround">> - <<run $mom.curBabies.splice($mom.curBabies[_cb], 1)>> + <<run $slaves[_b].curBabies.splice($slaves[_b].curBabies[_cb], 1)>> <<set _cb--, _curBabies-->> - <<elseif $mom.curBabies[_cb].reserve == "nursery">> - <<set $slaves[_b] = generateChild($mom, $mom.curBabies[_cb])>> + <<elseif $slaves[_b].curBabies[_cb].reserve == "nursery">> + <<set $slaves[_b] = generateChild($slaves[_b], $slaves[_b].curBabies[_cb])>> <<include "Nursery Workaround">> - <<run $mom.curBabies.splice($mom.curBabies[_cb], 1)>> + <<run $slaves[_b].curBabies.splice($slaves[_b].curBabies[_cb], 1)>> <<set _cb--, _curBabies-->> <</if>> <</for>> <</if>> - <<set $slaves[_b] = $mom>> <<else>> life and <<if _curBabies <= 1>>that of $his child<<else>>those of $his children<</if>>. -- GitLab