Browse Source

switch to the new school chat files

rachels 2 years ago
parent
commit
02cbdf6efb

+ 5 - 3
glife.qproj

@@ -677,9 +677,11 @@
 		<Location name="gschool_socialchg"/>
 		<Location name="gschool_socialchg1"/>
 		<Location name="gschool_chats"/>
-		<Location name="gschool_chats1"/>
-		<Location name="gschool_chats2"/>
-		<Location name="gschool_chats3"/>
+		<Location name="gschool_coolkid_chats"/>
+		<Location name="gschool_jock_chats"/>
+		<Location name="gschool_nerd_chats"/>
+		<Location name="gschool_gopnik_chats"/>
+		<Location name="gschool_outcast_chats"/>
 		<Location name="gschool_post_shower"/>
 		<Location name="nogorslut"/>
 		<Location name="yesgorslut"/>

+ 1 - 1
locations/gschool_gopnik_chats.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'valentin':
 	end
 end
 
-if $ARGS[0] = 'vasily':
+if $ARGS[0] = 'shulga':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'

+ 2 - 2
locations/gschool_lunch.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'lunch':
 	end
 
 	if marcus_event ! daystart and Marcus_sextype > 0 and rand(0,3) = 0:gt 'gschool_lunch', 'marcus_event'
-	if cheerleadingQW['bella_stasya_gossip'] = 0 and cheerleadingQW['quest_stage'] = 0 and cheerleadingQW['gossip'] >= 3 and (grupTipe = 1 or fame['pav_slut'] >= 200): gt 'gschool_chats1', 'cherleading_notice'
+	if cheerleadingQW['bella_stasya_gossip'] = 0 and cheerleadingQW['quest_stage'] = 0 and cheerleadingQW['gossip'] >= 3 and (grupTipe = 1 or fame['pav_slut'] >= 200): gt 'gschool_coolkid_chats', 'cherleading_notice'
 	gt 'gschool_lunch', 'cafeteria'
 end
 
@@ -134,7 +134,7 @@ if $ARGS[0] = 'break':
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
 
-	if katjaQW['QWstage'] = 0 and npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_chats1', 'Katjaproblems'
+	if katjaQW['QWstage'] = 0 and npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_coolkid_chats', 'Katjaproblems'
 
 	if $breaktype ! 'long':
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat, did you happen to see Dimka?" "Hey <<$pcs_nickname>>, he was here earlier, speaking with Lena and Lera.'

+ 0 - 2
locations/npcstatic1.qsrc

@@ -230,7 +230,6 @@ $npc_thdick['A<<npctemp>>'] = 'massive'
 npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = rand(0,2)
 if storyline = 1: npc_rel['A<<npctemp>>'] = 40
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vasily''"><<$npc_usedname[''A11'']>></a>'
 npc_intel['A<<npctemp>>'] = 33
 hotcat_rating['A<<npctemp>>'] = 4
 
@@ -305,7 +304,6 @@ npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'coolkid'
 npc_bust['A<<npctemp>>'] = 18
-$npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''viktoria''"><<$npc_usedname[''A15'']>></a>'
 npc_intel['A<<npctemp>>'] = 52
 hotcat_rating['A<<npctemp>>'] = 7
 !!$npc_body['A<<npctemp>>'] = 's3'

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 5
-version_patch = 2
+version_patch = 3
 --- saveg ---------------------------------
 

+ 18 - 0
locations/saveupdater.qsrc

@@ -1390,6 +1390,24 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if i < barraynumber: jump 'saveupdaterloop852_2'
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080503:
+
+	i = 0
+	:saveupdaterloop853_1
+	if 	npc_grupTipe['A<<i>>'] = 5:
+		$npcGoSchool['A<<i>>'] = '<a href="exec:gt ''gschool_outcast_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''"><<$npc_usedname["A<<i>>"]>></a>'
+	elseif npc_grupTipe['A<<i>>'] = 4:
+		$npcGoSchool['A<<i>>'] = '<a href="exec:gt ''gschool_gopnik_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''"><<$npc_usedname["A<<i>>"]>></a>'
+	elseif npc_grupTipe['A<<i>>'] = 3:
+		$npcGoSchool['A<<i>>'] = '<a href="exec:gt ''gschool_nerd_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''"><<$npc_usedname["A<<i>>"]>></a>'
+	elseif npc_grupTipe['A<<i>>'] = 2:
+		$npcGoSchool['A<<i>>'] = '<a href="exec:gt ''gschool_jock_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''"><<$npc_usedname["A<<i>>"]>></a>'
+	elseif npc_grupTipe['A<<i>>'] = 1:
+		$npcGoSchool['A<<i>>'] = '<a href="exec:gt ''gschool_coolkid_chats'', ''' + $lcase($npc_usedname['A<<i>>']) + '''"><<$npc_usedname["A<<i>>"]>></a>'
+	end
+	i += 1
+	if i < 250: jump 'saveupdaterloop853_1'
+end