Merge remote-tracking branch 'Awesome/master'

locations/pav_parkev.qsrc

@@ -1347,8 +1347,10 @@ if $ARGS[0] = 'male_gopnik_beer':
 								'With that, everyone drinks the last of the beers, and you notice the area around you is littered with empty beer bottles. Once the final beer is gone, the talking starts to wind down, and people drift off; either alone, or in small groups. You get up and head out as well when you feel an arm wrapped around your waist, you turn to see Niko with a smile on his face, as he says, "It seems my princess has had a few too many. Let me get you home."'
 							end
 							gs 'willpower', 'misc', 'resist', 'medium'
-							if will_cost <= pcs_willpwr:
-								act 'I''m fine(<<will_cost>> Willpower)':
+							!Missing event niko_park_exploit
+							! if will_cost <= pcs_willpwr:
+							! 	act 'I''m fine(<<will_cost>> Willpower)':
+								act 'I''m fine':
 									*clr & cla
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
@@ -1383,6 +1385,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 										act 'Leave':gt 'pav_park', 'deeper_park'
 									end
 								end
+								!{ Missing event niko_park_exploit
 							else
 								act 'I''m fine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
@@ -1395,6 +1398,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 								'Knowing that Niko is right, you nod, before he lifts you up, and carries you through the park, while chatting a bit, but sadly, you are too drunk to focus on what he is saying, as the world seems to spin around you. Feeling so wasted, you spend the next few minute trying not to fall over, as Niko expertly carries you out of the park, toward an apartment complex.'
 								act 'See where Niko takes you': gt 'NikoEv', 'niko_park_exploit'
 							end
+							}
 						elseif grupTipe = 4:
 							'With that, everyone drinks the last of the beers, and you notice the area around you is littered with empty beer bottles. Once the final beer is gone, the talking starts to wind down, and people drift off either alone or in small groups. You get up and head out as well.'
 							act 'Leave':gt 'pav_park', 'deeper_park'
@@ -1631,8 +1635,10 @@ if $ARGS[0] = 'gopnik_beer':
 									*nl
 									'Feeling really tipsy, you try to get up, and head out as well, but almost fall over when you feel an arm wrapped around your waist, keeping you from falling. You quickly turn to see Niko with a smile on his face, as he says, "It seems my princess has had a few too many. Let me get you home."'
 									gs 'willpower', 'misc', 'resist', 'medium'
-									if will_cost <= pcs_willpwr:
-										act 'I''m fine(<<will_cost>> Willpower)':
+									!Missing event niko_park_exploit
+									! if will_cost <= pcs_willpwr:
+										! act 'I''m fine(<<will_cost>> Willpower)':
+										act 'I''m fine':
 											*clr & cla
 											gs 'willpower', 'pay', 'resist'
 											gs 'stat'
@@ -1641,6 +1647,7 @@ if $ARGS[0] = 'gopnik_beer':
 											'You pull away from him and stagger away. Niko watches you for a few seconds, before shrugging and saying, "Alright... I guess you''re fine. Travel safely, my princess." He then turns around and joins Valentin, as he heads toward further down the park.'
 											act 'Leave':gt 'pav_park', 'deeper_park'
 										end
+										!{ Missing event niko_park_exploit
 									else
 										act 'I''m fine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 									end
@@ -1653,6 +1660,7 @@ if $ARGS[0] = 'gopnik_beer':
 										'Knowing that Niko is right, you nod, before he lifts you up, and carries you through the Park, while chatting a bit, but sadly, you are too drunk to focus on what he is saying, as the world seems to spin around you. Feeling so wasted, you spend the next few minute trying not to fall over, as Niko expertly carries you out of the park, toward an apartment complex.'
 										act 'See where Niko takes you': gt 'NikoEv', 'niko_park_exploit'
 									end
+									}
 								elseif pcs_hotcat >= 7:
 									'Radomir looks at you and smiles as he walks over to you. "Hey beautiful, how about you and I go for a walk? It''s a nice day after all." After failing to hook up with Anushka, you have no doubt what he wants, and it isn''t a walk.'
 									act 'Yes': gt 'pav_park_sex', 'radomir_walk'

locations/shortgs.qsrc

@@ -1278,10 +1278,10 @@ end
 if $ARGS[0] = 'convert_dob':
 	!! Calculate NPC birthday and convert to human readable format
 	temp_npc_birthday = (npc_dob['A<<ARGS[1]>>'] mod 100)
-	$temp_day_suffix = func('shortgs', 'get_number_suffix', birthday)
+	$temp_day_suffix = func('shortgs', 'get_number_suffix', temp_npc_birthday)
 	temp_npc_birthmonth = (npc_dob['A<<ARGS[1]>>'] / 100) mod 100
 	temp_npc_birthyear = npc_dob['A<<ARGS[1]>>'] / 10000
-	$result = '<<birthday>><<$temp_day_suffix>> ' + $monthName[birthmonth]+ ', ' + temp_npc_birthyear
+	$result = '<<temp_npc_birthday>><<$temp_day_suffix>> ' + $monthName[temp_npc_birthmonth]+ ', ' + temp_npc_birthyear
 	killvar 'temp_npc_birthday'
 	killvar 'temp_npc_birthmonth'
 	killvar 'temp_npc_birthyear'