Browse Source

[text edit] small ones in fight and gadhouse
[fixes] you could still talk to people even after the dance in the community center is over (gdkin)
[fixes] wrong if condition in shulga_room

julzor 5 years ago
parent
commit
756430a17c
4 changed files with 8 additions and 9 deletions
  1. 1 1
      locations/Gadhouse.qsrc
  2. 4 4
      locations/fight.qsrc
  3. 2 1
      locations/gdkin.qsrc
  4. 1 3
      locations/shulga_room.qsrc

+ 1 - 1
locations/Gadhouse.qsrc

@@ -576,7 +576,7 @@ if $ARGS[0]='grandpa':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-				'"Listen carefully <<$pcs_nickname>>. You want to explore the forest and that''s great. But be sure of your surroundings, without having any knowledge of the forest you may easily get lost. Don''t go exploring too deep in the forest, because the mushrooms and berries can be found at the edge of the forest. If you chose to explore the forrest you''ll find a swamp in the middle of the forrest. You can find mushrooms and berries there too... Going into the forest at night is not recommended, wild boars may attack, and you might end up really hurt."'
+				'"Listen carefully <<$pcs_nickname>>. You want to explore the forest and that''s great. But be sure of your surroundings, without having any knowledge of the forest you may easily get lost. Don''t go exploring too deep in the forest, because the mushrooms and berries can be found at the edge of the forest. If you chose to explore the forest you''ll find a swamp in the middle of the forest. You can find mushrooms and berries there too... Going into the forest at night is not recommended, wild boars may attack, and you might end up really hurt."'
 				'"If you manage to get lost and can''t find your way out of the forest before it gets dark, then light a fire and sit still there until morning. The beasts in the forest are afraid of the fire, so they won''t approach you."'
 				'"There''s one more thing... While you''re in the woods, avoid dressing yourself up in fancy clothes. You might damage them. It''s better to dress in more comfortable clothes instead..."'
 				'"Well, I think that''s everything <<$pcs_nickname>>, run along now, and remember what I''ve told you."'

+ 4 - 4
locations/fight.qsrc

@@ -50,17 +50,17 @@ if $ARGS[0] = 'start':
 	end
 
 	if pcs_health <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red>You lost!</font></b>'
+		'<b><font color = red> You lost!</font></b>'
 
 		xgt'ender','loss'
 		exit
 	elseif healthV <= 0 and heartV = 0 and izanagiV = 0:
-		'<b><font color = green><<$boydesc>>You won!</font></b>'
+		'<b><font color = green><<$boydesc>> You won!</font></b>'
 
 		xgt'ender','win'
 		exit
 	elseif pcs_manna <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red>You won!</font></b>'
+		'<b><font color = red> You won!</font></b>'
 
 		xgt'ender','loss'
 		exit
@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 		xgt'ender','win'
 		exit
 	elseif pcs_willpwr <= 0 and heart = 0 and izanagi = 0:
-		'<b><font color = red>You lost!</font></b>'
+		'<b><font color = red> You lost!</font></b>'
 
 		xgt'ender','loss'
 		exit

+ 2 - 1
locations/gdkin.qsrc

@@ -194,11 +194,12 @@ if $ARGS[0] = '':
 
 			act 'Continue':gt 'gdkin'
 		end
+		act 'Look for your classmates': gs 'SgrupDisco'
 	elseif hour < 20:
 		'The Club closes. The main lights go on, the music fades and everyone beings to leave.'
 		act 'Go outside':gt 'gdk'
 	end
-	act 'Look for your classmates': gs 'SgrupDisco'
+	
 	act 'Go to the toilets': gt 'gdktoilet', 'start'
 end
 

+ 1 - 3
locations/shulga_room.qsrc

@@ -182,9 +182,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 
 		!If you came in dressed as a prostitute
-		if PCloStyle = 4 and sh_hooker_count > 0 and ((week < 5 and hour >= 20) or (week >= 6 and hour >= 10 and hour < 17) or (week = 7 and hour >= 20)):
-			gt 'shulga_room', 'sh_hooker'
-		end
+		if PCloStyle = 4 and sh_hooker_count > 0 and week < 5 and hour >= 20: gt 'shulga_room', 'sh_hooker'
 	end
 end