[fixed] not string npc_code and some layout fixes in saveupdater. Used the dispose system suggested by Kevin

locations/saveupdater.qsrc

@@ -2151,27 +2151,25 @@ if temp_current_save_version < 00090003:
 	!! Sleep update.
 	killvar 'varsleep'
 
-	if bedPanty			> 0: sleepVars['bedPanty']				= bedPanty			& killvar 'bedPanty'
-	if bedAnal			> 0: sleepVars['bedAnal']				= bedAnal			& killvar 'bedAnal'
-	if bedVibrator		> 0: sleepVars['bedVibrator']			= bedVibrator		& killvar 'bedVibrator'
-	if cheatVib			> 0: sleepVars['cheatVib']				= cheatVib			& killvar 'cheatVib'
-	if notathomesleep	> 0: sleepVars['notathomesleep']		= notathomesleep	& killvar 'notathomesleep'
-	if Enable_nodream 	> 0: sleepVars['cheat_nodream_chance']	= Enable_nodream	& killvar 'Enable_nodream'
+	if bedPanty       > 0: sleepVars['bedPanty']             = bedPanty       & killvar 'bedPanty'
+	if bedAnal        > 0: sleepVars['bedAnal']              = bedAnal        & killvar 'bedAnal'
+	if bedVibrator    > 0: sleepVars['bedVibrator']          = bedVibrator    & killvar 'bedVibrator'
+	if cheatVib       > 0: sleepVars['cheatVib']             = cheatVib       & killvar 'cheatVib'
+	if notathomesleep > 0: sleepVars['notathomesleep']       = notathomesleep & killvar 'notathomesleep'
+	if Enable_nodream > 0: sleepVars['cheat_nodream_chance'] = Enable_nodream & killvar 'Enable_nodream'
 	
 	sleepVars['events_active'] = 1
 	sleepVars['dreams_active'] = 1
 
-	if budilnikOn		> 0: alarmVars['alarmOn']		= budilnikOn	& killvar 'budilnikOn'
-	if timer			> 0: alarmVars['timerH']		= timer			& killvar 'timer'
-	if timerM			> 0: alarmVars['timerM']		= timerM		& killvar 'timerM'
-	if timerEnd			> 0: alarmVars['timerEndH']		= timerEnd		& killvar 'timerEnd'
-	if timerEndM		> 0: alarmVars['timerEndM']		= timerEndM		& killvar 'timerEndM'
-	if alarm_holiday	> 0: alarmVars['alarm_holiday']	= alarm_holiday	& killvar 'alarm_holiday'
-end
+	if budilnikOn       > 0: alarmVars['alarmOn']       = budilnikOn    & killvar 'budilnikOn'
+	if timer            > 0: alarmVars['timerH']        = timer         & killvar 'timer'
+	if timerM           > 0: alarmVars['timerM']        = timerM        & killvar 'timerM'
+	if timerEnd         > 0: alarmVars['timerEndH']     = timerEnd      & killvar 'timerEnd'
+	if timerEndM        > 0: alarmVars['timerEndM']     = timerEndM     & killvar 'timerEndM'
+	if alarm_holiday    > 0: alarmVars['alarm_holiday'] = alarm_holiday & killvar 'alarm_holiday'
 
-! Pav shared apartment update
+	!! Pav shared apartment update
 	if updated_pav_shared_apt = 0:
-		
 		npctemp = 264
 		$npc_dna['A<<npctemp>>'] = '1290130369 1043654233 5049908515 3153411713 0721993774 2486220839 0288719745'
 		$npc_firstname['A<<npctemp>>'] = 'Yakov'
@@ -2227,57 +2225,59 @@ end
 		npc_sexskill['A<<npctemp>>'] = 1
 		$npc_occupation['A<<npctemp>>'] = 'programmer'
 		npc_style['A<<npctemp>>'] = 3
-
-	if nd_rel                  > 0:npc_rel[A266]           	  =nd_rel                  &killvar 'nd_rel'
-	if sp_rel                  > 0:npc_rel[A264]              =sp_rel                  &killvar 'sp_rel'
-	if gp_rel                  > 0:npc_rel[A265]              =gp_rel                  &killvar 'gp_rel'
-	if nd_hj                   > 0:oleg_hj                    =nd_hj                   &killvar 'nd_hj'
-	if nd_bj                   > 0:oleg_bj                    =nd_bj                   &killvar 'nd_bj'
-	if nd_bjFail               > 0:oleg_bjFail                =nd_bjFail               &killvar 'nd_bjFail'
-	if nd_bjDeep               > 0:oleg_bjDeep                =nd_bjDeep               &killvar 'nd_bjDeep'
-	if nd_bjFailPuke           > 0:oleg_bjFailPuke            =nd_bjFailPuke           &killvar 'nd_bjFailPuke'
-	if nd_bjFailFaint          > 0:oleg_bjFailFaint           =nd_bjFailFaint          &killvar 'nd_bjFailFaint'
-	if nd_swall                > 0:oleg_swall                 =nd_swall                &killvar 'nd_swall'
-	if nd_vagCumInsideUnwanted > 0:oleg_vagCumInsideUnwanted  =nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
-	if nd_vag                  > 0:oleg_vag                   =nd_vag                  &killvar 'nd_vag'
-	if nd_vagCumInside         > 0:oleg_vagCumInside          =nd_vagCumInside         &killvar 'nd_vagCumInside'
-	if nd_anal                 > 0:oleg_anal                  =nd_anal                 &killvar 'nd_anal'
-	if nd_analCumInside        > 0:oleg_analCumInside         =nd_analCumInside        &killvar 'nd_analCumInside'
-	if nd_vagCumInsideUnwanted > 0:oleg_vagCumInsideUnwanted  =nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
-	if nd_piss                 > 0:oleg_piss                  =nd_piss                 &killvar 'nd_piss'
-	if nd_doPornpos            > 0:oleg_doPornpos             =nd_doPornpos            &killvar 'nd_doPornpos'
-	if nd_pornPos              > 0:oleg_pornPos               =nd_pornPos              &killvar 'nd_pornPos'
-	if gp_bj                   > 0:nestor_bj                  =gp_bj                   &killvar 'gp_bj'
-	if gp_bjFail               > 0:nestor_bjFail              =gp_bjFail               &killvar 'gp_bjFail'
-	if gp_bjDeep               > 0:nestor_bjDeep              =gp_bjDeep               &killvar 'gp_bjDeep'
-	if gp_bjFailPuke           > 0:nestor_bjFailPuke          =gp_bjFailPuke           &killvar 'gp_bjFailPuke'
-	if gp_bjFailFaint          > 0:nestor_bjFailFaint         =gp_bjFailFaint          &killvar 'gp_bjFailFaint'
-	if gp_swall                > 0:nestor_swall               =gp_swall                &killvar 'gp_swall'
-	if gp_vagCumInsideUnwanted > 0:nestor_vagCumInsideUnwanted=gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
-	if gp_vag                  > 0:nestor_vag                 =gp_vag                  &killvar 'gp_vag'
-	if gp_vagCumInside         > 0:nestor_vagCumInside        =gp_vagCumInside         &killvar 'gp_vagCumInside'
-	if gp_anal                 > 0:nestor_anal                =gp_anal                 &killvar 'gp_anal'
-	if gp_analCumInside        > 0:nestor_analCumInside       =gp_analCumInside        &killvar 'gp_analCumInside'
-	if gp_vagCumInsideUnwanted > 0:nestor_vagCumInsideUnwanted=gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
-	if gp_doPornpos            > 0:nestor_doPornpos           =gp_doPornpos            &killvar 'gp_doPornpos'
-	if gp_pornPos              > 0:nestor_pornPos             =gp_pornPos              &killvar 'gp_pornPos'
-	if sp_bj                   > 0:yakov_bj                   =sp_bj                   &killvar 'sp_bj'
-	if sp_bjFail               > 0:yakov_bjFail               =sp_bjFail               &killvar 'sp_bjFail'
-	if sp_bjDeep               > 0:yakov_bjDeep               =sp_bjDeep               &killvar 'sp_bjDeep'
-	if sp_bjFailPuke           > 0:yakov_bjFailPuke           =sp_bjFailPuke           &killvar 'sp_bjFailPuke'
-	if sp_bjFailFaint          > 0:yakov_bjFailFaint          =sp_bjFailFaint          &killvar 'sp_bjFailFaint'
-	if sp_swall                > 0:yakov_swall                =sp_swall                &killvar 'sp_swall'
-	if sp_vagCumInsideUnwanted > 0:yakov_vagCumInsideUnwanted =sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
-	if sp_vag                  > 0:yakov_vag                  =sp_vag                  &killvar 'sp_vag'
-	if sp_vagCumInside         > 0:yakov_vagCumInside         =sp_vagCumInside         &killvar 'sp_vagCumInside'
-	if sp_anal                 > 0:yakov_anal                 =sp_anal                 &killvar 'sp_anal'
-	if sp_analCumInside        > 0:yakov_analCumInside        =sp_analCumInside        &killvar 'sp_analCumInside'
-	if sp_vagCumInsideUnwanted > 0:yakov_vagCumInsideUnwanted =sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
-	if sp_doPornpos            > 0:yakov_doPornpos            =sp_doPornpos            &killvar 'sp_doPornpos'
-	if sp_pornPos              > 0:yakov_pornPos              =sp_pornPos              &killvar 'sp_pornPos'
-	if sp_hj                   > 0:yakov_hj                   =sp_hj                   &killvar 'sp_hj'
-	if sp_dildo                > 0:yakov_dildo                =sp_dildo                &killvar'sp_dildo'
-		
+		updated_pav_shared_apt = 1
+	end
+
+	if sp_rel                  > 0: npc_rel['A264']             = sp_rel                  &killvar 'sp_rel'
+	if gp_rel                  > 0: npc_rel['A265']             = gp_rel                  &killvar 'gp_rel'
+	if nd_rel                  > 0: npc_rel['A266']             = nd_rel                  &killvar 'nd_rel'
+	if nd_hj                   > 0: oleg_hj                     = nd_hj                   &killvar 'nd_hj'
+	if nd_bj                   > 0: oleg_bj                     = nd_bj                   &killvar 'nd_bj'
+	if nd_bjFail               > 0: oleg_bjFail                 = nd_bjFail               &killvar 'nd_bjFail'
+	if nd_bjDeep               > 0: oleg_bjDeep                 = nd_bjDeep               &killvar 'nd_bjDeep'
+	if nd_bjFailPuke           > 0: oleg_bjFailPuke             = nd_bjFailPuke           &killvar 'nd_bjFailPuke'
+	if nd_bjFailFaint          > 0: oleg_bjFailFaint            = nd_bjFailFaint          &killvar 'nd_bjFailFaint'
+	if nd_swall                > 0: oleg_swall                  = nd_swall                &killvar 'nd_swall'
+	if nd_vagCumInsideUnwanted > 0: oleg_vagCumInsideUnwanted   = nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
+	if nd_vag                  > 0: oleg_vag                    = nd_vag                  &killvar 'nd_vag'
+	if nd_vagCumInside         > 0: oleg_vagCumInside           = nd_vagCumInside         &killvar 'nd_vagCumInside'
+	if nd_anal                 > 0: oleg_anal                   = nd_anal                 &killvar 'nd_anal'
+	if nd_analCumInside        > 0: oleg_analCumInside          = nd_analCumInside        &killvar 'nd_analCumInside'
+	if nd_vagCumInsideUnwanted > 0: oleg_vagCumInsideUnwanted   = nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
+	if nd_piss                 > 0: oleg_piss                   = nd_piss                 &killvar 'nd_piss'
+	if nd_doPornpos            > 0: oleg_doPornpos              = nd_doPornpos            &killvar 'nd_doPornpos'
+	if nd_pornPos              > 0: oleg_pornPos                = nd_pornPos              &killvar 'nd_pornPos'
+	if gp_bj                   > 0: nestor_bj                   = gp_bj                   &killvar 'gp_bj'
+	if gp_bjFail               > 0: nestor_bjFail               = gp_bjFail               &killvar 'gp_bjFail'
+	if gp_bjDeep               > 0: nestor_bjDeep               = gp_bjDeep               &killvar 'gp_bjDeep'
+	if gp_bjFailPuke           > 0: nestor_bjFailPuke           = gp_bjFailPuke           &killvar 'gp_bjFailPuke'
+	if gp_bjFailFaint          > 0: nestor_bjFailFaint          = gp_bjFailFaint          &killvar 'gp_bjFailFaint'
+	if gp_swall                > 0: nestor_swall                = gp_swall                &killvar 'gp_swall'
+	if gp_vagCumInsideUnwanted > 0: nestor_vagCumInsideUnwanted = gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
+	if gp_vag                  > 0: nestor_vag                  = gp_vag                  &killvar 'gp_vag'
+	if gp_vagCumInside         > 0: nestor_vagCumInside         = gp_vagCumInside         &killvar 'gp_vagCumInside'
+	if gp_anal                 > 0: nestor_anal                 = gp_anal                 &killvar 'gp_anal'
+	if gp_analCumInside        > 0: nestor_analCumInside        = gp_analCumInside        &killvar 'gp_analCumInside'
+	if gp_vagCumInsideUnwanted > 0: nestor_vagCumInsideUnwanted = gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
+	if gp_doPornpos            > 0: nestor_doPornpos            = gp_doPornpos            &killvar 'gp_doPornpos'
+	if gp_pornPos              > 0: nestor_pornPos              = gp_pornPos              &killvar 'gp_pornPos'
+	if sp_bj                   > 0: yakov_bj                    = sp_bj                   &killvar 'sp_bj'
+	if sp_bjFail               > 0: yakov_bjFail                = sp_bjFail               &killvar 'sp_bjFail'
+	if sp_bjDeep               > 0: yakov_bjDeep                = sp_bjDeep               &killvar 'sp_bjDeep'
+	if sp_bjFailPuke           > 0: yakov_bjFailPuke            = sp_bjFailPuke           &killvar 'sp_bjFailPuke'
+	if sp_bjFailFaint          > 0: yakov_bjFailFaint           = sp_bjFailFaint          &killvar 'sp_bjFailFaint'
+	if sp_swall                > 0: yakov_swall                 = sp_swall                &killvar 'sp_swall'
+	if sp_vagCumInsideUnwanted > 0: yakov_vagCumInsideUnwanted  = sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
+	if sp_vag                  > 0: yakov_vag                   = sp_vag                  &killvar 'sp_vag'
+	if sp_vagCumInside         > 0: yakov_vagCumInside          = sp_vagCumInside         &killvar 'sp_vagCumInside'
+	if sp_anal                 > 0: yakov_anal                  = sp_anal                 &killvar 'sp_anal'
+	if sp_analCumInside        > 0: yakov_analCumInside         = sp_analCumInside        &killvar 'sp_analCumInside'
+	if sp_vagCumInsideUnwanted > 0: yakov_vagCumInsideUnwanted  = sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
+	if sp_doPornpos            > 0: yakov_doPornpos             = sp_doPornpos            &killvar 'sp_doPornpos'
+	if sp_pornPos              > 0: yakov_pornPos               = sp_pornPos              &killvar 'sp_pornPos'
+	if sp_hj                   > 0: yakov_hj                    = sp_hj                   &killvar 'sp_hj'
+	if sp_dildo                > 0: yakov_dildo                 = sp_dildo                &killvar'sp_dildo'
+	
 	if oleg_analCumInside           > 0: oleg_cumAnal                  = oleg_analCumInside
 	if oleg_analCumInside           > 0: oleg_analCumInside           -= oleg_analCumInsideUnwanted
 	if oleg_analCumInsideUnwanted   > 0: oleg_analCumInsideUnwanted   -= oleg_analCumInside
@@ -2296,15 +2296,15 @@ end
 	if yakov_vagCumInside           > 0: yakov_cumVag                  = yakov_vagCumInside
 	if yakov_vagCumInside           > 0: yakov_vagCumInside           -= yakov_vagCumInsideUnwanted
 	if yakov_vagCumInsideUnwanted   > 0: yakov_vagCumInsideUnwanted   -= yakov_vagCumInside
-	updated_pav_shared_apt = 1
-	end
-killvar 'gp_horny'
-killvar 'sp_horny'
-killvar 'nd_horny'
-killvar 'milkPause'
-killvar 'gp_cumVol'
-killvar 'sp_cumVol'
-killvar 'nd_cumVol'
+
+	killvar 'gp_horny'
+	killvar 'sp_horny'
+	killvar 'nd_horny'
+	killvar 'milkPause'
+	killvar 'gp_cumVol'
+	killvar 'sp_cumVol'
+	killvar 'nd_cumVol'
+end
 
 
 killvar 'temp_current_save_version'

locations/therapist_hotel.qsrc

@@ -266,13 +266,10 @@ if $ARGS[0] = 'event2_shower':
 			*clr & cla
 			minut += 5
 			therapistQW['escaped'] = 1
-			gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-			gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-			gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
-			
-			gs 'clothing', 'dispose'
-			gs 'panties', 'dispose'
-			gs 'bras', 'dispose'
+
+			gs 'clothing', 'dispose', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
+			gs 'panties', 'dispose', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
+			gs 'bras', 'dispose', $lastwornbratype['therapist'], lastwornbranumber['therapist']
 
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 			'You don''t know why, but you feel this isn''t right. You can''t put your finger on why but this man isn''t your lover. As soon as you bite down hard on his cock, he screams out in pain. This wakes you up from your dreamlike state. Not sticking around, you grab a nearby robe and run out of the hotel room and into the night.'