From b083dd46adb3a2ecdc12517f17e5f31323ed7886 Mon Sep 17 00:00:00 2001 From: Arkerthan <arkerthan@gmail.com> Date: Tue, 9 Apr 2019 22:56:44 +0200 Subject: [PATCH] moved B where it belongs --- src/pregmod/widgets/pregmodWidgets.tw | 21 --------------------- src/uncategorized/BackwardsCompatibility.tw | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 62c9ed77369..70895ea1ffe 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -169,27 +169,6 @@ <<run delete $args[0].reservedChildrenNursery>> <</if>> - -<<if ndef $args[0].eyesImplant>> - <<set $args[0].eyesImplant = 0>> -<</if>> -<<if $args[0].origEye == "implant">> - <<set $args[0].eyesImplant = 1>> - <<set _oldEyes = $genePool.find(function(s) { return s.ID = $args[0].ID; })>> - <<set $args[0].origEye = _oldEyes.origEye>> -<</if>> -<<if $args[0].origEye == "none">> - <<set $args[0].eyes = -3>> - <<set _oldEyes = $genePool.find(function(s) { return s.ID = $args[0].ID; })>> - <<set $args[0].origEye = _oldEyes.origEye>> -<</if>> -<<if $args[0].eyeColor == "empty">> - <<set $args[0].eyeColor = $args[0].origEye>> - <<set $args[0].eyes = -4>> -<</if>> - - - <</widget>> <<widget "setLocalPronouns">> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index de04503f755..509a1e68651 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3509,8 +3509,27 @@ Updating gene pool records: <</if>> <</if>> + <<if ndef _Slave.eyesImplant>> + <<set _Slave.eyesImplant = 0>> + <</if>> + <<if _Slave.origEye == "implant">> + <<set _Slave.eyesImplant = 1>> + <<set _oldEyes = $genePool.find(function(s) { return s.ID = _Slave.ID; })>> + <<set _Slave.origEye = _oldEyes.origEye>> + <</if>> + <<if _Slave.origEye == "none">> + <<set _Slave.eyes = -3>> + <<set _oldEyes = $genePool.find(function(s) { return s.ID = _Slave.ID; })>> + <<set _Slave.origEye = _oldEyes.origEye>> + <</if>> + <<if _Slave.eyeColor == "empty">> + <<set _Slave.eyeColor = _Slave.origEye>> + <<set _Slave.eyes = -4>> + <</if>> + <<run App.Entity.Utils.GenePoolRecordCleanup(_Slave)>> <<set $genePool[_bci] = _Slave>> + <</for>> <<if $incubator > 0>> -- GitLab