Răsfoiți Sursa

Merge branch 'master' of pikdum/glife into master

[fixed] Few more fixes for filename case sensitivity
Kevin_Smarts 2 ani în urmă
părinte
comite
938db7cd09
3 a modificat fișierele cu 18 adăugiri și 18 ștergeri
  1. 1 1
      locations/natbel_chat.qsrc
  2. 1 1
      locations/natbel_friend.qsrc
  3. 16 16
      locations/soniahome.qsrc

+ 1 - 1
locations/natbel_chat.qsrc

@@ -306,7 +306,7 @@ if $ARGS[0] = 'chat':
 			act 'You spot some fashion magazines':
 				*clr & cla
 				minut += 15
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha6.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/Natasha6.jpg"></center>'
 				'You give Natasha a supportive hug and an encouraging smile. Wanting to change the subject, your eyes wander around her room and you notice some magazines on her desk. "Oh, what are these?" you ask as you walk over and take a closer look.'
 				'"Some fashion magazines I picked up," she says with a smile crossing her face. "Do you want to look through them with me?"'
 				'You agree, thinking it would be a good distraction from talking about debts and Christina.'

+ 1 - 1
locations/natbel_friend.qsrc

@@ -260,7 +260,7 @@ if $ARGS[0] = 'shopping_spree':
 						minut += 30
 						money -= 1300
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha11.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/Natasha11.jpg"></center>'
 						'The two of you make your way to G&M and start looking for clothes, with a focus on dresses.'
 						'You spend several minutes picking and choosing between various outfits until you have a small assortment of clothes that you can both agree on. Natasha steps into the dressing room to change, stepping out to show off each dress.'
 						'Natasha has difficulty choosing between three of the outfits and asks for you to make the final choice. You decide on a nice party dress. "Okay, <<$pcs_nickname>>," she says, smiling. "Then that''s the one. It''ll look much nicer than what I''ve currently got at home."'

+ 16 - 16
locations/soniahome.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'home':
 	*clr & cla
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/house_front.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/house_front.jpg"></center>'
 	'You approach Sonia''s house, walking up the pathway through a small well-cared garden with various flowers and shrubs towards a grey, wooden-clad house, which is equally well-cared for.'
 	if hour >= 22:
 		'It would be rude to even knock on the door at this time. Sonia is probably asleep, so you decide against it and lower your hand.'
@@ -42,12 +42,12 @@ if $ARGS[0] = 'home':
 		DoorOpenedBy = rand(0,3)
 		if soniaPS > 0 or DoorOpenedBy = 0:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 			'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Sonia is not here, but she should be home later. You can call her then," she says before politely closing the door, not inviting you in.'
 			act 'Leave': gt 'pav_residential'
 		elseif DoorOpenedBy = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/tkachenko.jpg"></center>'
 			if soniaQW['tkachenko'] = 0:
 				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello, can I help you?" she asks.'
 				'You smile at her. "Hi, I''m <<$pcs_nickname>>, one of Sonia''s classmates. Is she here?"'
@@ -63,7 +63,7 @@ if $ARGS[0] = 'home':
 			end
 		elseif DoorOpenedBy = 2:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/shulyov.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/shulyov.jpg"></center>'
 			if soniaQW['shulyov'] = 0:
 				if hotcat >= 6:
 					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by a young, good-looking man about your sister''s age who has a friendly smile. "Hello. Can I help you?" he asks as he looks you over with hungry eyes.'
@@ -108,7 +108,7 @@ if $ARGS[0] = 'hallway':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Hallway</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hall.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/hall.jpg"></center>'
 	'You enter a small bright hallway with a door to the lounge on your right and a staircase at the end leading to the bedrooms and bathroom upstairs. There''s also a door to the kitchen in front of you.'
 	act 'Go to Sonia''s bedroom': gt 'soniahome','sonia_room'
 	act 'Go to the bathroom': gt 'soniahome','bathroom'
@@ -129,7 +129,7 @@ if $ARGS[0] = 'bathroom':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bathroom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/bathroom.jpg"></center>'
 	'You enter the bathroom, which is fully tiled with a grey-and-white colour scheme. Whilst reasonably small, it''s very tastefully decorated. It''s a fairly typical bathroom, but this might be the cleanest one you''ve ever been in. It looks practically brand new and smells lovely.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
@@ -167,7 +167,7 @@ if $ARGS[0] = 'kitchen':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/kitchen.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/kitchen.jpg"></center>'
 	'As you enter the kitchen, you notice that whilst it isn''t large, it''s very tastefully done and has everything needed. It also has a dining table adjacent to it for family meals.'
 	act 'Go to the hallway':gt 'soniahome','hallway'
 	act 'Look in the fridge': gt 'soniahome', 'fridge'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'livingroom':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/living_room.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/living_room.jpg"></center>'
 	'You walk into a small but comfortable lounge which is very clean and tidy. You see the TV in the corner and a cosy family settee on the opposite wall facing a fireplace, giving the room a warm and comfortable look.'
 
 	act 'Leave':gt 'soniahome','hallway'		
@@ -344,7 +344,7 @@ if $ARGS[0] = 'soniaparents':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Sonia''s parent''s room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/parents_bedroom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/parents_bedroom.jpg"></center>'
 	'You look into Sonia''s parents'' bedroom and see that, as with the rest of the house, it''s spotless, tidy, and tastefully decorated, making the most of the available space. There''s a wardrobe to your right and the bed on the left, with a chest of drawers and a beautiful fireplace.'
 	if hour < 6:
 		gt 'soniahome', 'timecheck'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'soniaparents':
 				*clr & cla
 				minut += 10
 				'<center><b><font color = maroon>Sonia''s parent''s room</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/momsdrawer.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/momsdrawer.jpg"></center>'
 				'You snoop around, opening drawers and looking in the closet. Even though you hope to find something, you don''t see anything interesting. The room is perfectly organized, with each drawer containing a type of clothing neatly folded up. Other than that, there seems to be nothing of interest.'
 				act 'Leave':gt 'soniahome','hallway'
 			end
@@ -383,7 +383,7 @@ if $ARGS[0] = 'soniabrother':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Shulyov''s room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hall.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/hall.jpg"></center>'
 	'You try the door but it is locked.'
 	act 'Leave':gt 'soniahome','hallway'
 end
@@ -400,7 +400,7 @@ if $ARGS[0] = 'sonia_room':
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Vitek''s bedroom</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_room.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_room.jpg"></center>'
 	'The first thing you notice about her room is it is spotless and orderly. Nothing is out of place in the room. There is a dresser against one wall with several things neatly placed on it, with pictures on the wall above it. The bed is near the centre of the room against one wall, and the bed is made with a body pillow leaning against the other pillows. Above the bed is a short string of lights. Along one of the other walls is a small makeup table that is clean, with all the makeup visibly lined up in a very orderly fashion.'
 	'<a href="exec:gt ''soniahome'', ''sonia_chat''">Sonia</a> is lying on her bed relaxing.'
 	act 'Go to the hallway':gt 'soniahome','hallway'
@@ -412,14 +412,14 @@ if $ARGS[0] = 'sonia_chat':
 	*clr & cla
 	minut += 2
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 	'You sit on the bed next to Sonia and look around her room as she starts chatting about something she recently read in a magazine.'
 	act 'Stop talking': gt 'soniahome','sonia_room'
 	act 'Make small talk':
 		*clr & cla
 		minut += 5
 		gs 'npc_relationship', 'modify', 'A25', 'like'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'You talk with Sonia about various things, mostly about fashion, your mutual friends, or school in general.'
 		act 'Stop talking': gt 'soniahome','sonia_room'
 		act 'Keep talking': gt 'soniahome', 'sonia_chat'
@@ -428,7 +428,7 @@ if $ARGS[0] = 'sonia_chat':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A25', 'like'
 		minut += 5
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"What do you plan to do after school?" you ask.'
 		'She looks at you with a huge smile. "I want to go to the university in the city. How about you?"'
 		'You shrug. "I haven''t decided yet. What do you plan to study?"'
@@ -440,7 +440,7 @@ if $ARGS[0] = 'sonia_chat':
 	act 'Ask what she''s been up to':
 		*clr & cla
 		gs 'npc_relationship', 'modify', 'A25', 'like'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniaHome/sonia_bedroom/sonia_bed.jpg"></center>'
 		'"So, what have you been up to lately?" you ask.'
 		'She sighs dramatically. "Mostly trying to find some fun and avoid my parents. I think I''ll hang myself if I hear one more speech about how a proper young lady has to act." She ends with a giggle.'
 		'You smile at her. "Well, don''t do that. You have too pretty of a neck to bruise." You both laugh at that. "But seriously, I understand. My mom is insanely overbearing as well."'