[fixed/changed] Unified the limitation checks on social group values and moved them all to cikl. Also slightly lowered the cost of saying no or joining an other group, and made sure these actually stick and not being over written by the limit checks.

locations/cikl.qsrc

@@ -1486,6 +1486,10 @@ if storyline = 1:
 				if old_grupvalue[2] + 8 < grupvalue[2]: grupvalue[2] = old_grupvalue[2] + 8
 				if old_grupvalue[3] + 8 < grupvalue[3]: grupvalue[3] = old_grupvalue[3] + 8
 				if old_grupvalue[4] + 8 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 8
+				if old_grupvalue[1] - 30 > grupvalue[1]: grupvalue[1] = old_grupvalue[1] - 30
+				if old_grupvalue[2] - 30 > grupvalue[2]: grupvalue[2] = old_grupvalue[2] - 30
+				if old_grupvalue[3] - 30 > grupvalue[3]: grupvalue[3] = old_grupvalue[3] - 30
+				if old_grupvalue[4] - 30 > grupvalue[4]: grupvalue[4] = old_grupvalue[4] - 30
 			end
 			!!Limit to max school group values
 			if grupvalue[1] > 1000: grupvalue[1] = 1000

locations/gopnik_initiation.qsrc

@@ -77,7 +77,8 @@ end
 
 if $ARGS[0] = 'walkoff':
 	cla & *clr
-	grupvalue[4] -= 200
+	grupvalue[4] = rand(600,650)
+	old_grupvalue[4] = grupvalue[4]
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
@@ -137,7 +138,8 @@ if $ARGS[0] = 'agreesteal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
 			'You stay silent and watch them walk away. You know you just painted a target on your back to the gopniks, but you just couldn''t bring yourself to steal. Sighing you walk back out to the street.'
-			grupvalue[4] -= 200
+			grupvalue[4] = rand(600,650)
+			old_grupvalue[4] = grupvalue[4]
 			gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 			gs 'stat'
 			act 'Leave the gang': gt 'pav_residential'
@@ -172,7 +174,8 @@ if $ARGS[0] = 'noslut':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
 	'You shake your head no. "I''m not a slut."'
 	'They turn around and start walking away again. "Then fuck you bitch!" and with that they leave you behind. You know you are a target for the gopniks now, but better than being their personal slut. You turn and make your way back to the street.'
-	grupvalue[4] -= 200
+	grupvalue[4] = rand(600,650)
+	old_grupvalue[4] = grupvalue[4]
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 	gs 'stat'
 	act 'Leave the gang': gt 'pav_residential'
@@ -181,13 +184,19 @@ end
 if $ARGS[0] = 'gopnik party':
 	*clr & cla
 	menu_off = 1
-	grupvalue[1] -= 500
-	grupvalue[2] -= 300
-	grupvalue[3] -= 500
-		
-	if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
-	if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
-	if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
+
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
+	grupvalue[2] = min(rand(625,675),grupvalue[2])
+	grupvalue[3] = min(rand(600,650),grupvalue[3])
+
+	if grupTipe = 1: grupvalue[1] = rand(500,600)
+	if grupTipe = 2: grupvalue[2] = rand(500,600)
+	if grupTipe = 3: grupvalue[3] = rand(500,600)
+
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
 				
 	grupTipe = 4
 	grupTipe['joined_gopnik'] = 1
@@ -1026,14 +1035,19 @@ if $ARGS[0] = 'gopnik slut':
 	minut += 10
 	gs 'stat'
 	gopnik_slut = 1
-	grupvalue[1] -= 500
-	grupvalue[2] -= 300
-	grupvalue[3] -= 500
-		
-	if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
-	if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
-	if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
-				
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
+	grupvalue[2] = min(rand(625,675),grupvalue[2])
+	grupvalue[3] = min(rand(600,650),grupvalue[3])
+
+	if grupTipe = 1: grupvalue[1] = rand(500,600)
+	if grupTipe = 2: grupvalue[2] = rand(500,600)
+	if grupTipe = 3: grupvalue[3] = rand(500,600)
+
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 4
 	
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', 5

locations/gschool_grounds.qsrc

@@ -142,7 +142,6 @@ if $ARGS[0] = 'main':
 
 	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
 		if PCloStyle2 = 4 or Enable_sforma = 1:
-			gs 'gschool_socialchg', 'group_student_rel_change_2'
 			if hour = 6:
 				if minut < 30:
 					'It''s too early for school now.'

locations/gschool_socialchg.qsrc

@@ -82,10 +82,14 @@ if $ARGS[0] = 'Pavlovsk slut':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/shamewalk.jpg"></center>'
 	'As you walk down the school hallway, you notice almost everyone is eyeing you. Some sneer at you, others laugh, a few turn away in disgust. You are used to this treatment with your sexual escapades, but not to this level. No one wants to greet you and most seem to actively avoid you, you are starting to feel a bit uncomfortable at all the staring eyes. As you approach your locker, you see someone has spray painted ''Slut'' on it in big red letters. You hear someone walking up behind you before you turn around to see who it might be.'
 
-	grupvalue[1] = 0
-	grupvalue[2] = 0
+	grupvalue[1] = min(100,grupvalue[1])
+	grupvalue[2] = min(150,grupvalue[2])
 	grupvalue[3] = 0
-	grupvalue[4] = 0
+	grupvalue[4] = min(200,grupvalue[4])
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
 	grupslutwarning[1] = 0
 	grupslutwarning[2] = 0
 	grupslutwarning[3] = 0
@@ -144,7 +148,8 @@ if $ARGS[0] = 'coolkid':
 		'Vicky frowns but nods. "Suit yourself then." With that, she turns and leaves, Andrey just shakes his head at you and does the same.'
 		'Stasya gives you a once over. "I told you guys she wasn''t cool enough! What a loser!" With that, she follows the others, leaving you behind to wonder if you made the right choice.'
 
-		grupvalue[1] -= rand(300,500)
+		grupvalue[1] = rand(600,650)
+		old_grupvalue[1] = grupvalue[1]
 		gs 'gschool_socialchg', 'group_rel_change','cool kids', -5
 		gs 'stat'
 
@@ -156,13 +161,18 @@ if $ARGS[0] = 'coolkid':
 		'You nod your head. "Yes I would love to! I love hanging out with you guys!"'
 		'Vicky gives you a hug. Once she lets go, Andrey wraps an arm around your shoulder and starts leading you to your next class. "From now on, you''re one of us." Stasya gives you a friendly smile as the four of you walk to your next class.'
 		
-		grupvalue[2] -= 200
-		grupvalue[3] -= 400
-		grupvalue[4] -= 500
+		grupvalue[2] = min(rand(675,725),grupvalue[2])
+		grupvalue[3] = min(rand(625,675),grupvalue[3])
+		grupvalue[4] = min(rand(600,650),grupvalue[4])
 		
-		if grupTipe = 2: grupvalue[2] = 0
-		if grupTipe = 3: grupvalue[3] = 0
-		if grupTipe = 4: grupvalue[4] = 0
+		if grupTipe = 2: grupvalue[2] = rand(500,600)
+		if grupTipe = 3: grupvalue[3] = rand(500,600)
+		if grupTipe = 4: grupvalue[4] = rand(500,600)
+
+		old_grupvalue[1] = grupvalue[1]
+		old_grupvalue[2] = grupvalue[2]
+		old_grupvalue[3] = grupvalue[3]
+		old_grupvalue[4] = grupvalue[4]
 		
 		grupTipe = 1
 		grupTipe['joined_cool'] = 1
@@ -226,7 +236,8 @@ if $ARGS[0] = 'jock':
 		else
 			'Lina gives you a once over. "Well at least Christina will be happy." With that she follows after Lariska, leaving you behind to wonder if you made the right choice.'
 		end
-		grupvalue[2] -= rand(300,500)
+		grupvalue[2] = rand(600,650)
+		old_grupvalue[2] = grupvalue[2]
 		gs 'gschool_socialchg', 'group_rel_change','jocks', -5
 		gs 'stat'
 
@@ -237,15 +248,20 @@ if $ARGS[0] = 'jock':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
 		'You nod your head. "Yes, I would love to! I love hanging out with you guys!"'
 		'Lariska gives you a hug. "From now on you are one of us." Lina gives you a friendly smile and you all walk you to your next class.'
+
+		grupvalue[1] = min(rand(675,725),grupvalue[1])
+		grupvalue[3] = min(rand(600,650),grupvalue[3])
+		grupvalue[4] = min(rand(650,700),grupvalue[4])
 		
-		grupvalue[1] -= 200
-		grupvalue[3] -= 500
-		grupvalue[4] -= 300
-		
-		if grupTipe = 1: grupvalue[1] = 0
-		if grupTipe = 3: grupvalue[3] = 0
-		if grupTipe = 4: grupvalue[4] = 0
-		
+		if grupTipe = 1: grupvalue[1] = rand(500,600)
+		if grupTipe = 3: grupvalue[3] = rand(500,600)
+		if grupTipe = 4: grupvalue[4] = rand(500,600)
+
+		old_grupvalue[1] = grupvalue[1]
+		old_grupvalue[2] = grupvalue[2]
+		old_grupvalue[3] = grupvalue[3]
+		old_grupvalue[4] = grupvalue[4]
+
 		grupTipe = 2
 		grupTipe['joined_jock'] = 1
 		
@@ -306,7 +322,8 @@ if $ARGS[0] = 'nerd':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I''m just not interested in doing a game night. Sorry."'
 		'Artem frowns then nods. "Oh, okay. Well maybe some other time then..." With that, he turns and the rest follow, looking a little disappointed. Looks like they were hoping you would join them. It makes you feel a little bad and wondering if you made the right choice.'
-		grupvalue[3] -= rand(300,500)
+		grupvalue[3] = rand(600,650)
+		old_grupvalue[3] = grupvalue[3]
 		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
 		gs 'stat'
 
@@ -318,13 +335,18 @@ if $ARGS[0] = 'nerd':
 		'You nod your head. "Yes, I would love to hang out with you guys! A game night sounds like a lot of fun."'
 		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great <<$pcs_nickname>>! Meet us at the community center library tonight at 20:00. See you then." With that they all start leaving and going to class, saying that they look forward to seeing you tonight.'
 		
-		grupvalue[1] -= 500
-		grupvalue[2] -= 400
-		grupvalue[4] -= 500
+		grupvalue[1] = min(rand(600,650),grupvalue[1])
+		grupvalue[2] = min(rand(625,625),grupvalue[2])
+		grupvalue[4] = min(rand(600,650),grupvalue[4])
 		
-		if grupTipe = 1: grupvalue[1] = 0
-		if grupTipe = 2: grupvalue[2] = 0
-		if grupTipe = 4: grupvalue[4] = 0
+		if grupTipe = 1: grupvalue[1] = rand(500,600)
+		if grupTipe = 2: grupvalue[2] = rand(500,600)
+		if grupTipe = 4: grupvalue[4] = rand(500,600)
+
+		old_grupvalue[1] = grupvalue[1]
+		old_grupvalue[2] = grupvalue[2]
+		old_grupvalue[3] = grupvalue[3]
+		old_grupvalue[4] = grupvalue[4]
 				
 		grupTipe = 3
 		grupTipe['joined_nerd'] = 1
@@ -385,7 +407,7 @@ if $ARGS[0] = 'gopnik':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I''m just not in the partying mood tonight.""'
 		'Vitek''s eyes darken. "What, are you too good for us all of a sudden? Well fuck you then!" With that, he storms away. Lena looks at you with a derogatory stare before following her brother, leaving you behind to wonder if you made the right choice.'
-		grupvalue[4] -= rand(300,500)
+		grupvalue[4] = rand(600,650)
 		gs 'gschool_socialchg', 'group_rel_change','gopniks', -5
 		gs 'stat'
 
@@ -453,14 +475,15 @@ if $ARGS[0] = 'coolkid outcast':
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 
 	grupvalue[1] = 0
-	grupvalue[2] -= 500
-	grupvalue[3] -= 300
-	grupvalue[4] -= 100
-	
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
-	
+	grupvalue[2] = min(rand(600,650),grupvalue[2])
+	grupvalue[3] = min(rand(650,700),grupvalue[3])
+	grupvalue[4] = min(rand(700,750),grupvalue[4])
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 5
 	grupTipe['before_outcast'] = 1
 	
@@ -481,15 +504,16 @@ if $ARGS[0] = 'jock outcast':
 	end
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
-	grupvalue[1] -= 500
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
 	grupvalue[2] = 0
-	grupvalue[3] -= 300
-	grupvalue[4] -= 200
+	grupvalue[3] = min(rand(650,700),grupvalue[3])
+	grupvalue[4] = min(rand(675,725),grupvalue[4])
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
 
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
-	
 	grupTipe = 5
 	grupTipe['before_outcast'] = 2
 	
@@ -506,15 +530,16 @@ if $ARGS[0] = 'nerd outcast':
 	'You try to find your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but as you''re about to say something he turns to you. "Please go away, I can''t be seen hanging out with you. I''ve got enough problems without you making it worse. None of us want to be around you anymore." He sighs when he sees the dejected look on your face. "I''m sorry I really am, but this is your own fault. Please just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
-	grupvalue[1] -= 500
-	grupvalue[2] -= 300
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
+	grupvalue[2] = min(rand(650,700),grupvalue[2])
 	grupvalue[3] = 0
-	grupvalue[4] -= 400
-	
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
-	
+	grupvalue[4] = min(rand(625,675),grupvalue[4])
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 5
 	grupTipe['before_outcast'] = 3
 	
@@ -531,19 +556,20 @@ if $ARGS[0] = 'gopnik outcast':
 	'As you approach your locker, Pauline, Lera and Lena walk up next to you. Pauline looks like she''s preparing to beat you up while Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. Nooo, you had to become a spineless cunt afraid of her own shadow, so stay the fuck away from us or I''ll beat the shit out of you!" With that, Pauline shoves you against your locker and walks away. Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "You''re so pathetic even the nerds will kick your ass now." Having been publically disawoved by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
-	grupvalue[1] -= 400
-	grupvalue[2] -= 300
-	grupvalue[3] -= 500
+	grupvalue[1] = min(rand(625,675),grupvalue[1])
+	grupvalue[2] = min(rand(650,700),grupvalue[2])
+	grupvalue[3] = min(rand(600,650),grupvalue[3])
 	grupvalue[4] = 0
-	
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 5
 	grupTipe['before_outcast'] = 4
 	
-!!	gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
+	gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
 	gs 'stat'
 
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
@@ -556,7 +582,8 @@ if $ARGS[0] = 'gopnik miss':
 	'Just as you approach your locker, Lena shoves you against it. "Where the fuck were you bitch? We waited almost an hour for you!"'
 	'You start to answer, but before you can even get a single word out, she shoves you again. "It doesn''t matter, we changed our mind about you. You''re not welcome. So get lost." she snarls before storming off. Maybe if you try to earn their respect again they will give you a second chance.'
 	minut += 1
-	grupvalue[4] -= 100
+	grupvalue[4] = rand(675,725)
+	old_grupvalue[4] = grupvalue[4]
 	gs 'stat'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
@@ -683,28 +710,12 @@ if $ARGS[0] = 'group_student_rel_change':
 		if npc_grupTipe['A189'] = 4 and npc_rel['A189'] >= 80: grupvalue[4] += 1
 		if npc_grupTipe['A189'] = 4 and npc_rel['A189'] <= 20: grupvalue[4] -= 1
 		grupvalue_student_day = daystart
+		if grupvalue[1] < 0: grupvalue[1] = 0
+		if grupvalue[2] < 0: grupvalue[2] = 0
+		if grupvalue[3] < 0: grupvalue[3] = 0
+		if grupvalue[4] < 0: grupvalue[4] = 0
 	end
-	if grupvalue[1] > (dailycheck_grupvalue[1] + 30): grupvalue[1] = (dailycheck_grupvalue[1] + 30)
-	if grupvalue[2] > (dailycheck_grupvalue[2] + 30): grupvalue[2] = (dailycheck_grupvalue[2] + 30)
-	if grupvalue[3] > (dailycheck_grupvalue[3] + 30): grupvalue[3] = (dailycheck_grupvalue[3] + 30)
-	if grupvalue[4] > (dailycheck_grupvalue[4] + 30): grupvalue[4] = (dailycheck_grupvalue[4] + 30)
-	if grupvalue[1] < (dailycheck_grupvalue[1] - 30): grupvalue[1] = (dailycheck_grupvalue[1] - 30)
-	if grupvalue[2] < (dailycheck_grupvalue[2] - 30): grupvalue[2] = (dailycheck_grupvalue[2] - 30)
-	if grupvalue[3] < (dailycheck_grupvalue[3] - 30): grupvalue[3] = (dailycheck_grupvalue[3] - 30)
-	if grupvalue[4] < (dailycheck_grupvalue[4] - 30): grupvalue[4] = (dailycheck_grupvalue[4] - 30)	
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
 end	
 
-if $ARGS[0] = 'group_student_rel_change_2':
-	if grupvalue_2_student_day ! daystart:
-		dailycheck_grupvalue[1] = grupvalue[1]
-		dailycheck_grupvalue[2] = grupvalue[2]
-		dailycheck_grupvalue[3] = grupvalue[3]
-		dailycheck_grupvalue[4] = grupvalue[4]
-	end
-end	
 
 --- gschool_socialchg ---------------------------------