Browse Source

Merge remote-tracking branch 'Anya/master'

Kevin_Smarts 2 years ago
parent
commit
bd0bcc39de
3 changed files with 26 additions and 25 deletions
  1. 4 3
      locations/gadhouse.qsrc
  2. 11 11
      locations/lariska_schedule.qsrc
  3. 11 11
      locations/uni_library.qsrc

+ 4 - 3
locations/gadhouse.qsrc

@@ -440,10 +440,11 @@ if $ARGS[0] = 'main':
 
 	if (hour >= 6 and hour < 10) or (hour >= 12 and hour < 20): act 'Talk to Grandma':gt 'gadhouse','grandma'
 	if (hour >= 6 and hour < 13) or (hour >= 15 and hour < 20): act 'Talk to Grandpa':gt 'gadhouse','grandpa'
-	act 'Prepare a full meal (0:30)':gs 'food', 'm_meal'
-	act 'Prepare a light meal (0:25)':gs 'food', 's_meal'
-	act 'Have a snack (0:15)':gs 'food', 'snack'
+	act 'Eat a hearty meal (0:20)':gs 'food', 'l_meal'
+	act 'Eat a normal meal (0:15)':gs 'food', 'm_meal'
+	act 'Eat a light meal (0:10)':gs 'food', 's_meal'
 
+	dynamic $edasnack
 	dynamic $sandwich
 	dynamic $driwater
 	dynamic $dritea

+ 11 - 11
locations/lariska_schedule.qsrc

@@ -14,7 +14,7 @@ if SchoolAtestat = 0 and kanikuli = 0:
 			!!Bedroom - Getting Dressed
 			lariloc = 2
 			lariloc['athome'] = 1
-		elseif hour = 7 and minut < 15:
+		elseif hour = 7 and minut <= 15:
 			!!Kitchen - Breakfast
 			lariloc = 3
 			lariloc['athome'] = 1
@@ -60,11 +60,11 @@ if SchoolAtestat = 0 and kanikuli = 0:
 			!!Kitchen - Cooking Dinner
 			lariloc = 11
 			lariloc['athome'] = 1
-		elseif hour < 19:
+		elseif hour <= 19:
 			!!Kitchen - Eating Dinner
 			lariloc = 12
 			lariloc['athome'] = 1
-		elseif hour = 19 and minut < 30:
+		elseif hour = 19 and minut <= 30:
 			!!Bathroom - Shower
 			lariloc = 13
 			lariloc['athome'] = 0
@@ -82,7 +82,7 @@ if SchoolAtestat = 0 and kanikuli = 0:
 			!!Bedroom - Asleep
 			lariloc = 1
 			lariloc['athome'] = 0
-		elseif hour = 9 and minut < 15:
+		elseif hour = 9 and minut <= 15:
 			!!Kitchen - Breakfast
 			lariloc = 3
 			lariloc['athome'] = 1
@@ -112,7 +112,7 @@ if SchoolAtestat = 0 and kanikuli = 0:
 				lariloc = 14
 				lariloc['athome'] = 1
 			end
-		elseif hour = 22 and minut < 30:
+		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
 			lariloc = 12
 			lariloc['athome'] = 1
@@ -130,7 +130,7 @@ if SchoolAtestat = 0 and kanikuli = 0:
 			!!Bedroom - Asleep
 			lariloc = 1
 			lariloc['athome'] = 0
-		elseif hour = 9 and minut < 15:
+		elseif hour = 9 and minut <= 15:
 			!!Kitchen - Breakfast
 			lariloc = 3
 			lariloc['athome'] = 1
@@ -170,7 +170,7 @@ if SchoolAtestat = 0 and kanikuli = 0:
 			!!Living Room - Watching TV
 			lariloc = 14
 			lariloc['athome'] = 1
-		elseif hour = 22 and minut < 30:
+		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
 			lariloc = 13
 			lariloc['athome'] = 0
@@ -210,11 +210,11 @@ else
 			!!Bedroom - Hanging Out
 			lariloc = 22
 			lariloc['athome'] = 1
-		elseif hour = 17 and minut > 45:
+		elseif hour < 22:
 			!!Living Room - Watching TV
 			lariloc = 14
 			lariloc['athome'] = 1
-		elseif hour = 22 and minut < 30:
+		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
 			lariloc = 12
 			lariloc['athome'] = 1
@@ -238,7 +238,7 @@ else
 			!!Bedroom - Asleep
 			lariloc = 1
 			lariloc['athome'] = 0
-		elseif hour = 9 and minut < 15:
+		elseif hour = 9 and minut <= 15:
 			!!Kitchen - Breakfast
 			lariloc = 3
 			lariloc['athome'] = 1
@@ -278,7 +278,7 @@ else
 			!!Living Room - Watching TV
 			lariloc = 14
 			lariloc['athome'] = 1
-		elseif hour = 22 and minut < 30:
+		elseif hour = 22 and minut <= 30:
 			!!Kitchen - Dinner
 			lariloc = 12
 			lariloc['athome'] = 1

+ 11 - 11
locations/uni_library.qsrc

@@ -100,53 +100,53 @@ if $ARGS[0] = 'wander':
 	'<center><b><font color="maroon">The University Library</font></b></center>'
 	temp = rand(1,20)
 	if temp = 1:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/accident_panty_flash.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/accident_panty_flash.jpg"></center>'
 		'As you wander around you spot two girls in one of the rows of books, one of them starts climbing the shelf to get at a book out of reach, as she does her short skirt climbs up her thighs, showing off her panties to everyone looking. You can''t help but smile a bit at that as you continue on.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 2:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/accident_pussy_flash.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/accident_pussy_flash.jpg"></center>'
 		'As you wander around you spot a girl in one of the rows of books, she starts climbing the shelf to get at a book out of reach, as she does her short skirt climbs up her thighs, showing off her pussy to everyone looking, obviously she thought a short skirt and no panties was a good combo. You can''t help but smile a bit at that as you continue on.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 3:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/asian_titflash.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/asian_titflash.jpg"></center>'
 		'As you wander around stop just inside of one of the rows of books before it opens up into another one of the small study area''s. Before you is several guys sitting at a table encouraging a Asian girl to pull up her shirt. She keeps telling them no, but you can tell she is getting aroused and excited at the attention they are giving her. Finally blushing a bit, she pulls up her shirt and holds it up for a bit showing off her firm little titties. The guys all grin and quietly clap, after a few moments she blushes even redder and pulls her shirt down and walks away, you wonder if she regrets doing it or not. After a few more moments you continue on your way.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 4:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/black_titflash.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/black_titflash.jpg"></center>'
 		'As you wander around stop just inside of one of the rows of books before it opens up into another one of the small study area''s. Before you is several guys sitting at a table encouraging a chubby black girl to pull up her shirt. She keeps telling them no, but you can tell she is getting aroused and excited at the attention they are giving her. Finally she exposes her large saggy tits to them. The guys all grin and quietly clap, after a few moments she puts her tits away and goes back to studying, you wonder if she regrets doing it or not. After a few more moments you continue on your way.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 5:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/girl_sleeping.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/girl_sleeping.jpg"></center>'
 		'As you wander you spot a girl with her head down on one of the work stations, apparently having fallen asleep while studying. She snores softly, a few other students occasionally glance over and laugh softly at her. You shake your head and leave the girl to sleep in peace.'
 	elseif temp = 6:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/laying_in_row.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/laying_in_row.jpg"></center>'
 		'As you wander you start down one of the rows only to find a girl laying in the middle of the isle on her stomach reading a book. She glances up briefly at you, then goes back to reading her book ignore you. Not able to easily get past her and it would be rude to try and step over her, even if she is being rude in the first place. You decided to just skip down to the next isle of books and continue your wandering.'
 	elseif temp = 7:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/naked_run.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/naked_run.jpg"></center>'
 		'As you wander you glance what appears to be a naked girl dash between two isles of books, you glance down the isle she went down and sure enough you see the back side of a naked girl running down the isle. You have no clue where her clothes are or why she is doing it, but with how fast she is running you doubt she is enjoying it. She quickly disappears down another row of shelves.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 8:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/naked_walk.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/naked_walk.jpg"></center>'
 		'As you turn to head down a isle you come nearly face to face with a pretty blond girl standing there naked. She just smiles to you saying hello, you respond with hello back and then she walks past you like nothing is wrong. You shake your head and continue on your way, a few moments later you run across a guy holding a handful of girls clothes, he keeps glancing down each isle, you can only assume he is looking for the naked girl you seen. So you point in the direction you saw her, he smiles and nods, then starts jogging in that direction.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 9:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/pussy_flash.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/pussy_flash.jpg"></center>'
 		'As you wander you go through one of the small study area''s. Before you is several guys sitting at a table encouraging a girl standing just inside of one of the isles to flash them. She keeps telling them no, but you can tell she is getting aroused and excited at the attention they are giving her. Finally she lifts her skirt and flashes them her neatly trimmed pussy. One of the guys briefly woops loudly, and is promptly hit by his friends to be quiet. Several others look over at the boys, but the girl has already dropped her skirt back in place and with a huge grin walks off. You wonder if she regrets doing it or not, as you continue on your way.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 10:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/tit_flash.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/tit_flash.jpg"></center>'
 		'As you wander you go through one of the small study area''s. Before you is several guys sitting at a table encouraging a girl standing just inside of one of the isles to flash them. She keeps telling them no, but you can tell she is getting aroused and excited at the attention they are giving her. Finally she lifts her shirt and flashes them her firm titties. One of the guys briefly woops loudly, and is promptly hit by his friends to be quiet. Several others look over at the boys, but the girl has already dropped her skirt back in place and with a huge grin walks off. You wonder if she regrets doing it or not, as you continue on your way.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 	elseif temp = 11:
-		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/event/sex/bj.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/events/sex/bj.jpg"></center>'
 		'As you walk around you hear some moaning, you glancing down one of the rows of shelves and see a boy sitting at one of the work stations. It takes a moment for you to notice the girl under the desk on her knee''s bobbing her head up and down in his lap. She is obviously giving him a blow job and he is doing his best to be quiet but failing at it. You watch for a few more moments feeling aroused at the scene before you decided to move on, before you are noticed.'
 		gs 'arousal', 'erotic', 3
 		gs 'stat'