[fixed] broken lover home image links

locations/npcgeneratec.qsrc

@@ -176,12 +176,12 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 
 
-! npc_apt_type = 1: student dorm (only available in the city for obvious reasons)
-! npc_apt_type = 2: studio apartment
-! npc_apt_type = 3: one bedroom apartment (or 2 bedroom by UK/european definition, an apartment that has a separate bedroom unlike a studio)
-! npc_apt_type = 4: multi-bedroom apartment with roommates
-! npc_apt_type = 5: multi-bedroom apartment living alone
-! npc_apt_type = 6: high rise apartment (for rich people only)
+! npc_apt_type[$npclastgenerated] = 1: student dorm (only available in the city for obvious reasons)
+! npc_apt_type[$npclastgenerated] = 2: studio apartment
+! npc_apt_type[$npclastgenerated] = 3: one bedroom apartment (or 2 bedroom by UK/european definition, an apartment that has a separate bedroom unlike a studio)
+! npc_apt_type[$npclastgenerated] = 4: multi-bedroom apartment with roommates
+! npc_apt_type[$npclastgenerated] = 5: multi-bedroom apartment living alone
+! npc_apt_type[$npclastgenerated] = 6: high rise apartment (for rich people only)
 ! boyfriend attributes
 
 !! temp_location
@@ -220,63 +220,65 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_occupation[$npclastgenerated] = rand(7,15)
 		npc_car[$npclastgenerated] = rand(-3,1)
 	elseif npc_finance[$npclastgenerated] = 2:
-		npc_apt_type[$npclastgenerated] = rand(5,6)
+		npc_apt_type[$npclastgenerated] = 5
+		!!npc_apt_type[$npclastgenerated] = rand(5,6)
+		!! apt_type 6 is disabled until pictures are added
 		npc_occupation[$npclastgenerated] = rand(14,18)
 		npc_car[$npclastgenerated] = rand(0,1)
 	end
 	
 	
-!	npc_style determines generally how they dress and what their "persona" is
+!	npc_style[$npclastgenerated] determines generally how they dress and what their "persona" is
 !	1 - "normal"
 !	2 - Gopnik
 !	3 - nerdy
 !	4 - sporty
 !	5 - fashionable
 !	6 - businessman
-	if npc_occupation < 15:
+	if npc_occupation[$npclastgenerated] < 15:
 		npc_style[$npclastgenerated] = rand(1,5)
 	else
 		npc_style[$npclastgenerated] = (rand(2,6) mod 6) + 1
 	end
 	
-	if npc_apt_type = 6:
+	if npc_apt_type[$npclastgenerated] = 6:
 		!! high rise
 		
 		!! this is to determine what their spare room is used for based on their personality type
-		if npc_style = 3:
-			npc_apt_spare = 1
-		elseif npc_style = 2 or npc_style = 4:
-			npc_apt_spare = 2
+		if npc_style[$npclastgenerated] = 3:
+			npc_apt_spare[$npclastgenerated] = 1
+		elseif npc_style[$npclastgenerated] = 2 or npc_style[$npclastgenerated] = 4:
+			npc_apt_spare[$npclastgenerated] = 2
 		else
-			npc_apt_spare = rand(1,2)
+			npc_apt_spare[$npclastgenerated] = rand(1,2)
 		end
-		if npc_apt_spare = 1:
-			$npc_apt_spare = 'gaming'
-		elseif npc_apt_spare = 2:
-			$npc_apt_spare = 'gym'
+		if npc_apt_spare[$npclastgenerated] = 1:
+			$npc_apt_spare[$npclastgenerated] = 'gaming'
+		elseif npc_apt_spare[$npclastgenerated] = 2:
+			$npc_apt_spare[$npclastgenerated] = 'gym'
 		end
 		npc_apt_number[$npclastgenerated] = rand(1,2)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
-		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'		
-	elseif npc_apt_type = 4 or npc_apt_type = 5:
+	elseif npc_apt_type[$npclastgenerated] = 4 or npc_apt_type[$npclastgenerated] = 5:
 		!! multi-bedroom
-		!! npc_apt_type = 4 will one day be living with roommates but for now we''re just making it easy on ourselves. No roommates until later.
+		!! npc_apt_type[$npclastgenerated] = 4 will one day be living with roommates but for now we''re just making it easy on ourselves. No roommates until later.
 		
 		!! this is to determine what their spare room is used for based on their personality type
-		if npc_style = 3:
-			npc_apt_spare = 1
-		elseif npc_style = 2 or npc_style = 4:
-			npc_apt_spare = 2
+		if npc_style[$npclastgenerated] = 3:
+			npc_apt_spare[$npclastgenerated] = 1
+		elseif npc_style[$npclastgenerated] = 2 or npc_style[$npclastgenerated] = 4:
+			npc_apt_spare[$npclastgenerated] = 2
 		else
-			npc_apt_spare = rand(1,2)
+			npc_apt_spare[$npclastgenerated] = rand(1,2)
 		end
-		if npc_apt_spare = 1:
-			$npc_apt_spare = 'gaming'
-		elseif npc_apt_spare = 2:
-			$npc_apt_spare = 'gym'
+		if npc_apt_spare[$npclastgenerated] = 1:
+			$npc_apt_spare[$npclastgenerated] = 'gaming'
+		elseif npc_apt_spare[$npclastgenerated] = 2:
+			$npc_apt_spare[$npclastgenerated] = 'gym'
 		end
 		
 		npc_apt_number[$npclastgenerated] = rand(1,2)
@@ -286,7 +288,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 		$npc_apt_spare[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/<<$npc_apt_spare[$npclastgenerated]>>.jpg"></center>'
-	elseif npc_apt_type = 3:
+	elseif npc_apt_type[$npclastgenerated] = 3:
 		!! one bedroom
 		npc_apt_number[$npclastgenerated] = rand(1,3)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
@@ -294,15 +296,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
-	elseif npc_apt_type = 2:
+	elseif npc_apt_type[$npclastgenerated] = 2:
 		!! studio apartment
 		npc_apt_number[$npclastgenerated] = rand(1,2)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
-		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
-	elseif npc_apt_type = 1:
+	elseif npc_apt_type[$npclastgenerated] = 1:
 		!! student dorm
 		npc_apt_number[$npclastgenerated] = rand(1,3)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
@@ -312,26 +314,43 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 	end
 	
-!!	if npc_occupation = 1: $npc_occupation = cashier at supermarket
-!!	if npc_occupation = 2: $npc_occupation = cashier at liquor store
-!!	if npc_occupation = 3: $npc_occupation = cashier at coffee shop
-!!	if npc_occupation = 4: $npc_occupation = barista
-!!	if npc_occupation = 5: $npc_occupation = cheap restaurant job
-!!	if npc_occupation = 6: $npc_occupation = taxi driver
-!!	if npc_occupation = 7: $npc_occupation = masseuse
-	
-!!	if npc_occupation = 8: $npc_occupation = sexual masseuse
-!!	if npc_occupation = 9: $npc_occupation = factory job
-!!	if npc_occupation = 10: $npc_occupation = bartender
-!!	if npc_occupation = 11: $npc_occupation = mechanic
-!!	if npc_occupation = 12: $npc_occupation = line cook
-!!	if npc_occupation = 13: $npc_occupation = waiter
-!!	if npc_occupation = 14: $npc_occupation = personal trainer
-!!	if npc_occupation = 15: $npc_occupation = programmer
-
-!!	if npc_occupation = 16: $npc_occupation = businessman
-!!	if npc_occupation = 17: $npc_occupation = lawyer
-!!	if npc_occupation = 18: $npc_occupation = investment banker
+	if npc_occupation[$npclastgenerated] = 1: 
+		$npc_occupation[$npclastgenerated] = 'cashier_supermarket'
+	elseif npc_occupation[$npclastgenerated] = 2: 
+		$npc_occupation[$npclastgenerated] = 'cashier_liquor'
+	elseif npc_occupation[$npclastgenerated] = 3: 
+		$npc_occupation[$npclastgenerated] = 'cashier_coffee'
+	elseif npc_occupation[$npclastgenerated] = 4: 
+		$npc_occupation[$npclastgenerated] = 'barista'
+	elseif npc_occupation[$npclastgenerated] = 5: 
+		$npc_occupation[$npclastgenerated] = 'fast_food'
+	elseif npc_occupation[$npclastgenerated] = 6: 
+		$npc_occupation[$npclastgenerated] = 'taxi_driver'
+	elseif npc_occupation[$npclastgenerated] = 7: 
+		$npc_occupation[$npclastgenerated] = 'masseuse'
+	elseif npc_occupation[$npclastgenerated] = 8: 
+		$npc_occupation[$npclastgenerated] = 'masseuse_sexual'
+	elseif npc_occupation[$npclastgenerated] = 9: 
+		$npc_occupation[$npclastgenerated] = 'factory'
+	elseif npc_occupation[$npclastgenerated] = 10: 
+		$npc_occupation[$npclastgenerated] = 'bartender'
+	elseif npc_occupation[$npclastgenerated] = 11: 
+		$npc_occupation[$npclastgenerated] = 'mechanic'
+	elseif npc_occupation[$npclastgenerated] = 12: 
+		$npc_occupation[$npclastgenerated] = 'line_cook'
+	elseif npc_occupation[$npclastgenerated] = 13: 
+		$npc_occupation[$npclastgenerated] = 'waiter'
+	elseif npc_occupation[$npclastgenerated] = 14: 
+		$npc_occupation[$npclastgenerated] = 'personal trainer'
+	elseif npc_occupation[$npclastgenerated] = 15: 
+		$npc_occupation[$npclastgenerated] = 'programmer'
+	elseif npc_occupation[$npclastgenerated] = 16: 
+		$npc_occupation[$npclastgenerated] = 'businessman'
+	elseif npc_occupation[$npclastgenerated] = 17: 
+		$npc_occupation[$npclastgenerated] = 'lawyer'
+	elseif npc_occupation[$npclastgenerated] = 18: 
+		$npc_occupation[$npclastgenerated] = 'investment banker'
+	end
 
 	npc_humor[$npclastgenerated] = rand(0,3)
 	
@@ -390,6 +409,12 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !!	3 = serious relationship
 
 	npc_fidelity[$npclastgenerated] = rand(1,10)
+!!	npc_fidelity is how they will behave in a relationship
+!!	1-3 = will cheat on you 
+!!	4-6 = will cheat on others with you
+!!	7 = is fine with open relationship
+!!	8-10 = will be faithful
+	if npc_fidelity[$npclastgenerated] >= 4 and npc_fidelity[$npclastgenerated] <= 6: npc_girlfriend[$npclastgenerated] = rand(0,1)
 
 	npc_lover_days[$npclastgenerated] = 0
 

locations/npcpreservec.qsrc

@@ -73,7 +73,9 @@ if mid($npctemp,1,1) = 'C':
 	npc_perv[$npclastsaved]			= npc_perv[$npctemp]
 	npc_outfit[$npclastsaved]		= npc_outfit[$npctemp]
 	npc_finance[$npclastsaved]		= npc_finance[$npctemp]
+	npc_occupation[$npclastsaved]	= npc_occupation[$npctemp]
 	$npc_occupation[$npclastsaved]	= $npc_occupation[$npctemp]
+	npc_car[$npclastsaved]  		= npc_car[$npctemp]
 	npc_intel[$npclastsaved]		= npc_intel[$npctemp]
 	npc_humor[$npclastsaved]		= npc_humor[$npctemp]
 	npc_fav_pos[$npclastsaved]		= npc_fav_pos[$npctemp]
@@ -82,6 +84,7 @@ if mid($npctemp,1,1) = 'C':
 	npc_bush_pref[$npclastsaved]	= npc_bush_pref[$npctemp]
 
 	npc_style[$npclastsaved]		= npc_style[$npctemp]
+	npc_smoker[$npclastsaved]		= npc_smoker[$npctemp]
 	npc_addit[$npclastsaved]		= npc_addit[$npctemp]
 	npc_doors[$npclastsaved]		= npc_doors[$npctemp]
 	npc_goal[$npclastsaved]			= npc_goal[$npctemp]