Browse Source

[changed] Changes and tweaks to school kid starts relationships and social group values from nutluck and checked by Anya

Kevin_Smarts 3 years ago
parent
commit
d81d817686
2 changed files with 89 additions and 68 deletions
  1. 7 0
      locations/cikl.qsrc
  2. 82 68
      locations/preSYS.qsrc

+ 7 - 0
locations/cikl.qsrc

@@ -1071,6 +1071,13 @@ end
 petersexday = 0
 petersexday = 0
 klismaday1 = 0
 klismaday1 = 0
 
 
+!!ugly duckling start becoming a swan
+if uglyduck_flag = 1:
+	killvar 'uglyduck_flag'
+	gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 0, 0
+	grupvalue[1] += 100
+end
+
 !! Resetting relationships that go over the max
 !! Resetting relationships that go over the max
 
 
 :toptemprel
 :toptemprel

+ 82 - 68
locations/preSYS.qsrc

@@ -398,6 +398,8 @@ if $ARGS[0] = 'SGStart3':
 	!! Sets family and friends relationship values and overwrites the npcstatic data for them
 	!! Sets family and friends relationship values and overwrites the npcstatic data for them
 	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
 	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
 	gs 'npc_relationship', 'default_family_friends'
 	gs 'npc_relationship', 'default_family_friends'
+!!check I coded this right so Christina defaults to starting at 1, Anya and I talked about it and felt this fits her story
+	npc_rel['A18'] = 1
 
 
 	act 'Pavlovsk Start':
 	act 'Pavlovsk Start':
 		gt 'preSYS', 'pav_start'
 		gt 'preSYS', 'pav_start'
@@ -636,10 +638,15 @@ if $ARGS[0] = 'nerd':
 	pcs_inhib = 10
 	pcs_inhib = 10
 	pcs_heels = 10
 	pcs_heels = 10
 	pcs_makupskl = 15
 	pcs_makupskl = 15
-	gs 'npc_relationship', 'socialgroup_setting', -10, 0, 25, 0, 0, 0
+	gs 'npc_relationship', 'socialgroup_setting', -10, 0, 25, 0, 5, 20
 	npc_rel['A129'] += 10
 	npc_rel['A129'] += 10
 	npc_rel['A28'] += 10
 	npc_rel['A28'] += 10
 	npc_rel['A29'] += 10
 	npc_rel['A29'] += 10
+	grupvalue[1] = 200
+	grupvalue[2] = 100
+	grupvalue[3] = 700
+	grupvalue[4] = 100
+	grupvalue[6] = 600
 	genbsize = 22
 	genbsize = 22
 	traits['nerd_points'] = 60
 	traits['nerd_points'] = 60
 	traits['nerd_status'] = 2
 	traits['nerd_status'] = 2
@@ -669,10 +676,12 @@ if $ARGS[0] = 'nerdqueen':
 		currentpursenumber = 13
 		currentpursenumber = 13
 		fashionista_purses[13] = 1
 		fashionista_purses[13] = 1
 		bag = 1
 		bag = 1
-		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 10, 5, 5, 0
-		grupvalue[1] = 200
-		grupvalue[3] = 750
-		grupvalue[6] = 100
+		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 10, 5, 5, 5
+		npc_rel['A18'] = 1
+!!make sure this coming after the gs code above will still set christina to a 1 relationship, if I did this code correctly, if not look for this code in other spots and fix it pls
+		grupvalue[1] = 300
+		grupvalue[3] = 800
+		grupvalue[6] = 700
 		kosmetica = 10
 		kosmetica = 10
 		stanok = 10
 		stanok = 10
 		if player_avatar = 0:
 		if player_avatar = 0:
@@ -719,8 +728,9 @@ if $ARGS[0] = 'goodstudent':
 		money += 2000
 		money += 2000
 		pcs_skin = 20
 		pcs_skin = 20
 		salo = 115
 		salo = 115
-		grupvalue[3] = 600
-		grupvalue[6] = 300
+		grupvalue[3] = 750
+		grupvalue[6] = 700
+		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, 0, 0, 0
 		npc_rel['A29'] += 20
 		npc_rel['A29'] += 20
 		if player_avatar ! 1: pcs_hairlng = 200
 		if player_avatar ! 1: pcs_hairlng = 200
 		willpowermax = 80
 		willpowermax = 80
@@ -758,8 +768,6 @@ if $ARGS[0] = 'computergeek':
 		pcs_skin = 30
 		pcs_skin = 30
 		salo = 38
 		salo = 38
 		pcs_inhib = 20
 		pcs_inhib = 20
-		grupvalue[3] = 700
-		grupvalue[6] = 100
 		npc_rel['A152'] += 10
 		npc_rel['A152'] += 10
 		npc_rel['A153'] += 10
 		npc_rel['A153'] += 10
 		npc_rel['A142'] += 15
 		npc_rel['A142'] += 15
@@ -799,8 +807,6 @@ if $ARGS[0] = 'chessplayer':
 		pcs_skin = 35
 		pcs_skin = 35
 		salo = 120
 		salo = 120
 		pcs_inhib = 15
 		pcs_inhib = 15
-		grupvalue[3] = 650
-		grupvalue[6] = 200
 		chessyear = year
 		chessyear = year
 		chessmonth = month
 		chessmonth = month
 		npc_rel['A151'] += 20
 		npc_rel['A151'] += 20
@@ -851,8 +857,14 @@ if $ARGS[0] = 'jock':
 	currentpursenumber = 11
 	currentpursenumber = 11
 	fashionista_purses[11] = 1
 	fashionista_purses[11] = 1
 	bag = 1
 	bag = 1
-	gs 'npc_relationship', 'socialgroup_setting', 10, 25, 0, 0, -5, 0
+	grupvalue[1] = 400
+	grupvalue[2] = 700
+	grupvalue[3] = 100
+	grupvalue[4] = 300
+	grupvalue[6] = 200
+	gs 'npc_relationship', 'socialgroup_setting', 10, 25, -5, 0, -10, 0
 	npc_rel['A129'] -= 10
 	npc_rel['A129'] -= 10
+	npc_rel['A18'] = 1
 	hscrunch = 10
 	hscrunch = 10
 	hscrunchw = 0
 	hscrunchw = 0
 	pcs_tan = 20
 	pcs_tan = 20
@@ -886,8 +898,6 @@ if $ARGS[0] = 'volleyball':
 		gsAboVolley += 30
 		gsAboVolley += 30
 		npc_rel['A13'] += 10
 		npc_rel['A13'] += 10
 		npc_rel['A69'] += 10
 		npc_rel['A69'] += 10
-		grupvalue[1] = 200
-		grupvalue[2] = 700
 		willpowermax = 140
 		willpowermax = 140
 		school_clothing = 7
 		school_clothing = 7
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -940,9 +950,10 @@ if $ARGS[0] = 'dancer':
 		pcs_inhib = 25
 		pcs_inhib = 25
 		pcs_makupskl = 35
 		pcs_makupskl = 35
 		gsAboDance += 30
 		gsAboDance += 30
+		gs 'npc_relationship', 'socialgroup_setting', 5, 0, 0, -5, 0, 0
 		npc_rel['A23'] += 25
 		npc_rel['A23'] += 25
-		grupvalue[1] = 300
-		grupvalue[2] = 600
+		npc_rel['A144'] += 10
+		grupvalue[1] = 500
 		willpowermax = 140
 		willpowermax = 140
 		school_clothing = 7
 		school_clothing = 7
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -982,10 +993,9 @@ if $ARGS[0] = 'runner':
 		npc_rel['A3'] += 10
 		npc_rel['A3'] += 10
 		npc_rel['A5'] += 10
 		npc_rel['A5'] += 10
 		npc_rel['A8'] += 5
 		npc_rel['A8'] += 5
-		npc_rel['A18'] -= 30
+		npc_rel['A18'] = 1
 		npc_rel['A131'] += 10
 		npc_rel['A131'] += 10
-		grupvalue[1] = 200
-		grupvalue[2] = 700
+		grupvalue[2] = 750
 		willpowermax = 140
 		willpowermax = 140
 		school_clothing = 7
 		school_clothing = 7
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -1023,9 +1033,7 @@ if $ARGS[0] = 'football':
 		npc_rel['A131'] += 10
 		npc_rel['A131'] += 10
 		npc_rel['A149'] += 10
 		npc_rel['A149'] += 10
 		npc_rel['A34'] += 10
 		npc_rel['A34'] += 10
-		grupvalue[1] = 200
-		grupvalue[2] = 700
-		grupvalue[4] = 100
+		grupvalue[2] = 800
 		willpowermax = 140
 		willpowermax = 140
 		$currentpursetype = 'fashionista'
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 11
 		currentpursenumber = 11
@@ -1063,8 +1071,15 @@ if $ARGS[0] = 'cool':
 	stanok = 20
 	stanok = 20
 	tampon = 20
 	tampon = 20
 	money += 1000
 	money += 1000
+	grupvalue[1] = 700
+	grupvalue[2] = 300
+	grupvalue[3] = 100
+	grupvalue[4] = 200
+	grupvalue[6] = 300
 	gs 'npc_relationship', 'socialgroup_setting', 25, 15, 0, -10, -20, 0
 	gs 'npc_relationship', 'socialgroup_setting', 25, 15, 0, -10, -20, 0
 	npc_rel['A129'] -= 20
 	npc_rel['A129'] -= 20
+	npc_rel['A144'] += 10
+	npc_rel['A18'] = 1
 	if player_avatar ! 1: pcs_haircol = 2
 	if player_avatar ! 1: pcs_haircol = 2
 	if player_avatar ! 1: pcs_eyecol = 2
 	if player_avatar ! 1: pcs_eyecol = 2
 	pcs_tan = 30
 	pcs_tan = 30
@@ -1101,12 +1116,7 @@ if $ARGS[0] = 'socialite':
 		bag = 1
 		bag = 1
 		school_clothing = 6
 		school_clothing = 6
 		if player_avatar ! 1: pcs_hairlng = 200
 		if player_avatar ! 1: pcs_hairlng = 200
-		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 0, 0, 0, 0
 		npc_rel['A140'] += 10
 		npc_rel['A140'] += 10
-		grupvalue[1] = 700
-		grupvalue[2] = 200
-		grupvalue[3] = 200
-		grupvalue[6] = 200
 		salo = 68
 		salo = 68
 		willpowermax = 110
 		willpowermax = 110
 		gs 'grades', 'grade_award', 'school', 'math', 65
 		gs 'grades', 'grade_award', 'school', 'math', 65
@@ -1161,12 +1171,10 @@ if $ARGS[0] = 'beautiful':
 		krem = 10
 		krem = 10
 		pirsC = 2
 		pirsC = 2
 		PirsC2_owned = 1
 		PirsC2_owned = 1
-		gs 'npc_relationship', 'socialgroup_setting_boys', 20, 20, 20, 20, 20, 0
+		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 10, 0
 		salo = 63
 		salo = 63
-		grupvalue[1] = 700
-		grupvalue[2] = 200
-		grupvalue[3] = 200
-		grupvalue[4] = 100
+		grupvalue[1] = 800
+		grupvalue[4] = 300
 		gs 'fame', 'pav', 'sex', 20
 		gs 'fame', 'pav', 'sex', 20
 		willpowermax = 110
 		willpowermax = 110
 		gs 'grades', 'grade_award', 'school', 'math', 60
 		gs 'grades', 'grade_award', 'school', 'math', 60
@@ -1203,6 +1211,11 @@ if $ARGS[0] = 'gopnik':
 	fakepassport = 1
 	fakepassport = 1
 	pirsC = 1
 	pirsC = 1
 	PirsC1_owned = 1
 	PirsC1_owned = 1
+	grupvalue[1] = 100
+	grupvalue[2] = 300
+	grupvalue[3] = 100
+	grupvalue[4] = 700
+	grupvalue[6] = 100
 	gs 'npc_relationship', 'socialgroup_setting', 0, 0, -10, 25, 0, 0
 	gs 'npc_relationship', 'socialgroup_setting', 0, 0, -10, 25, 0, 0
 	npc_rel['A129'] -= 30
 	npc_rel['A129'] -= 30
 	npc_rel['A11'] += 10
 	npc_rel['A11'] += 10
@@ -1236,7 +1249,7 @@ if $ARGS[0] = 'gopnikstart':
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
 	act 'Confirm this option':
 		gs 'preSYS', 'gopnik'
 		gs 'preSYS', 'gopnik'
-		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, 0, -10, 0
+		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, 20, -10, 0
 		alterstrtimg = 18
 		alterstrtimg = 18
 		pcs_stren = 40
 		pcs_stren = 40
 		pcs_vital = 40
 		pcs_vital = 40
@@ -1256,8 +1269,7 @@ if $ARGS[0] = 'gopnikstart':
 		npc_rel['A29'] -= 20
 		npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 10
 		npc_rel['A33'] -= 10
 		npc_rel['A34'] -= 10
 		npc_rel['A34'] -= 10
-		grupvalue[2] = 200
-		grupvalue[4] = 700
+		grupvalue[4] = 800
 		willpowermax = 130
 		willpowermax = 130
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
@@ -1284,7 +1296,6 @@ if $ARGS[0] = 'troublemaker':
 	act 'Confirm this option':
 	act 'Confirm this option':
 		traits['nerd_points'] = -50
 		traits['nerd_points'] = -50
 		gs 'preSYS', 'gopnik'
 		gs 'preSYS', 'gopnik'
-		gs 'npc_relationship', 'socialgroup_setting', 0, 0, -10, 0, -10, 0
 		alterstrtimg = 19
 		alterstrtimg = 19
 		pcs_stren = 40
 		pcs_stren = 40
 		pcs_react = 40
 		pcs_react = 40
@@ -1304,6 +1315,7 @@ if $ARGS[0] = 'troublemaker':
 		bag = 1
 		bag = 1
 		school_clothing = 5
 		school_clothing = 5
 		if player_avatar ! 1: pcs_hairlng = 55
 		if player_avatar ! 1: pcs_hairlng = 55
+		gs 'npc_relationship', 'socialgroup_setting', 0, 0, -10, 0, -10, -10
 		npc_rel['A24'] += 10
 		npc_rel['A24'] += 10
 		npc_rel['A155'] += 15
 		npc_rel['A155'] += 15
 		npc_rel['A157'] += 10
 		npc_rel['A157'] += 10
@@ -1314,8 +1326,7 @@ if $ARGS[0] = 'troublemaker':
 		npc_rel['A29'] -= 20
 		npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 10
 		npc_rel['A33'] -= 10
 		npc_rel['A34'] -= 10
 		npc_rel['A34'] -= 10
-		grupvalue[2] = 200
-		grupvalue[4] = 650
+		grupvalue[4] = 750
 		willpowermax = 120
 		willpowermax = 120
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
@@ -1367,8 +1378,6 @@ if $ARGS[0] = 'vitekgf':
 		npc_rel['A9'] += 50
 		npc_rel['A9'] += 50
 		npc_rel['A10'] += 5
 		npc_rel['A10'] += 5
 		npc_rel['A11'] += 5
 		npc_rel['A11'] += 5
-		npc_rel['A20'] += 15
-		npc_rel['A21'] += 10
 		npc_rel['A24'] -= 10
 		npc_rel['A24'] -= 10
 		npc_rel['A28'] -= 10
 		npc_rel['A28'] -= 10
 		npc_rel['A29'] -= 20
 		npc_rel['A29'] -= 20
@@ -1480,8 +1489,7 @@ if $ARGS[0] = 'alternative':
 		npc_rel['A29'] -= 10
 		npc_rel['A29'] -= 10
 		npc_rel['A33'] += 10
 		npc_rel['A33'] += 10
 		grupvalue[1] = 200
 		grupvalue[1] = 200
-		grupvalue[2] = 200
-		grupvalue[4] = 600
+		grupvalue[2] = 400
 		willpowermax = 120
 		willpowermax = 120
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
@@ -1504,7 +1512,12 @@ if $ARGS[0] = 'outcast':
 	pcs_prcptn = 35
 	pcs_prcptn = 35
 	pcs_inhib = 10
 	pcs_inhib = 10
 	pcs_makupskl = 0
 	pcs_makupskl = 0
-	gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, -10, 0, 0
+	grupvalue[1] = 100
+	grupvalue[2] = 100
+	grupvalue[3] = 300
+	grupvalue[4] = 100
+	grupvalue[6] = 200
+	gs 'npc_relationship', 'socialgroup_setting', -10, -5, 0, -5, 0, 0
 	npc_rel['A133'] += 20
 	npc_rel['A133'] += 20
 	npc_rel['A11'] -= 10
 	npc_rel['A11'] -= 10
 	npc_rel['A33'] -= 10
 	npc_rel['A33'] -= 10
@@ -1538,6 +1551,8 @@ if $ARGS[0] = 'friendless':
 		pcs_skin = 10
 		pcs_skin = 10
 		pcs_makupskl = 10
 		pcs_makupskl = 10
 		npc_rel['A11'] -= 20
 		npc_rel['A11'] -= 20
+		grupvalue[1] = 50
+		grupvalue[3] = 200
 		willpowermax = 80
 		willpowermax = 80
 		salo = 68
 		salo = 68
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -1567,6 +1582,8 @@ if $ARGS[0] = 'uglyduckling':
 	act 'Confirm this option':
 	act 'Confirm this option':
 		gs 'preSYS', 'outcast'
 		gs 'preSYS', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting_boys', -10, -10, -10, -10, 0, 0
 		gs 'npc_relationship', 'socialgroup_setting_boys', -10, -10, -10, -10, 0, 0
+		grupvalue[1] = 0
+		uglyduck_flag = 1
 		alterstrtimg = 23
 		alterstrtimg = 23
 		if glass < 1 : glass = 1
 		if glass < 1 : glass = 1
 		genbsize = 2
 		genbsize = 2
@@ -1608,6 +1625,11 @@ if $ARGS[0] = 'goodgirl':
 		traits['nerd_lernHome'] = 5
 		traits['nerd_lernHome'] = 5
 		gs 'preSYS', 'outcast'
 		gs 'preSYS', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -5, -5, 0, -20, 0, 0
 		gs 'npc_relationship', 'socialgroup_setting', -5, -5, 0, -20, 0, 0
+		npc_rel['A25'] -= 5
+		npc_rel['A28'] += 10
+		npc_rel['A29'] += 10
+		npc_rel['A11'] -= 20
+		grupvalue[3] = 400
 		alterstrtimg = 24
 		alterstrtimg = 24
 		pcs_intel = 35
 		pcs_intel = 35
 		pcs_sprt = 60
 		pcs_sprt = 60
@@ -1629,11 +1651,6 @@ if $ARGS[0] = 'goodgirl':
 		school_clothing = 3
 		school_clothing = 3
 		salo = 48
 		salo = 48
 		genbsize = 17
 		genbsize = 17
-		npc_rel['A25'] -= 5
-		npc_rel['A28'] += 10
-		npc_rel['A29'] += 10
-		npc_rel['A11'] -= 20
-		grupvalue[3] = 300
 		willpowermax = 150
 		willpowermax = 150
 		gs 'grades', 'grade_award', 'school', 'math', 80
 		gs 'grades', 'grade_award', 'school', 'math', 80
 		gs 'grades', 'grade_award', 'school', 'rus', 80
 		gs 'grades', 'grade_award', 'school', 'rus', 80
@@ -1667,7 +1684,19 @@ if $ARGS[0] = 'slut':
 		pcs_exhib = 40
 		pcs_exhib = 40
 		Exhibitionist_lvl = 1
 		Exhibitionist_lvl = 1
 		gs 'preSYS', 'outcast'
 		gs 'preSYS', 'outcast'
-		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 0, 20, 0, 0
+		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, -10, 0, 0
+		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 0, 15, 0, 0
+		npc_rel['A11'] += 20
+		npc_rel['A25'] += 30
+		npc_rel['A28'] -= 20
+		npc_rel['A29'] -= 30
+		npc_rel['A33'] -= 10
+		npc_rel['A34'] -= 10
+		npc_rel['A144'] += 10
+		grupvalue[1] = 0
+		grupvalue[2] = 50
+		grupvalue[3] = 50
+		grupvalue[4] = 100
 		alterstrtimg = 25
 		alterstrtimg = 25
 		pcs_makupskl = 50
 		pcs_makupskl = 50
 		pcs_heels = 50
 		pcs_heels = 50
@@ -1686,15 +1715,7 @@ if $ARGS[0] = 'slut':
 		shampoo = 20
 		shampoo = 20
 		pirsC = 2
 		pirsC = 2
 		PirsC2_owned = 1
 		PirsC2_owned = 1
-		npc_rel['A11'] += 20
-		npc_rel['A25'] += 30
-		npc_rel['A28'] -= 20
-		npc_rel['A29'] -= 30
-		npc_rel['A33'] -= 10
-		npc_rel['A34'] -= 10
 		motherKnowSpravka = 1
 		motherKnowSpravka = 1
-		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 0, 10, 0, 0
-		grupvalue[4] = 100
 		if player_avatar = 0:
 		if player_avatar = 0:
 			pcs_hairlng = 120
 			pcs_hairlng = 120
 			pcs_eyesize = 2
 			pcs_eyesize = 2
@@ -1757,19 +1778,14 @@ if $ARGS[0] = 'goth':
 	act 'Confirm this option':
 	act 'Confirm this option':
 		traits['nerd_points'] = -10
 		traits['nerd_points'] = -10
 		gs 'preSYS', 'outcast'
 		gs 'preSYS', 'outcast'
-		gs 'npc_relationship', 'socialgroup_setting', -20, -10, 0, -10, 0, -10
-		gs 'npc_relationship', 'socialgroup_setting_boys', +5, +5, +5, +5, +5, +5
-		gs 'npc_relationship', 'socialgroup_setting_girls', -5, -5, -5, -5, -5, -5
+		gs 'npc_relationship', 'socialgroup_setting', -5, 0, 0, +5, 0, -10
         npc_rel['A28'] -= 20
         npc_rel['A28'] -= 20
 	    npc_rel['A29'] -= 20
 	    npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 20
 		npc_rel['A33'] -= 20
 	    npc_rel['A34'] -= 20
 	    npc_rel['A34'] -= 20
-		npc_rel['A143'] += 10
-	    npc_rel['A144'] += 15
-		npc_rel['A154'] += 10
-	    npc_rel['A156'] += 10
-		npc_rel['A158'] += 10
-        npc_rel['A12'] += 10
+	    npc_rel['A144'] += 10
+		npc_rel['A155'] += 5
+		grupvalue[4] = 300
         alterstrtimg = 28
         alterstrtimg = 28
 		genbsize = 17
 		genbsize = 17
 		salo = 45
 		salo = 45
@@ -1783,8 +1799,6 @@ if $ARGS[0] = 'goth':
 		pcs_sewng = 20
 		pcs_sewng = 20
 		pcs_skin = 50
 		pcs_skin = 50
 	    pcs_inhib = 25
 	    pcs_inhib = 25
-		grupvalue[1] = 100
-		grupvalue[4] = 300
 		willpowermax = 100
 		willpowermax = 100
 		if player_avatar = 0:
 		if player_avatar = 0:
 		    pcs_hairlng = 265
 		    pcs_hairlng = 265