Browse Source

[fixed] groupvalue was getting multiply by old save up date code so moved that behind version check and tidied things up a little

Kevin_Smarts 2 years ago
parent
commit
f4e37f96b3
2 changed files with 31 additions and 37 deletions
  1. 0 6
      locations/intro_city_select.qsrc
  2. 31 31
      locations/saveupdater.qsrc

+ 0 - 6
locations/intro_city_select.qsrc

@@ -413,8 +413,6 @@ if $ARGS[0] = 'goodstudent':
 		salo = 93
 		genbsize = 18
 !!c cup for ideal bmi
-		grupvalue[3] = 850
-		grupvalue[6] = 700
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, 0, 0, 0
 		npc_rel['A29'] += 20
 		if player_avatar ! 1: pcs_hairlng = 200
@@ -944,7 +942,6 @@ if $ARGS[0] = 'gopnikstart':
 		npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 10
 		npc_rel['A34'] -= 10
-		grupvalue[4] = 900
 		willpowermax = 130
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
@@ -1175,8 +1172,6 @@ if $ARGS[0] = 'uglyduckling':
 	act 'Confirm this option':
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting_boys', -10, -10, -10, -10, 0, 0
-		grupvalue[1] = 0
-		uglyduck_flag = 1
 		alterstrtimg = 23
 		if glass < 1 : glass = 1
 		genbsize = 28
@@ -1339,7 +1334,6 @@ if $ARGS[0] = 'slut':
 		orgasm = 120
 		swallow = 40
 		trt_cumeater = 1
-		grupvalue[4] = 100
 		willpowermax = 50
 		motherKnowWhore = 1
 		sisterknowslut = 1

+ 31 - 31
locations/saveupdater.qsrc

@@ -593,16 +593,6 @@ end
 	mastrOnce = 0
 	!! ----- Other bug fixes and cleanup ----- 0.8.0
 
-	!!--------0.8.0.1---school social group adjustment
-	if gruptipe[9000] = 0:
-		gruptipe[9000] = 1
-		grupvalue[1] = grupvalue[1] * 10
-		grupvalue[2] = grupvalue[2] * 10
-		grupvalue[3] = grupvalue[3] * 10
-		grupvalue[4] = grupvalue[4] * 10
-	end
-	!!--------0.8.0.1---school social group adjustment
-
 
 	!!--------0.8.1--- Music variable names changed
 	if ml_update_1 = 0:
@@ -1416,9 +1406,40 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	hotelRoom['pav_hotel'] = hotelroom
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080504:
+
+	!!Christinas chat have to stay in the jocks file even if she is an outcast
+	$npcGoSchool['A18'] = '<a href="exec:gt ''gschool_jock_chats'', ''' + $lcase($npc_usedname['A18']) + '''"><<$npc_usedname["A18"]>></a>'
+	
+	if storyline = 1 and MagikDostup = 1:
+		$start_type = 'sg'
+		$start_type[1] = 'nomagic'
+	elseif $start_type = 'csb':
+		$start_type = 'sg_tg'
+		$start_type[1] = 'tg'
+	elseif storyline = 1:
+		$start_type = 'sg_m'
+	elseif MagikDostup = 1:
+		$start_type = 'city'
+		$start_type[1] = 'nomagic'
+	else
+		$start_type = 'city_tg'
+		$start_type[1] = 'tg'
+	end
+end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080601:
 
+	!!--------0.8.0.1---school social group adjustment
+	if gruptipe[9000] = 0:
+		gruptipe[9000] = 1
+		grupvalue[1] = grupvalue[1] * 10
+		grupvalue[2] = grupvalue[2] * 10
+		grupvalue[3] = grupvalue[3] * 10
+		grupvalue[4] = grupvalue[4] * 10
+	end
+	!!--------0.8.0.1---school social group adjustment
+
 	if pcs_skin < 150: pcs_skin = 7 * pcs_skin
 	gs 'body'
 	gs 'body', 'DailyUpdate'
@@ -1442,27 +1463,6 @@ if mod_list > 0:
 	killvar 'mod_i'
 end
 
-if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080504:
-
-	!!Christinas chat have to stay in the jocks file even if she is an outcast
-	$npcGoSchool['A18'] = '<a href="exec:gt ''gschool_jock_chats'', ''' + $lcase($npc_usedname['A18']) + '''"><<$npc_usedname["A18"]>></a>'
-	
-	if storyline = 1 and MagikDostup = 1:
-		$start_type = 'sg'
-		$start_type[1] = 'nomagic'
-	elseif $start_type = 'csb':
-		$start_type = 'sg_tg'
-		$start_type[1] = 'tg'
-	elseif storyline = 1:
-		$start_type = 'sg_m'
-	elseif MagikDostup = 1:
-		$start_type = 'city'
-		$start_type[1] = 'nomagic'
-	else
-		$start_type = 'city_tg'
-		$start_type[1] = 'tg'
-	end
-end
 
 gs 'saveg'
 --- saveupdater ---------------------------------