Browse Source

only identifiers should be transferred

# Conflicts:
#	locations/npcpreservec.qsrc
rachels 2 years ago
parent
commit
953996f94f
2 changed files with 5 additions and 11 deletions
  1. 3 3
      locations/femcyc.qsrc
  2. 2 8
      locations/npcpreservec.qsrc

+ 3 - 3
locations/femcyc.qsrc

@@ -28,8 +28,8 @@
 !!	$npc_dna : npc DNA
 !!	$pcs_dna : Svetas DNA
 !!	$wombDNA : sperm in womb potent enough to cause pregnancy
-!!	$wombName : the name of the NPC
-!!	$wombpotfath : the name of the potential father, if sveta is not sure
+!!	$wombName : the identifier of the NPC
+!!	$wombpotfath : the used name of the potential father, if sveta is not sure
 !!	arrmodtmp : temp array used in pregnancy progression
 !!	babyembryo : used during implant phase. if the fertegg successfully nests, babyembryo is +1. BabyEmbryo is for how many unborn babies are inside Sveta.
 !!	Babyptype : pregnancy type of unborn babies. they might be unimplanted 0, healthy 1, or Ectopic 2.
@@ -538,7 +538,7 @@ if $ARGS[0] = 'cyc2':
 
 			!! $wombDNA: sperm in womb potent enough to cause pregnancy
 			!! wombAmount: how potent is the sperm of a guy
-			!! $wombName: the name of the NPC
+			!! $wombName: the identifier of the NPC
 			y = arrsize('$wombDNA')
 			if arrpos('$wombDNA',$npc_dna[$cumarrnam[can_idx]]) = -1:
 				!! New guy, create place for him at the end of the array, storing his DNA, sperm amount and name

+ 2 - 8
locations/npcpreservec.qsrc

@@ -117,18 +117,12 @@ if mid($npctemp,1,1) = 'C':
 	if npctemp2 >= 0: $cumarrnam[npctemp2] = $npclastsaved & jump 'npctempmloop'
 	npctemp2 = arrpos('$sparrnam', $npctemp)
 	if npctemp2 >= 0: $sparrnam[npctemp2] = $npclastsaved & jump 'npctempmloop'
-	npctemp2 = arrpos('$cumfthname', $npctemp)
-	if npctemp2 >= 0: $cumfthname[npctemp2] = $npclastsaved & jump 'npctempmloop'
-	npctemp2 = arrpos('$cumfthnames', $npctemp)
-	if npctemp2 >= 0: $cumfthnames[npctemp2] = $npclastsaved & jump 'npctempmloop'
-	npctemp2 = arrpos('$wombpotfath', $npctemp)
-	if npctemp2 >= 0: $wombpotfath[npctemp2] = $npclastsaved & jump 'npctempmloop'
+	npctemp2 = arrpos('$wombName', $npctemp)
+	if npctemp2 >= 0: $wombName[npctemp2] = $npclastsaved & jump 'npctempmloop'
 	npctemp2 = arrpos('$cumfathlotto', $npctemp)
 	if npctemp2 >= 0: $cumfathlotto[npctemp2] = $npclastsaved & jump 'npctempmloop'
 	npctemp2 = arrpos('$ChildFath', $npctemp)
 	if npctemp2 >= 0: $ChildFath[npctemp2] = $npclastsaved & jump 'npctempmloop'
-	npctemp2 = arrpos('$ChildThFath', $npctemp)
-	if npctemp2 >= 0: $ChildThFath[npctemp2] = $npclastsaved & jump 'npctempmloop'
 
 	! {Thic checks Array A for the Entry and changes it to the new Array B. The parts commented out don''t work and need to be replaced with something that does.}
 	if $pcs_firstpart = $npctemp: $pcs_firstpart = $npclastsaved