1
0

2 Коммитууд 5d4d823c51 ... 0a176794f7

Эзэн SHA1 Мессеж Огноо
  rachels 0a176794f7 Merge https://git.tfgames.site/Kevin_Smarts/glife 1 жил өмнө
  Kevin_Smarts 0b96c94b8a [fixed] Anal with Kolka couldn't fire 1 жил өмнө

+ 20 - 4
locations/Cum_Manage.qsrc

@@ -832,7 +832,11 @@ if $ARGS[0] = 'cum_stat_display':
 					if cumcount['<<i>>:<<j>>'] = knownguy['<<i>>:<<j>>']:
 					!! everyone is known (one or more)
 						if knownguy['<<i>>:<<j>>'] = 1:
-							$txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' '
+							if $npc_usedname[$cumowner['<<i>>:<<j>>:0']] = 'stranger':
+								$txtperson = $npc_firstname[$cumowner['<<i>>:<<j>>:0']] + ' '
+							else
+								$txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' '
+							end
 						else
 							kmax = 0
 							:nullocator1
@@ -843,7 +847,11 @@ if $ARGS[0] = 'cum_stat_display':
 								$txtperson += $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']]
 							if k < kmax-1:$txtperson += ', ' & k += 1 & jump 'knownloop'
 							k += 1
-							$txtperson += ' and ' + $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ' '
+							if $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] = 'stranger':
+								$txtperson += ' and ' + $npc_firstname[$cumowner['<<i>>:<<j>>:<<k>>']] + ' '
+							else
+								$txtperson += ' and ' + $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ' '
+							end
 						end
 					elseif knownguy['<<i>>:<<j>>'] = 0:
 					!! no one is known (one or more)
@@ -855,7 +863,11 @@ if $ARGS[0] = 'cum_stat_display':
 					else
 					!! there are known and unknown guys in the mix
 						if knownguy['<<i>>:<<j>>'] = 1:
-							$txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' and some guy'
+							if $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] = 'stranger':
+								$txtperson = $npc_firstname[$cumowner['<<i>>:<<j>>:0']] + ' and some guy'
+							else
+								$txtperson = $npc_usedname[$cumowner['<<i>>:<<j>>:0']] + ' and some guy'
+							end
 						else
 							kmax = 0
 							:nullocator2
@@ -863,7 +875,11 @@ if $ARGS[0] = 'cum_stat_display':
 							kmax -= 1
 							k = 0
 							:mixloop
-								$txtperson += $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ', '
+								if $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] = 'stranger':
+									$txtperson += $npc_firstname[$cumowner['<<i>>:<<j>>:<<k>>']] + ', '
+								else
+									$txtperson += $npc_usedname[$cumowner['<<i>>:<<j>>:<<k>>']] + ', '
+								end
 							if k < kmax: k += 1 & jump 'mixloop'
 							$txtperson += 'and some guy'
 						end

+ 1 - 1
locations/booty_call_shower.qsrc

@@ -1223,7 +1223,7 @@ if $ARGS[0] = 'morning_look1':
 		'"Thanks," you smile, casually walking past him and closing the door behind you.'
 		act'Take a shower':gt'booty_call_morning', 'shower2'
 	end
-	act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_morning', 'morning_shower_join1'
+	act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_shower', 'morning_shower_join1'
 end
 
 if $ARGS[0] = 'morning_shower_join1':

+ 1 - 1
locations/brother_shower_sex.qsrc

@@ -323,9 +323,9 @@ end
 if $ARGS[0] = 'brother_shower_anal':
 	broshowerfuck = daystart
 	gs 'boystat','A34'
-	brotheranal += 1
 	npc_rel['A34'] += 5
 	if brotheranal = 0:
+		brotheranal += 1
 		if stat['think_virgin'] = 1:
 			gt 'brother_shower_sex','brother_shower_anal_vagv_analv'
 		else