diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw index 164cb455e43a142c9f01168bdff2ad865588d018..4bdf5ff2c72f24c15bf68d9b57fb4cb539983537 100644 --- a/src/npc/fRelation.tw +++ b/src/npc/fRelation.tw @@ -17,16 +17,17 @@ <<elseif ($partner == "sister")>> <<set $partner = randomAvailableSister($activeSlave)>> <<set $partner = $slaves.findIndex(function(s) { return s.ID == $partner.ID; })>> - <<if areSisters($activeSlave, $slaves[$partner]) == 3>> - <<set _activeSlaveRel = "half-sister", _partnerRel = "half-sister">> - <<elseif areSisters($activeSlave, $slaves[$partner]) == 2>> - <<set _activeSlaveRel = "sister", _partnerRel = "sister">> - <<elseif areSisters($activeSlave, $slaves[$partner]) == 1>> - <<set _activeSlaveRel = "twin", _partnerRel = "twin">> - <</if>> + <<switch areSisters($activeSlave, $slaves[$partner])>> + <<case 3>> + <<set _activeSlaveRel = "half-sister", _partnerRel = "half-sister">> + <<case 2>> + <<set _activeSlaveRel = "sister", _partnerRel = "sister">> + <<case 1>> + <<set _activeSlaveRel = "twin", _partnerRel = "twin">> + <</switch>> <<elseif ($partner == "relation")>> <<set $partner = $slaves.findIndex(function(s) { return s.ID == $activeSlave.relationTarget; })>> - <<set _activeSlaveRel = $activeSlave.relation, _partnerRel = $partner.relation>> + <<set _activeSlaveRel = $activeSlave.relation, _partnerRel = $slaves[$partner].relation>> <<else>> <<set $partner = $slaves.findIndex(function(s) { return s.ID == $activeSlave.relationshipTarget; })>> <<switch $activeSlave.relationship>> @@ -38,7 +39,7 @@ <<set _activeSlaveRel = "friend with benefits", _partnerRel = "friend with benefits">> <<case 4>> <<set _activeSlaveRel = "lover", _partnerRel = "lover">> - <<case 4>> + <<case 5>> <<set _activeSlaveRel = "slave wife", _partnerRel = "slave wife">> <</switch>> <</if>>