Browse Source

fix typo and add saveupdater which I forgot add the last time

rachels 3 years ago
parent
commit
df31a0a18b
2 changed files with 119 additions and 105 deletions
  1. 1 1
      locations/gschool_lessonsev1.qsrc
  2. 118 104
      locations/saveupdater.qsrc

+ 1 - 1
locations/gschool_lessonsev1.qsrc

@@ -68,7 +68,7 @@ if $ARGS[0] = 'fiz_rand':
 			act 'Kick him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		gs 'willpower', 'misc', 'self', 'hard'
-		if will_cost <= pcs_willpwr and (grupeTipe = 2 or grupTipe = 4):
+		if will_cost <= pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
 			act 'Beat his ass (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'misc', 'self', 'hard'

+ 118 - 104
locations/saveupdater.qsrc

@@ -133,7 +133,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		$oldnpcvars[0] = 'npc_app'
 		$oldnpcvars[1] = 'npc_int'
 		$oldnpcvars[2] = 'npc_Qstlvl'
-		
+
 		$newnpcvars[0] = 'npc_apprnc'
 		$newnpcvars[1] = 'npc_intel'
 		$newnpcvars[2] = 'npc_QW'
@@ -162,15 +162,15 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 
 	if npc_grupTipe['A133'] = 0: npc_grupTipe['A133'] = 6
-	if grupTipe[25] ! 0: 
+	if grupTipe[25] ! 0:
 		if npc_grupTipe['A25'] = 0: npc_grupTipe['A25'] = grupTipe[25]
 		grupTipe[25] = 0
 	end
-	if grupTipe[5] ! 0: 
+	if grupTipe[5] ! 0:
 		if npc_grupTipe['A5'] = 0: npc_grupTipe['A5'] = grupTipe[5]
 		grupTipe[5] = 0
 	end
-	if grupTipe[61] ! 0: 
+	if grupTipe[61] ! 0:
 		if npc_grupTipe['A189'] = 0: npc_grupTipe['A189'] = grupTipe[61]
 		grupTipe[61] = 0
 	end
@@ -498,18 +498,18 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if AlbFrend > 0:           AlbinaQW['Friends'] = AlbFrend & killvar 'AlbFrend'
 	if ZvezdEnd > 0:           AlbinaQW['StarletsShutDown'] = ZvezdEnd & killvar 'ZvezdEnd'
 	if DanceWhore > 0:         AlbinaQW['StarletsWhore'] = DanceWhore & killvar 'DanceWhore'
-	if beinalbinahome > 0:     AlbinaQW['KnowsHouse'] = beinalbinahome & killvar 'beinalbinahome' 
-	if albsportday > 0:        AlbinaQW['SportDay'] = albsportday & killvar 'albsportday' 
-	if albsporthome > 0:       AlbinaQW['SportHome'] = albsporthome & killvar 'albsporthome' 
-	if gamebet > 0:            AlbinaQW['gamebet'] = gamebet & killvar 'gamebet' 
-	if stardance > 0:          AlbinaQW['ShowTriggerCount'] = stardance & killvar 'stardance' 
-	if albrideday > 0:         AlbinaQW['albrideday'] = albrideday & killvar 'albrideday' 
-	if albinaQWdance > 0:      AlbinaQW['StarletsJoined'] = albinaQWdance & killvar 'albinaQWdance' 
-	if AlbZverHelp > 0:        AlbinaQW['ChristinaHelp'] = AlbZverHelp & killvar 'AlbZverHelp' 
-	if alb_father_meeting > 0: AlbinaQW['ParkRally'] = alb_father_meeting & killvar 'alb_father_meeting' 
-	if alb_father_day > 0:     AlbinaQW['ParkRallyDay'] = alb_father_day & killvar 'alb_father_day' 
-	if AlbFaterBlackTime > 0:  AlbinaQW['ElectionCampaignTime'] = AlbFaterBlackTime & killvar 'AlbFaterBlackTime' 
-	if startletsday > 0:       AlbinaQW['startletsday'] = startletsday & killvar 'startletsday' 
+	if beinalbinahome > 0:     AlbinaQW['KnowsHouse'] = beinalbinahome & killvar 'beinalbinahome'
+	if albsportday > 0:        AlbinaQW['SportDay'] = albsportday & killvar 'albsportday'
+	if albsporthome > 0:       AlbinaQW['SportHome'] = albsporthome & killvar 'albsporthome'
+	if gamebet > 0:            AlbinaQW['gamebet'] = gamebet & killvar 'gamebet'
+	if stardance > 0:          AlbinaQW['ShowTriggerCount'] = stardance & killvar 'stardance'
+	if albrideday > 0:         AlbinaQW['albrideday'] = albrideday & killvar 'albrideday'
+	if albinaQWdance > 0:      AlbinaQW['StarletsJoined'] = albinaQWdance & killvar 'albinaQWdance'
+	if AlbZverHelp > 0:        AlbinaQW['ChristinaHelp'] = AlbZverHelp & killvar 'AlbZverHelp'
+	if alb_father_meeting > 0: AlbinaQW['ParkRally'] = alb_father_meeting & killvar 'alb_father_meeting'
+	if alb_father_day > 0:     AlbinaQW['ParkRallyDay'] = alb_father_day & killvar 'alb_father_day'
+	if AlbFaterBlackTime > 0:  AlbinaQW['ElectionCampaignTime'] = AlbFaterBlackTime & killvar 'AlbFaterBlackTime'
+	if startletsday > 0:       AlbinaQW['startletsday'] = startletsday & killvar 'startletsday'
 	! ----- Albina story variables migrated to array
 
 	!! Updating npc_bust[] array to the new values ----- 0.8.0
@@ -560,11 +560,11 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	!!trait update
 	if traits['update_1'] = 0:
 		traits['update_1'] = 1
-		
-		traits['alko_day'] = alko_trait_day 
+
+		traits['alko_day'] = alko_trait_day
 		traits['alko_points'] = alko_trait_counter
 		traits['alko_status'] = alko_trait
-		
+
 		killvar 'alko_trait_day'
 		killvar 'alko_trait_counter'
 		killvar 'alko_trait'
@@ -606,7 +606,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		ml_guitarlesson['advertisement'] = ml_guitarlessonadv
 		ml_guitarlesson['enquired'] = ml_enquired
 
-		if age < 18: 
+		if age < 18:
 			ml_guitarlesson['lessoncost'] = 300
 		else
 			ml_guitarlesson['lessoncost'] = 500
@@ -634,6 +634,14 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 	!!---------------------------------------------------------------
 
+	!! fixes the variable for Christina getting outcasted, so she will show up in the journal correctly
+
+	if zverSlutQW = 2:
+		npc_grupTipe['A18'] = 5
+	end
+
+	!!---------------------------------------------------------------
+
 	!!model age addition
 
 	if model['age'] = 0 and model > 0:
@@ -665,90 +673,6 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if lariskaHelp_end > 0:  LariskaQw['LariskaHelpEnd'] = lariskaHelp_end & killvar 'lariskaHelp_end'
 	!!---------------------------------------------------------------
 
-	!! Lariska variables removed, no longer needed - 2020/11/30 - Alaratt
-	!! Edited - 2021/01/19 - Alaratt
-	if beInLariskaHome = 1 or LariskaHomeIn >= 1:
-		if LariskaHomeIn = 1:
-			LariskaQW['story'] = 4
-		else
-			LariskaQW['story'] = 5
-		end
-		killvar 'LariskaHomeIn'
-		killvar 'beInLariskaHome'
-	end
-	if doorlocked > 0: killvar 'doorlocked'
-	if doorpeek > 0: killvar 'doorpeek'
-	if lariskaBDSM > 0: killvar 'lariskaBDSM'
-	if lariskaMotherKnown = 1:
-		LariskaQW['metAnna'] = 1
-		killvar 'lariskaMotherKnown'
-	end
-	if LariskaProfi = 1:
-		LariskaQW['volleyball'] = 1
-		killvar 'LariskaProfi'
-	end
-	!!---------------------------------------------------------------
-
-	!! Migrates Christina variables into an array, removes unneeded variables, and fixes the outcast issue if still needed
-	!! 2021/01/19 - Alaratt
-	if zverSlutQW > 0:
-		if zverSlutQW = 2:
-			!! Christina lost the fight and is outcasted
-			christinaQW['fight'] = 1
-			christinaQW['dompath'] = 7
-			npc_grupTipe['A18'] = 5
-		else
-			!! Christina lost the fight and is prepped for outcasting
-			christinaQW['fight'] = 1
-			christinaQW['dompath'] = 6
-		end
-		killvar 'zverSlutQW'
-	end
-	
-	if zverRageQW > 0:
-		if zverRageQW = 10:
-			!! Christina won the fight
-			christinaQW['fight'] = -1
-			christinaQW['subpath'] = 2
-		elseif zverRageQW = 2:
-			!! Christina lost the fight
-			christinaQW['fight'] = 1
-			christinaQW['dompath'] = 6
-		else
-			!! You spread rumors about Christina and she preps for fight
-			christinaQW['dompath'] = 4
-		end
-		killvar 'zverRageQW'
-	end
-	
-	if socialchg['christina_dont_care'] = 1:socialchg['christina_dont_care'] = 0
-	if zverevaQW > 0:killvar 'zverevaQW'
-	if LinaSlut > 0:killvar 'LinaSlut'
-	if fizrukSex > 0:killvar 'fizrukSex'
-	if kristinaSex > 0:killvar 'kristinaSex'
-	
-	if christinaphotos > 0:
-		if christinaphotos = 3:
-			!! Christina won the fight and you have not had a shower scene with her yet
-			christinaQW['fight'] = -1
-			christinaQW['subpath'] = 2
-		elseif christinaphotos = 4:
-			!! Christina won the fight and you had first shower scene with her
-			christinaQW['fight'] = -1
-			christinaQW['subpath'] = 3
-		elseif christinaphotos = 2
-			!! You submitted to Christina and you had first shower scene with her
-			christinaQW['submit'] = 1
-			christinaQW['subpath'] = 3
-		else
-			!! You submitted to Christina but not had a shower scene with her yet
-			christinaQW['submit'] = 1
-			christinaQW['subpath'] = 2
-		end
-		killvar 'christinaphotos'
-	end
-	
-	!!---------------------------------------------------------------
 
 	!! Shave updater
 	if shave_update ! 1:
@@ -916,5 +840,95 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080203:
+
+	!! Lariska variables removed, no longer needed - 2020/11/30 - Alaratt
+	!! Edited - 2021/01/19 - Alaratt
+	if beInLariskaHome = 1 or LariskaHomeIn >= 1:
+		if LariskaHomeIn = 1:
+			LariskaQW['story'] = 4
+		else
+			LariskaQW['story'] = 5
+		end
+		killvar 'LariskaHomeIn'
+		killvar 'beInLariskaHome'
+	end
+	if doorlocked > 0: killvar 'doorlocked'
+	if doorpeek > 0: killvar 'doorpeek'
+	if lariskaBDSM > 0: killvar 'lariskaBDSM'
+	if lariskaMotherKnown = 1:
+		LariskaQW['metAnna'] = 1
+		killvar 'lariskaMotherKnown'
+	end
+	if LariskaProfi = 1:
+		LariskaQW['volleyball'] = 1
+		killvar 'LariskaProfi'
+	end
+	!!---------------------------------------------------------------
+
+	!! Migrates Christina variables into an array, removes unneeded variables, and fixes the outcast issue if still needed
+	!! 2021/01/19 - Alaratt
+	if zverSlutQW > 0:
+		if zverSlutQW = 2:
+			!! Christina lost the fight and is outcasted
+			christinaQW['fight'] = 1
+			christinaQW['dompath'] = 7
+			npc_grupTipe['A18'] = 5
+		else
+			!! Christina lost the fight and is prepped for outcasting
+			christinaQW['fight'] = 1
+			christinaQW['dompath'] = 6
+		end
+		killvar 'zverSlutQW'
+	end
+
+	if zverRageQW > 0:
+		if zverRageQW = 10:
+			!! Christina won the fight
+			christinaQW['fight'] = -1
+			christinaQW['subpath'] = 2
+		elseif zverRageQW = 2:
+			!! Christina lost the fight
+			christinaQW['fight'] = 1
+			christinaQW['dompath'] = 6
+		else
+			!! You spread rumors about Christina and she preps for fight
+			christinaQW['dompath'] = 4
+		end
+		killvar 'zverRageQW'
+	end
+
+	if socialchg['christina_dont_care'] = 1:socialchg['christina_dont_care'] = 0
+	if zverevaQW > 0:killvar 'zverevaQW'
+	if LinaSlut > 0:killvar 'LinaSlut'
+	if fizrukSex > 0:killvar 'fizrukSex'
+	if kristinaSex > 0:killvar 'kristinaSex'
+
+	if christinaphotos > 0:
+		if christinaphotos = 3:
+			!! Christina won the fight and you have not had a shower scene with her yet
+			christinaQW['fight'] = -1
+			christinaQW['subpath'] = 2
+		elseif christinaphotos = 4:
+			!! Christina won the fight and you had first shower scene with her
+			christinaQW['fight'] = -1
+			christinaQW['subpath'] = 3
+		elseif christinaphotos = 2:
+			!! You submitted to Christina and you had first shower scene with her
+			christinaQW['submit'] = 1
+			christinaQW['subpath'] = 3
+		else
+			!! You submitted to Christina but not had a shower scene with her yet
+			christinaQW['submit'] = 1
+			christinaQW['subpath'] = 2
+		end
+		killvar 'christinaphotos'
+	end
+
+	!!---------------------------------------------------------------
+end
+
+
+
 --- saveupdater ---------------------------------