Kaynağa Gözat

[Bug Fix] loc and file path fixes.

Hooded Silence 1 ay önce
ebeveyn
işleme
5bcdb16684

+ 1 - 2
locations/bedrPar.qsrc

@@ -95,8 +95,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if func('homes_properties', 'can_live_here'):
 		if func('homes_properties', 'can_live_here'):
 			$setloc['StageTitle'] = 'Your bedroom'
 			$setloc['StageTitle'] = 'Your bedroom'
 		else		
 		else		
-			$setloc['StageTitle'] = 'Your old bedroom'
-			
+			$setloc['StageTitle'] = 'Your old bedroom'			
 		end
 		end
 		!! Display header and banner image
 		!! Display header and banner image
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"

+ 8 - 8
locations/bedrPar2.qsrc

@@ -6,8 +6,7 @@
 !! 
 !! 
 !! Desc: Paernts bedroom links to family flat corridor
 !! Desc: Paernts bedroom links to family flat corridor
 
 
-!! Call in location default actions
-gs 'home_family_init', 'init'
+
 
 
 !! Set location header - img path is set in init
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Bedroom'
 $setloc['StageTitle'] = 'Parents Bedroom'
@@ -18,9 +17,10 @@ $setloc['StageImage'] = '<<$default_img_path>>/bedrpar2.jpg'
 
 
 !! Set up game location data
 !! Set up game location data
 $locclass = 'bedr'
 $locclass = 'bedr'
-gs 'shortgs', 'setloc', 'bedrPar2', $ARGS[0]
+gs 'shortgs', 'setloc', 'bedrPar2', 'start'
 !! End location initialisation
 !! End location initialisation
-
+!! Call in location default actions
+gs 'home_family_init', 'init'
 
 
 !! Begin location content
 !! Begin location content
 
 
@@ -74,7 +74,7 @@ if $ARGS[0] = 'kamasutra':
 	*clr & cla
 	*clr & cla
 	menu_off = 1
 	menu_off = 1
 	minut += 1
 	minut += 1
-	'<center><img <<$set_imgh>> src="<<$default_img_path>>book.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/book.jpg"></center>'
 	'The cover says "Kama Sutra"'
 	'The cover says "Kama Sutra"'
 	act 'Leave': gt $loc, $loc_arg
 	act 'Leave': gt $loc, $loc_arg
 	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'
 	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'
@@ -95,7 +95,7 @@ end
 ! parent''s wardrobe
 ! parent''s wardrobe
 if $ARGS[0] = 'parents_wardrobe':
 if $ARGS[0] = 'parents_wardrobe':
 	*clr & cla
 	*clr & cla
-	'<center><img <<$set_imgh>> src="<<$default_img_path>>wardrobe.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/wardrobe.jpg"></center>'
 	'An old looking wardrobe, probably from the Soviet times.'
 	'An old looking wardrobe, probably from the Soviet times.'
 	act 'Leave ': gt $loc, $loc_arg
 	act 'Leave ': gt $loc, $loc_arg
 	act 'Rummage': gt 'bedrPar2', 'wardrobe_search'
 	act 'Rummage': gt 'bedrPar2', 'wardrobe_search'
@@ -109,14 +109,14 @@ if $ARGS[0] = 'wardrobe_search':
 		exit
 		exit
 	end
 	end
 	if rand(1,100) > 75:
 	if rand(1,100) > 75:
-		'<center><img <<$set_imgh>> src="<<$default_img_path>>wardrobesearch'+rand(1,4)+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/wardrobesearch'+rand(1,4)+'.jpg"></center>'
 		$failwords[0]= 'You don''t find anything interesting.'
 		$failwords[0]= 'You don''t find anything interesting.'
 		$failwords[1]= 'You find some clothes and underwear.'
 		$failwords[1]= 'You find some clothes and underwear.'
 		$failwords[2]= 'You dig through your mother''s closet, but find nothing interesting except underwear.'
 		$failwords[2]= 'You dig through your mother''s closet, but find nothing interesting except underwear.'
 		*pl $failwords[rand(0,2)]
 		*pl $failwords[rand(0,2)]
 		killvar '$failwords'
 		killvar '$failwords'
 	else
 	else
-		'<center><img <<$set_imgh>> src="<<$default_img_path>>wardrobetoy.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/wardrobetoy.jpg"></center>'
 		$findmomtoy[0]= 'Digging through the closet, you find a <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
 		$findmomtoy[0]= 'Digging through the closet, you find a <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
 		$findmomtoy[1]= 'Rummaging through your mother''s lingerie, you find a small <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
 		$findmomtoy[1]= 'Rummaging through your mother''s lingerie, you find a small <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
 		$findmomtoy[2]= 'You find your mother''s <a href="exec: gt ''bedrPar2'',''momtoy_play''">toy</a>.'
 		$findmomtoy[2]= 'You find your mother''s <a href="exec: gt ''bedrPar2'',''momtoy_play''">toy</a>.'

+ 0 - 2
locations/core_library.qsrc

@@ -1,6 +1,4 @@
 # core_library
 # core_library
-
-
 !! Date Created: 17th Sept, 2022
 !! Date Created: 17th Sept, 2022
 !! Modified date: 
 !! Modified date: 
 !! Version: .01 - initial release
 !! Version: .01 - initial release

+ 3 - 3
locations/korrPar.qsrc

@@ -6,13 +6,13 @@
 !! 
 !! 
 !! Desc: Family home kitchen links to family flat corridor
 !! Desc: Family home kitchen links to family flat corridor
 
 
-!! Call in location default actions
-gs 'home_family_init', 'init'
-
 !! Set location header - img path is set in init
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Corridor'
 $setloc['StageTitle'] = 'Corridor'
 $setloc['StageImage'] = '<<$default_img_path>>/korrpar.jpg'
 $setloc['StageImage'] = '<<$default_img_path>>/korrpar.jpg'
 
 
+!! Call in location default actions
+gs 'home_family_init', 'init'
+
 !! Set location vars:
 !! Set location vars:
 killvar '$locclass'
 killvar '$locclass'
 !! Unique vars - unknown status, legacy code
 !! Unique vars - unknown status, legacy code

+ 4 - 4
locations/kuhrPar.qsrc

@@ -7,8 +7,7 @@
 !! Desc: Family home kitchen links to family flat corridor
 !! Desc: Family home kitchen links to family flat corridor
 
 
 !! Start location initialisation
 !! Start location initialisation
-!! Call in location default actions
-gs 'home_family_init', 'init'
+
 !! Set location header - img path is set in init
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Kitchen'
 $setloc['StageTitle'] = 'Parents Kitchen'
 $setloc['StageImage'] = '<<$default_img_path>>/kuhrpar.jpg'
 $setloc['StageImage'] = '<<$default_img_path>>/kuhrpar.jpg'
@@ -22,7 +21,8 @@ gs 'kit_din'
 gs 'shortgs', 'setloc', 'kuhrpar', $ARGS[0]
 gs 'shortgs', 'setloc', 'kuhrpar', $ARGS[0]
 !! End location initialisation
 !! End location initialisation
 
 
-
+!! Call in location default actions
+gs 'home_family_init', 'init'
 !! Begin location content
 !! Begin location content
 
 
 if fullmorrout = 1:
 if fullmorrout = 1:
@@ -151,7 +151,7 @@ if func('homes_properties', 'can_live_here'):
 				npc_rel['A29'] += 1
 				npc_rel['A29'] += 1
 				dinner_day = daystart
 				dinner_day = daystart
 				gs 'stat'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="<<$default_img_path>>/dinnerhome.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/<<$default_img_path>>/dinnerhome.jpg"></center>'
 				'You sit down and join your family for dinner and your stepfather starts teasing you. "So, do you have a boyfriend yet <<$pcs_nickname>>?"'
 				'You sit down and join your family for dinner and your stepfather starts teasing you. "So, do you have a boyfriend yet <<$pcs_nickname>>?"'
 				if fame['pav_slut'] > 150 and motherKnowSpravka = 0:
 				if fame['pav_slut'] > 150 and motherKnowSpravka = 0:
 					'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'
 					'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'

BIN
tools/Parser/qsp_parser.exe