Browse Source

[fixed] bug fixes in forest and color help messages so hopefully players will read them and rebalanced being lost

sovietmercader 4 years ago
parent
commit
c6bfc4f90e
3 changed files with 41 additions and 35 deletions
  1. 15 15
      locations/gadforest.qsrc
  2. 25 19
      locations/gadforestlost.qsrc
  3. 1 1
      locations/swamp_yard.qsrc

+ 15 - 15
locations/gadforest.qsrc

@@ -48,9 +48,9 @@ if $ARGS[0] = 'forest_edge':
 	gs 'gadforest','bushcraft','forest_edge'
 	*nl
 	if pcs_bushcraft < 10:
-		'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+		'<font color="red">You don''t know this part of the forest very well. You could get lost if you go any deeper into the woods.</font>'
 	else
-		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+		'<font color="green">You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.</font>'
 	end
 
 	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
@@ -393,9 +393,9 @@ if $ARGS[0] = 'forest_outskirts':
 	gs 'gadforest','bushcraft','forest_outskirts'
 	*nl
 	if pcs_bushcraft < 20:
-		'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+		'<font color="red">You don''t know this part of the forest very well. You could get lost if you go any deeper into the woods.</font>'
 	else
-		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+		'<font color="green">You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.</font>'
 	end
 	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
 	if hour < 8 or hour > 16:
@@ -473,9 +473,9 @@ if $ARGS[0] = 'forest_center':
 	gs 'gadforest','bushcraft','forest_center'
 	*nl
 	if pcs_bushcraft < 30:
-		'You don''t know this part of the forest very well, it''s best if you don''t go any deeper into the woods.'
+		'<font color="red">You don''t know this part of the forest very well. You could get lost if you go any deeper into the woods.</font>'
 	else
-		'You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.'
+		'<font color="green">You are comfortable navigating this part of the forest, and can adventure deeper into the woods if you want.</font>'
 	end
 	if clothesAtLocation = 1:*nl & 'Your clothes are nearby on the ground.'
 	if hour < 8 or hour > 16:
@@ -524,7 +524,7 @@ if $ARGS[0] = 'bushcraft':
 	! torncloth_high_bushcraft - chance of tearing clothes with high bushcraft when visiting an area of the forest
 	! torncloth_low_bushcraft - chance of tearing clothes with low bushcraft when visiting an area of the forest
 	! Make sure Sveta always has at least 1 pcs_bushcraft
-	if pcs_bushcraft = 0:pcs_bushcraft = 1
+	if pcs_bushcraft <= 0:pcs_bushcraft = 1
 	if $ARGS[1] = 'forest_edge':
 		bushcraft_rand = 1
 		bushcraft_limit = 10
@@ -535,13 +535,13 @@ if $ARGS[0] = 'bushcraft':
 	elseif $ARGS[1] = 'forest_outskirts':
 		bushcraft_rand = 2
 		bushcraft_limit = 20
-		bushcraft_lost = 20
+		bushcraft_lost = 10
 		torncloth_high_bushcraft = 9
 		torncloth_low_bushcraft = 7
 	elseif $ARGS[1] = 'forest_center':
 		bushcraft_rand = 3
 		bushcraft_limit = 30
-		bushcraft_lost = 30
+		bushcraft_lost = 20
 		torncloth_high_bushcraft = 8
 		torncloth_low_bushcraft = 5
 	elseif $ARGS[1] = 'swamp_woods':
@@ -928,9 +928,9 @@ if $ARGS[0] = 'picking_clothes':
 			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
 		else
 			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
-			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
-			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
-			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
 		end
 	elseif $ARGS[2] = 'berry':
 		if MiraLoc = 3 and $ARGS[1] = 'forest_edge':
@@ -938,9 +938,9 @@ if $ARGS[0] = 'picking_clothes':
 			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom_nude'+rand(1,2)+'.jpg"></center>'
 		else
 			if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
-			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_'+rand(3,6)+'.jpg"></center>'
-			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_2.jpg"></center>'
-			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_1.jpg"></center>'
+			if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_'+rand(3,6)+'.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_2.jpg"></center>'
+			if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/blueberry_picking_1.jpg"></center>'
 		end
 	end
 end

+ 25 - 19
locations/gadforestlost.qsrc

@@ -23,10 +23,10 @@ if $ARGS[0] = 'forest_outskirts':
 
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
-	if foresteventrand <= (2+(bonfire*2)) and daystart > forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
-	if foresteventrand <= (4+(bonfire*2)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
-	if foresteventrand <= (6+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
-	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_outskirts'
+	if foresteventrand <= (2+(bonfire*3)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
+	if foresteventrand <= (4+(bonfire*3)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
+	if foresteventrand <= (6+(bonfire*3)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
+	if foresteventrand <= (8-(bonfire*3)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_outskirts'
 
 	gs 'gadforestlost', 'wander'
 
@@ -56,9 +56,9 @@ if $ARGS[0] = 'forest_center':
 
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
-	if foresteventrand <= (1+(bonfire*1)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
-	if foresteventrand <= (3+(bonfire*1)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
-	if foresteventrand <= (8-(bonfire*1)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_center'
+	if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
+	if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
+	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22) and foresteventday ! daystart: gt 'gadforestlost', 'wolves', 'forest_center'
 
 	gs 'gadforestlost', 'wander'
 
@@ -72,15 +72,15 @@ end
 ! Example: gs 'gadforestlost', 'bushcraft', 'forest_outskirts'
 if $ARGS[0] = 'bushcraft':
 	! Make sure Sveta always has at least 1 pcs_bushcraft
-	if pcs_bushcraft = 0:pcs_bushcraft = 1
+	if pcs_bushcraft <= 0:pcs_bushcraft = 1
 	if $ARGS[1] = 'forest_outskirts':
 		bushcraft_rand = 2
-		bushcraft_lost = 30
+		bushcraft_lost = 20
 		torncloth_high_bushcraft = 9
 		torncloth_low_bushcraft = 7
 	elseif $ARGS[1] = 'forest_center':
 		bushcraft_rand = 3
-		bushcraft_lost = 50
+		bushcraft_lost = 30
 		torncloth_high_bushcraft = 8
 		torncloth_low_bushcraft = 5
 	end
@@ -123,6 +123,8 @@ if $ARGS[0] = 'wander':
 					'After half an hour wandering around, you feel like all you''ve accomplished is walking in circles.'
 					act 'Continue':gt 'gadforestlost', $forest_args1
 				end
+			else
+				gt 'gadforestlost','finish', $forest_args1
 			end
 		end
 	end
@@ -148,14 +150,14 @@ if $ARGS[0] = 'relax':
 	if $forest_args1 = 'forest_outskirts':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,40)
-		if foresteventrand <= (2+(bonfire*2)) and daystart > forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
-		if foresteventrand <= (4+(bonfire*2)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (6+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (2+(bonfire*3)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
+		if foresteventrand <= (4+(bonfire*3)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (6+(bonfire*3)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	elseif $forest_args1 = 'forest_center':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,40)
-		if foresteventrand <= (1+(bonfire*1)) and daystart > forest_lostday+1 and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (3+(bonfire*1)) and StoryLine = 1 and daystart > forest_lostday+2 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
+		if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday+1 and foresteventday ! daystart: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	end
 
 	'<center><H4>Somewhere in the forest</H4></center>'
@@ -167,7 +169,11 @@ if $ARGS[0] = 'relax':
 	if $clothingworntype ! 'nude' and PCloSkirt > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
 	*nl
 	'You decide this is as good of place as any to stop and take a break.'
-
+	if bonfire = 0:
+		'<font color="red">You should build a bonfire to increase the chance of being rescued and decrease the chance of being attacked by wolves.</font>'
+	else
+		'<font color="green">Your bonfire burns bright, increasing the chance of being rescued and decreasing the chance of being attacked by wolves.</font>'
+	end
 	act 'Explore the forest': gt 'gadforestlost', $forest_args1
 
 	if bonfire = 0:
@@ -363,7 +369,7 @@ if $ARGS[0] = 'picking':
 				gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
 				*nl
 				'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-			elseif mushroom_pickers = mushroom_pickers_check
+			elseif mushroom_pickers = mushroom_pickers_check:
 				new_boletus += rand(0,max_boletus)
 				new_bilberry += rand(0,max_bilberry)
 				boletus += new_boletus
@@ -794,7 +800,7 @@ if $ARGS[0] = 'gadforestlost_picture':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_night0.'+rand(1,4)+'.jpg"></center>'
 			*nl
 			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
-			'With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.'
+			'<font color="red">With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.</font>'
 		end
 	else
 		if hour >= 8 and hour < 20:
@@ -806,7 +812,7 @@ if $ARGS[0] = 'gadforestlost_picture':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestlost_winter_night0.'+rand(1,4)+'.jpg"></center>'
 			*nl
 			'You are lost in the woods. You don''t recognize any of your surroundings and there aren''t any good landmarks to help pinpoint where you are.'
-			'With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.'
+			'<font color="red">With nightfall, your chances of finding your way are practically nothing. You should stop and rest until daylight.</font>'
 		end
 	end
 end

+ 1 - 1
locations/swamp_yard.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	!the chance of hitting GG, if she`s a slut
 	huntslutsexrand = rand(1,3)
 	!if lost make this trigger after 2 days in swamp house
-	if lost_girl = 1 and daystart > forest_lostday+2 and hour >= 8 and hour < 20: gt 'gadforestlost','rescue','ranger','swamp_yard'
+	if lost_girl = 1 and daystart > forest_lostday+1 and hour >= 8 and hour < 20: gt 'gadforestlost','rescue','ranger','swamp_yard'
 	dirty = 0
 	temp_sy = rand(1,10)