Przeglądaj źródła

[fixed] clothing recovery for swamp_yard exit
[changed] burlap (US) to hessian (world) in swamp_yard.
[changed] rescued in forest exit to forest entry for clothing recovery when naked and minor grammar changes in gadforestlost
[cleanup] formatting of swamp file.

3xpurt 6 lat temu
rodzic
commit
b3eaa894c2
3 zmienionych plików z 31 dodań i 27 usunięć
  1. 16 13
      locations/gadforestlost.qsrc
  2. 9 9
      locations/swamp.qsrc
  3. 6 5
      locations/swamp_yard.qsrc

+ 16 - 13
locations/gadforestlost.qsrc

@@ -23,8 +23,12 @@ if $ARGS[0] = 'forestrescue':
 			'Staying in one place is a good idea when you are lost.'
 			'Staying in one place is a good idea when you are lost.'
 		end
 		end
 	end
 	end
-	'You get ready quickly and you follow the forest ranger home.'
-	act 'Further':gt'Gadhouse'
+	'You get ready quickly and you follow the forest ranger out of the woods.'
+	if $clothingworntype ! 'nude':
+		act 'Further':gt'Gadhouse'
+	elseif $clothingworntype = 'nude':
+		act 'Further':gt'gadforest', '1'
+	end
 end
 end
 if $ARGS[0] = '1':
 if $ARGS[0] = '1':
 	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 7: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
 	if StoryLine = 1 and forest_lostday > 0 and daystart > forest_lostday and rand(1,10)> 7: gt 'gadforestlost', 'forestrescue' & !add rescue by illume
@@ -53,9 +57,9 @@ if $ARGS[0] = '1':
 
 
 		gs 'gadforestlost', 'lostclothes'
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
 		if goforest > lostrand:
-			act 'Look for the road on':gs 'gadforestlost', 'gadforestlostfinish1'
+			act 'Look for the road':gs 'gadforestlost', 'gadforestlostfinish1'
 		else
 		else
-			act 'Look for the road on':gt 'gadforestlost','1'
+			act 'Look for the road':gt 'gadforestlost','1'
 		end
 		end
 		act 'To take a break':gt 'gadforestrelax'
 		act 'To take a break':gt 'gadforestrelax'
 	end
 	end
@@ -88,9 +92,9 @@ if $ARGS[0] = '2':
 
 
 		gs 'gadforestlost', 'lostclothes'
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
 		if goforest > lostrand:
-			act 'Look for the road on ':gs 'gadforestlost', 'gadforestlostfinish2'
+			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish2'
 		else
 		else
-			act 'Look for the road on':gt 'gadforestlost','2'
+			act 'Look for the road':gt 'gadforestlost','2'
 		end
 		end
 		act 'To take a break':gt 'gadforestrelax'
 		act 'To take a break':gt 'gadforestrelax'
 	end
 	end
@@ -122,9 +126,9 @@ if $ARGS[0] = '3':
 
 
 		gs 'gadforestlost', 'lostclothes'
 		gs 'gadforestlost', 'lostclothes'
 		if goforest > lostrand:
 		if goforest > lostrand:
-			act 'Look for the road on ':gs 'gadforestlost', 'gadforestlostfinish3'
+			act 'Look for the road ':gs 'gadforestlost', 'gadforestlostfinish3'
 		else
 		else
-			act 'Look for the road on':gt 'gadforestlost','3'
+			act 'Look for the road':gt 'gadforestlost','3'
 		end
 		end
 		act 'To take a break':gt 'gadforestrelax'
 		act 'To take a break':gt 'gadforestrelax'
 	end
 	end
@@ -157,7 +161,7 @@ if $ARGS[0] = '4':
 		gs 'stat'
 		gs 'stat'
 
 
 		gs 'gadforestlost', 'lostclothes'
 		gs 'gadforestlost', 'lostclothes'
-		act 'Look for the road on ':
+		act 'Look for the road ':
 			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
@@ -196,7 +200,7 @@ end
 if $ARGS[0] = 'gadforestlostfinish':
 if $ARGS[0] = 'gadforestlostfinish':
 	'<center><H4>Somewhere in the woods</H4></center>'
 	'<center><H4>Somewhere in the woods</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadjoy.jpg"></center>'
-	'You look over and realize that you finally see houses, glad to get out of this alive you rush forward.'
+	'You look over and realize that you finally see lights shining from distnat houses, glad to get out of this alive you rush forward.'
 	!clear lost flags by illume, clear dirtyclothes flag by rachels
 	!clear lost flags by illume, clear dirtyclothes flag by rachels
 	lost_girl = 0
 	lost_girl = 0
 	dirtyclothes = 0 & swamp_clothes = 0
 	dirtyclothes = 0 & swamp_clothes = 0
@@ -205,10 +209,9 @@ if $ARGS[0] = 'gadforestlostfinish':
 	if $clothingworntype = 'nude':
 	if $clothingworntype = 'nude':
 		act 'Out of the woods':
 		act 'Out of the woods':
 			minut += 25
 			minut += 25
-			'You sneak out the woods, hiding your naked body in shadow and moving toward grandparents house.'
-			'You Successfully reach home without witness.'
+			'You find your way out of the woods, hiding your naked body in shadow and moving toward the edge of the forest, where you left your clothes.'
 			cla
 			cla
-			act 'Further':gt'Gadhouse'
+			act 'Continue':gt'gadforest', '1'
 		end
 		end
 		temp=0
 		temp=0
 		!disable further act add.
 		!disable further act add.

+ 9 - 9
locations/swamp.qsrc

@@ -10,7 +10,7 @@ new_bilberry = 0
 gs'stat'
 gs'stat'
 !gs'time'
 !gs'time'
 goswamp = 1
 goswamp = 1
-	
+
 '<center><H4>Swamp</H4></center>'
 '<center><H4>Swamp</H4></center>'
 if month >= 4 and month <= 10:
 if month >= 4 and month <= 10:
 	if hour >= 6 and hour < 22:
 	if hour >= 6 and hour < 22:
@@ -32,20 +32,20 @@ end
 if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
 if hour >= 6 and hour <= 21 and month >= 6 and month <= 9:
 	act 'Walk into the forest':swamp_clothes = 0 & minut += 30 & gt 'gadforest','4'
 	act 'Walk into the forest':swamp_clothes = 0 & minut += 30 & gt 'gadforest','4'
 end
 end
-if hour >= 6 and hour < 21:	
-    act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & minut += 150 & gt 'gadforest','1'
+if hour >= 6 and hour < 21:
+	act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & minut += 150 & gt 'gadforest','1'
 else
 else
-    act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & gt 'gadforest_event', 'forest_road'
+	act 'Return to the edge of the forest':swamp_clothes = 0 & hanters = 0 & gt 'gadforest_event', 'forest_road'
 end
 end
 
 
 if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swamp_day ! daystart:
 if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10 and swamp_day ! daystart:
-   	act 'Look for berries (0:30)':
-   	    cla
-        *clr
+	act 'Look for berries (0:30)':
+		cla
+		*clr
 		minut += 30
 		minut += 30
 		temp = RAND(1,2)
 		temp = RAND(1,2)
 		swamp_day = daystart
 		swamp_day = daystart
-		if goforest < 20:goforest += rand(0,1)		
+		if goforest < 20:goforest += rand(0,1)
 		new_bilberry += rand(4,5)
 		new_bilberry += rand(4,5)
 		bilberry += new_bilberry
 		bilberry += new_bilberry
 		pcs_mood += 5
 		pcs_mood += 5
@@ -54,7 +54,7 @@ if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry
 		gs 'gadforest', 'clothes1'
 		gs 'gadforest', 'clothes1'
 		'You spend half an hour wandering through the woods in search of mushrooms or berries and manage to found <<new_bilberry>> kg of berries.'
 		'You spend half an hour wandering through the woods in search of mushrooms or berries and manage to found <<new_bilberry>> kg of berries.'
 		act 'Further': gt'swamp'
 		act 'Further': gt'swamp'
- 	end
+	end
 end
 end
 
 
 --- swamp ---------------------------------
 --- swamp ---------------------------------

+ 6 - 5
locations/swamp_yard.qsrc

@@ -218,24 +218,24 @@ if hanterhelp = 2 and hantersKnow = 0:
 
 
 	!swamp_clothes - temporary clothing if he came naked
 	!swamp_clothes - temporary clothing if he came naked
 	if $clothingworntype = 'nude' and hantersKnowSlut = 0:
 	if $clothingworntype = 'nude' and hantersKnowSlut = 0:
-		act 'Take the burlap and walk away':
+		act 'Take the hessian and walk away':
 			*clr & cla
 			*clr & cla
 			hanterhelp = 0
 			hanterhelp = 0
 			swamp_clothes = 1
 			swamp_clothes = 1
 			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 			gs 'stat'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-			'You thank them and quickly cover yourself with the piece of burlap... It''s not much but it''s at least better than nothing.'
+			'You thank them and quickly cover yourself with the piece of hessian... It''s not much but it''s at least better than nothing.'
 			act'Further':gt 'swamp_yard'
 			act'Further':gt 'swamp_yard'
 		end
 		end
-		act 'Take the burlap and stay':
+		act 'Take the hessian and stay':
 			*clr & cla
 			*clr & cla
 			hanterhelp = 0
 			hanterhelp = 0
 			swamp_clothes = 1
 			swamp_clothes = 1
 			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 			gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 			gs 'stat'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-			'You thank them and quickly cover yourself with the piece of burlap... It''s not much but it''s at least better than nothing.'
+			'You thank them and quickly cover yourself with the piece of hessian... It''s not much but it''s at least better than nothing.'
 			act'Further':gt 'hanters', 'start'
 			act'Further':gt 'hanters', 'start'
 		end
 		end
 	else
 	else
@@ -403,7 +403,7 @@ if hour >= 8 and hour < 20:
 					minut+=5
 					minut+=5
 					swamp_clothes = 1
 					swamp_clothes = 1
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/tkan_cloth.jpg"></center>'
-					'You quickly rush inside the hut and hide behind a piece of burlap... It''s not much, but at least it''s better than nothing.'
+					'You quickly rush inside the hut and hide behind a piece of hessian... It''s not much, but at least it''s better than nothing.'
 					act'Further':gt 'swamphouse'
 					act'Further':gt 'swamphouse'
 				end
 				end
 			end
 			end
@@ -1022,6 +1022,7 @@ if StoryLine = 1 and lost_girl > 0 and daystart > lost_girl:
 	forest_lostday = 0
 	forest_lostday = 0
 	dirtyclothes = 0 & swamp_clothes = 0
 	dirtyclothes = 0 & swamp_clothes = 0
 	hanters = 0
 	hanters = 0
+	gs 'clothing', 'recover_lost_clothes', 'swamphouse', 1
 	gs 'stat'
 	gs 'stat'
 
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/forester.jpg"></center>'