Explorar o código

Merge remote-tracking branch 'Anjuna/master'

Kevin_Smarts hai 3 semanas
pai
achega
1420370e48
Modificáronse 3 ficheiros con 3 adicións e 4 borrados
  1. 0 1
      locations/lover.qsrc
  2. 2 2
      locations/lover_pref.qsrc
  3. 1 1
      locations/saveupdater.qsrc

+ 0 - 1
locations/lover.qsrc

@@ -109,7 +109,6 @@ elseif $ARGS[0] = 'remove_husband':
 elseif $ARGS[0] = 'remove_wife':
 	gs 'lover', 'remove', $wifID
 	npc_rel[$wifID] = 0
-	npc_rel_type[$wifID] = 'ex-wife'
 	$wifID = ''
 	stat['wifes_current'] -= 1
 	stat['total_lovers_current'] -= 1

+ 2 - 2
locations/lover_pref.qsrc

@@ -28,7 +28,7 @@ elseif npc_pref_values['body_tits_average'] > 0:
 elseif npc_pref_values['body_tits_big'] > 0:
 	titMin = 4
 	titMax = 5
-elseif npc_pref_values['body_tits_big'] > 0:
+elseif npc_pref_values['body_tits_huge'] > 0:
 	titMin = 6
 	titMax = 999
 end
@@ -244,7 +244,7 @@ if $ARGS[0] = 'get_piercing_pref':
 		else
 			$result = 'more'
 		end
-	elseif npc_pref_values['cosmetics_piercings_multiple'] > 0:
+	elseif npc_pref_values['cosmetics_piercings_lot'] > 0:
 		if func('pcs_has_attr', 'cosmetics_piercings_lot'):
 			$result = 'the same amount of'
 		else

+ 1 - 1
locations/saveupdater.qsrc

@@ -3561,7 +3561,7 @@ if temp_current_save_version < 00090304:
 
 			if npc_finance[$saveupdaterVars['npcID']] = 0:
 				$npc_outfit[$saveupdaterVars['npcID']] = 'a tracksuit'
-			elseif npc_finance[$saveupdaterVars['npcID']] = 0:
+			elseif npc_finance[$saveupdaterVars['npcID']] = 1:
 				$npc_outfit[$saveupdaterVars['npcID']] = 'jeans and a ' + iif(npc_gender[$saveupdaterVars['npcID']]=0, 'sweater', 'blouse')
 			else
 				$npc_outfit[$saveupdaterVars['npcID']] = 'an expensive ' + iif(npc_gender[$saveupdaterVars['npcID']]=0, 'suit', 'dress')