Browse Source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

Gwen 2 years ago
parent
commit
1c693fa0d7
2 changed files with 3 additions and 7 deletions
  1. 2 1
      locations/body_desc.qsrc
  2. 1 6
      locations/vanrPar.qsrc

+ 2 - 1
locations/body_desc.qsrc

@@ -604,6 +604,7 @@ if $ARGS[0] = 'glasses':
 		$glass = ' You wear silly glasses in a cheap frame.'
 		$glass = ' You wear silly glasses in a cheap frame.'
 	else
 	else
 		glass = 0
 		glass = 0
+		$pc_descWordy['vision'] = ''
 		$glass = ''
 		$glass = ''
 	end
 	end
 end
 end
@@ -643,7 +644,7 @@ if $ARGS[0] = 'eye_size':
 		$pc_descWordy['eye size'] = 'medium-sized'
 		$pc_descWordy['eye size'] = 'medium-sized'
 		$glaza = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 		$glaza = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	elseif pcs_eyesize = 2:
 	elseif pcs_eyesize = 2:
-		$pc_desc['eye size'] = ' large,'
+		$pc_desc['eye size'] = 'large'
 		$pc_descWordy['eye size'] = 'large, expressive'
 		$pc_descWordy['eye size'] = 'large, expressive'
 		$glaza = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 		$glaza = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	else
 	else

+ 1 - 6
locations/vanrPar.qsrc

@@ -81,12 +81,7 @@ if $ARGS[0] = 'peek':
 		*clr & cla
 		*clr & cla
 		brother_ev1 = daystart
 		brother_ev1 = daystart
 		'Despite the pattering sound of the water, you hear the bathroom door creaking open slightly. Through the crack in the door, you notice your brother Kolka watching you.'
 		'Despite the pattering sound of the water, you hear the bathroom door creaking open slightly. Through the crack in the door, you notice your brother Kolka watching you.'
-		gs 'willpower', 'exhib', 'resist', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Scream (<<will_cost>> Willpower)': gs 'willpower', 'exhib', 'resist', 'easy' & gs 'willpower', 'pay', 'resist' & gt 'brother', 'brother_go_away'
-		else
-			act 'Scream (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
+		act 'Scream':gt 'brother', 'brother_go_away'
 		
 		
 		if brothershowertalk < 1: act 'Tell him off':gt 'brother','brother_go_away2'
 		if brothershowertalk < 1: act 'Tell him off':gt 'brother','brother_go_away2'