1
0
Эх сурвалжийг харах

[fixed] dumping lovers now actually sets them as anonymous, removing them from the contact list. Expanded the marry and divorce lover options to also work for wifes (not active) and made the remove all function work with it too.

anjuna krokus 1 сар өмнө
parent
commit
df452a7c74

+ 40 - 1
locations/lover.qsrc

@@ -21,6 +21,9 @@ if $ARGS[0] = 'remove':
 	$npc_rel_type[$ARGS[1]] = 'ex-' + $npc_rel_type[$ARGS[1]]
 	gs 'telefon', 'ClearCallSchedule', $ARGS[1]
 	gs 'telefon', 'ClearSMSSchedule', $ARGS[1]
+	telefon_index = arrpos('$contact', $ARGS[1])
+	if telefon_index >= 0: contactAnon[telefon_index] = 1
+	killvar 'telefon_index'
 end
 
 
@@ -51,6 +54,22 @@ elseif $ARGS[0] = 'add_sugar_daddy':
 	stat['sugardaddies_current'] += 1
 	stat['total_lovers_current'] += 1
 
+elseif $ARGS[0] = 'add_husband':
+	gs 'lover', 'add', $ARGS[1]
+	$husID = $npcID
+	$npc_rel_type[$husID] = 'husband'
+	npc_rel[$husID] = 100
+	stat['husbands_current'] += 1
+	stat['total_lovers_current'] += 1
+
+elseif $ARGS[0] = 'add_wife':
+	gs 'lover', 'add', $ARGS[1]
+	$wifID = $npcID
+	$npc_rel_type[$wifID] = 'wife'
+	npc_rel[$wifID] = 100
+	stat['wifes_current'] += 1
+	stat['total_lovers_current'] += 1
+
 end
 
 
@@ -78,6 +97,25 @@ elseif $ARGS[0] = 'remove_sugar_daddy':
 	stat['total_lovers_current'] -= 1
 	stat['ex_sugardaddies'] += 1
 
+elseif $ARGS[0] = 'remove_husband':
+	gs 'lover', 'remove', $husID
+	npc_rel[$husID] = 0
+	$husID = ''
+	stat['husbands_current'] -= 1
+	stat['total_lovers_current'] -= 1
+	stat['ex_husbands'] += 1
+	killvar 'spouseVars'
+
+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
+	stat['ex_wifes'] += 1
+	killvar 'spouseVars'
+
 end
 
 ! $ARGS[1+]: npc_rel_types that you want to include
@@ -123,7 +161,8 @@ if $ARGS[0] = 'clear_all':
 		elseif $npc_rel_type[$lover[temp_lover_index]] = 'sugar_daddy':
 			gs 'lover', 'remove_sugar_daddy', $lover[temp_lover_index]
 		elseif $npc_rel_type[$lover[temp_lover_index]] = 'husband':
-			gs 'lover', 'remove_husband', $lover[temp_lover_index]
+			gs 'lover_love', 'divorce'
+		elseif $npc_rel_type[$lover[temp_lover_index]] = 'wife':
 			gs 'lover_love', 'divorce'
 
 		end

+ 19 - 17
locations/lover_love.qsrc

@@ -69,40 +69,42 @@ end
 
 
 if $ARGS[0] = 'marry':
-	if $husID ! '':
+	if $husID ! '' or $wifID ! '':
 		msg 'You are already married, this should not trigger!'
 	else
-		$husID = $ARGS[1]
-		$npc_rel_type[$husID] = 'husband'
-		npc_rel[$husID] = 100
+		if npc_gender[$ARGS[1]] = 0 or npc_gender[$ARGS[1]] = 3:
+			gs 'lover', 'add_husband', $ARGS[1]
+			stat['boyfriends_current'] -= 1
+			stat['total_lovers_current'] -= 1
+		else
+			gs 'lover', 'add_wife', $ARGS[1]
+			stat['girlfriends_current'] -= 1
+			stat['total_lovers_current'] -= 1
+		end
+
 		spouseVars['marry_day'] = daystart
 		spouseVars['eat_day'] = daystart
 		!gs 'rings', 'wear', ???
 		PRinStyle = 1
 		PRinStyle2 = 1
-		stat['boyfriends_current'] -= 1
-		stat['husbands_current'] += 1
 	end
-
-	!$husBody = $loverbod[lover_number]
-	!$husFat = $loverbod[lover_number]
-	!husbFin = npc_finance[$husID]
-	!loverlove[lover_number] = 0
-	!gs 'lover', 'remove_boyfriend', $husID
 end
 
 if $ARGS[0] = 'divorce':
-	npc_rel[$husID] = 0
-	npc_rel_type[$husID] = 'ex-husband'
-	$husID = ''
+	if $husID ! '':
+		gs 'lover', 'remove_husband'
+	elseif $wifID ! '':
+		gs 'lover', 'remove_wife'
+	else
+		exit
+	end
+
 	divorced += 1
 	if PRinStyle2 = 1:
 		!gs 'rings', 'strip'
 		PRinStyle = 0
 		PRinStyle2 = 0
 	end
-
-	killvar 'spouseVars'
 end