KevinSmarts 9 лет назад
Родитель
Сommit
5998c02f34
4 измененных файлов с 14 добавлено и 16 удалено
  1. 2 0
      locations/alterStart
  2. 1 2
      locations/famdorfride
  3. 2 4
      locations/farmhomeride
  4. 9 10
      locations/gdksport

+ 2 - 0
locations/alterStart

@@ -302,6 +302,7 @@ $npcGo[26] = '<a href="exec:numnpc = 26 & GT ''Snpc''"><<$npcName[26]>> <<$npcSu
 $din_alter_start_ev15 = {
 	cls
 	gs 'fight', 'Wrestlergen'
+	if mesec > 0:isprok = 1
 	'<center><img src="images/pic/alterstart7.jpg"></center>'
 	'As with all girls, you reached the milestone of puberty. For you it started when you were 13 years old, like most normal girls. You had your first period, which sucked, but that was the start of your changes.'
 	*nl
@@ -363,6 +364,7 @@ $din_alter_start_ev15 = {
 $din_alter_start_ev = {
 	cls
 	gs 'fight', 'Wrestlergen'
+	if mesec > 0:isprok = 1
 	'<center><img src="images/pic/alterstart7.jpg"></center>'
 	'Your 13th year began like most other girls in your class. You occasionally got sick, you grew breasts, armpit and pubic hair. Your skin became greesy and you got pimples. When you finished with 9th grade you stayed in school, continuing on to tenth grade.'
 	'After a quiet tenth grade you spent your summer in the town of Pavlovsky. Soon the holidays came to an end and you returned to school, where you will spend your last year of study.'

+ 1 - 2
locations/famdorfride

@@ -1,6 +1,5 @@
 # famdorfride
-hour = 12
-minut = 0
+if hour < 12: hour = 12 & minut = 0
 gs 'stat'
 minut += 60
 gs 'stat'

+ 2 - 4
locations/farmhomeride

@@ -5,8 +5,7 @@ if month = 6 or month = 7 or month = 8:
 'Mom asks you "Well, <<$name>>, do you want to come home with us or spend summer in the village?"'
      act'Go home with your parents':
      cls
-     hour = 20
-	minut = 0
+	if hour < 20: hour = 20 & minut = 0
 	gs'stat'
 	minut += 60
 	gs'stat'
@@ -16,8 +15,7 @@ if month = 6 or month = 7 or month = 8:
      
      act'Stay in village':gt'Gadhouse'
 else
-	hour = 20
-	minut = 0
+	if hour < 20: hour = 20 & minut = 0
 	gs 'stat'
 	minut += 60
 	gs 'stat'

+ 9 - 10
locations/gdksport

@@ -47,28 +47,28 @@ if $ARGS[0] = 'start':
 	if albinaQWdance > 0 or gsAboDance > 0 or gsAboBeg > 0 or gsAboVolley > 0:
 		act 'Change clothes in the locker room':gt 'clothing', 'view_clothing_list', 'wardrobe'
 	end	
-	if  sport = 0 and (albinaQWdance > 0 or gsAboDance > 0 or gsAboBeg > 0 or gsAboVolley > 0):'You are not dressed in sports clothes.'
+	if  $clothingworntype ! 'exercise' and (albinaQWdance > 0 or gsAboDance > 0 or gsAboBeg > 0 or gsAboVolley > 0):'You are not dressed in sports clothes.'
 	if sweat >= 0:
 		act 'Wash in the shower':gt 'gdksport', 'shower'
 	end
 	if hour < 16 or hour > 20: exit
-	if gsAboDance > 0 and sport = 1 and albinaQWdance = 0: 
+	if gsAboDance > 0 and $clothingworntype = 'exercise' and albinaQWdance = 0: 
 		act 'Go to dance lesson, you have <<gsAboDance>> lessons remaining':gt 'gdksport', 'dance2'
 	end
-	if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0 and sport = 1:
+	if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0 and $clothingworntype = 'exercise':
 		act 'Train with Starlets':gt 'gdksport', 'starlets'
 	end
-	if gsAboBeg > 0 and sport = 1:
+	if gsAboBeg > 0 and $clothingworntype = 'exercise':
 		act 'Go to track lesson, you have <<gsAboBeg>> lessons remaining':gt 'gdksport', 'racing2'
 	end
-	if gsAboVolley > 0 and volleysostav = 0 and sport = 1:
+	if gsAboVolley > 0 and volleysostav = 0 and $clothingworntype = 'exercise':
 		if week ! 5:
 			act 'Go to volleyball lesson, you have <<gsAboVolley>> lessons remaining':gt 'gdksport', 'vball2'
 		else
 			act 'Go to volleyball lesson, you have <<gsAboVolley>> lessons remaining':gt 'gdksport', 'vball3'
 		end
 	end
-	if volleysostav > 0 and sport = 1:
+	if volleysostav > 0 and $clothingworntype = 'exercise':
 		if week ! 6 and volkomday ! daystart:
 			act 'To engage with the team':gt 'gdksport', 'vball4'
 		elseif week = 6 and sorevday ! daystart:
@@ -89,8 +89,8 @@ if $ARGS[0] = 'racing1':
 			gsAboBeg += 30
 			gs 'stat'
 			'You paid for 30 racing lessons.'
+			act 'Leave':gt 'gdksport', 'start'
 		end
-		act 'Leave':gt 'gdksport', 'start'
 	end
 
 	act 'Leave':gt 'gdksport', 'start'
@@ -108,8 +108,8 @@ if $ARGS[0] = 'dance1':
 			gsAboDance += 30
 			gs 'stat'
 			'You paid for 30 dance lessons.'
+			act 'Leave':gt 'gdksport', 'start'
 		end
-		act 'Leave':gt 'gdksport', 'start'
 	end
 
 	act 'Leave':gt 'gdksport', 'start'
@@ -127,8 +127,8 @@ if $ARGS[0] = 'vball1':
 			gsAboVolley += 30
 			gs 'stat'
 			'You paid for 30 volleyball lessons.'
+			act 'Leave':gt 'gdksport', 'start'
 		end
-		act 'Leave':gt 'gdksport', 'start'
 	end
 
 	act 'Leave':gt 'gdksport', 'start'
@@ -173,7 +173,6 @@ if $ARGS[0] = 'dance2':
 		elseif albinaQWdance = 0 and StoryLine ! 0 and grupNPC[23] > 20 and grupNPC <= 60: gt 'gdksport', 'albina2'
 		elseif albinaQWdance = 0 and StoryLine ! 0 and grupNPC[23] >= 60: gt 'gdksport', 'albina3'
 		end
-		act 'Leave':gt 'gdksport', 'start'
 	end
 	act 'Leave':gt 'gdksport', 'start'
 end