Browse Source

[fixed] no more custom start stuck naked and unable to put back on the default school uniform. still allow players to start with no other clothes but put warning on screen if this will happen

sovietmercader 4 years ago
parent
commit
e7d7708c8f
2 changed files with 7 additions and 7 deletions
  1. 3 3
      locations/clothing.qsrc
  2. 4 4
      locations/preSYS2.qsrc

+ 3 - 3
locations/clothing.qsrc

@@ -223,9 +223,6 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if $ARGS[2] = 'gm_cheap':
 			$ward_list_store = $ARGS[2]
-
-			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and schoolS[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
-
 			i = 1
 			:loopcheap
 				if cheap[i] = 1 and cheapS[i] = cloc and ($clothingworntype ! 'cheap' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cheap', i)
@@ -250,6 +247,9 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if $ARGS[2] = 'gm_school':
 			$ward_list_store = $ARGS[2]
+
+			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and schoolS[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
+
 			i = 1
 			:loopschool
 				if school[i] = 1 and schoolS[i] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)

+ 4 - 4
locations/preSYS2.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'start':
 	if genbsize = '': genbsize = 22
 	if $soc_grup = '':gs 'preSYS2', 'none'
+	if pcs_inhib > 50: '<font color="red">Attention: You are starting a character with greater than 50 inhibition. You will not have any clothes besides the default school uniform. Make sure to buy clothes before removing this uniform or you may be stuck naked.</font>'
 	act 'Pick a social group': gt 'preSYS2','modgrup'
 	act 'Set attributes': gt 'preSYS2','modatt'
 	act 'Set skills': gt 'preSYS2','modskl'
@@ -13,10 +14,9 @@ if $ARGS[0] = 'start':
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'preSYS2','start'
 	act 'Return to preset character menu': gt 'preSYS', 'charselect'
 	act 'Confirm these options':
-		pcs_inhib = 100 - pcs_inhib
 		if pcs_inhib < 10: pcs_inhib = 10
-		!!This line should get sveta to wear school uniform because she has no other clothing with >=40
-		if pcs_inhib >= 40: gs 'clothing', 'wear', 'school', 6
+		!!This line should get sveta to wear school uniform because she has no other clothing with > 50
+		if pcs_inhib > 50: gs 'clothing', 'wear', 'school', 6
 		if bag = 1:
 			!!using current combination should prevent having more than 1 bag at the start of game.
 			dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
@@ -518,7 +518,7 @@ if $ARGS[0] = 'none':
 	pcs_chrsm = 30
 	pcs_prcptn = 30
 	pcs_grade = 75
-	pcs_inhib = 90	
+	pcs_inhib = 10
 	pcs_heel = 5
 
 	!!Mental Skills Reset