Browse Source

[fixed] Mom church events had you entering the church multiple times
[fixed] default outfits were saving bag type even if you didn't have one which meant they gave you bag when loaded

KevinSmarts 4 years ago
parent
commit
622e043162
2 changed files with 11 additions and 7 deletions
  1. 5 5
      locations/ParChurch.qsrc
  2. 6 2
      locations/wardrobe.qsrc

+ 5 - 5
locations/ParChurch.qsrc

@@ -65,15 +65,15 @@ if $ARGS[0] = 'Mom':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
 	end
 	if motherKnowWhore = 0 and VKChurchIntro = 0:
-		'You walk into the church then look for a seat when you suddenly hear someone casually call out, "<<$pcs_firstname>> I never expected you to come here without me dragging you." You turn to see your <<$npc_nickname[''A29'']>> sitting in the middle row. You reply, "Hey <<$npc_nickname[''A29'']>>." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
+		'You suddenly hear someone casually call out, "<<$pcs_firstname>> I never expected you to come here without me dragging you." You turn to see your <<$npc_nickname[''A29'']>> sitting in the middle row. You reply, "Hey <<$npc_nickname[''A29'']>>." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
 	elseif motherKnowWhore = 0 and VKChurchNo < 4:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then says, "<<$pcs_firstname>> you''re here. Come here, take a seat." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then says, "<<$pcs_firstname>> you''re here. Come here, take a seat." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
 	elseif motherKnowWhore = 0 and VKChurchNo = 4:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then get up and walks to you before saying, "<<$pcs_firstname>> we need to talk." She then guides you out of the church.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then get up and walks to you before saying, "<<$pcs_firstname>> we need to talk." She then guides you out of the church.'
 	elseif motherKnowWhore > 0 or VKChurchNo = 5:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She peeks over in your direction then turns away from you, as if you were not there.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She peeks over in your direction then turns away from you, as if you were not there.'
 	else
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She doesn''t seem to notice you.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She doesn''t seem to notice you.'
 	end
 
 	if motherKnowWhore = 0 and VKChurchNo = 4:

+ 6 - 2
locations/wardrobe.qsrc

@@ -283,8 +283,12 @@ if $ARGS[0] = 'default_entry_set':
 	defpantynumber[i] = pantywornnumber
 	$defshoetype[i] = $shoeworntype
 	defshoenumber[i] = shoewornnumber
-	$defpursetype[i] = $currentpursetype
-	defpursenumber[i] = currentpursenumber
+	if bag = 1:
+		$defpursetype[i] = $currentpursetype
+		defpursenumber[i] = currentpursenumber
+	else
+		$defpursetype[i] = 'none'
+	end
 	defcoat[i] = defaultcoat
 
 	$def_clothing_temp = '<<$def_clothing_name[i]>>'