浏览代码

artemdate renamed to artem_date_events
Fixed grammar on (Present tense vs past tense).

Arcadia 3 年之前
父节点
当前提交
8d9ca0d243
共有 3 个文件被更改,包括 20 次插入20 次删除
  1. 1 1
      glife.qproj
  2. 15 15
      locations/artem_date_events.qsrc
  3. 4 4
      locations/artemhome.qsrc

+ 1 - 1
glife.qproj

@@ -447,7 +447,7 @@
 	<Folder name="Artem Chebotarev">
 		<Location name="artem_events"/>
 		<Location name="artemhome"/>
-		<Location name="artemdate"/>
+		<Location name="artem_date_events"/>
 		<Location name="artgar"/>
 	</Folder>
 	<Folder name="Igor Kruglov">

+ 15 - 15
locations/artemdate.qsrc → locations/artem_date_events.qsrc

@@ -1,4 +1,4 @@
-# artemdate
+# artem_date_events
 
 if $ARGS[0] = 'firstdate':
 	*clr & cla
@@ -23,7 +23,7 @@ if $ARGS[0] = 'firstdate':
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
 			if rand(1,5) = 1 and hour >= 20:
 				'When the movie ends, you and Artem leave the theater and he offers to walk you home. The two of you head back through the park as you walk. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from where you are, they are obviously already a bit drunk.'
-				act 'Just walk past them': gt 'artemdate','artemGopSkver'
+				act 'Just walk past them': gt 'artem_date_events','artemGopSkver'
 			else
 				'When the movie ends, you and Artem leave the theater and he offers to walk you home. The two of you head back through the park as you walk.'
 				'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'firstdate':
 		'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 		if rand(1,5) = 1 and hour >= 20:
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from here, they are obviously already a bit drunk.'
-			act 'Just walk past them': gt 'artemdate','artemGopSkver'
+			act 'Just walk past them': gt 'artem_date_events','artemGopSkver'
 		else
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for a while talking, he checks his watch and says, "We should be getting back, I will walk you to your door."'
 			'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'artem_date':
 	*clr & cla
 	npc_rel['A2'] += 1
 	menu_off = 1
-	gt 'artemdate', 'firstdate'
+	gt 'artem_date_events', 'firstdate'
 !{this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
 	if artem_date = 1:
 	
@@ -103,7 +103,7 @@ if $ARGS[0] = 'artemGopSkver':
 			'His smiles widely. "Great, I''m glad you had fun, maybe we can do it again some time?"'
 			'You nod a bit. "Sure, maybe. We''ll see."'
 			'He smiles and nods. "Ok, well. I better get home, talk to you later."'
-			'"Bye Artem, I have a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
+			'"Bye Artem, I had a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
 	else
@@ -132,7 +132,7 @@ if $ARGS[0] = 'artemGopSkver':
 				if will_cost <= pcs_willpwr:
 					act 'Stand up to them (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'self'
-						gt 'artemdate', 'stand_up'
+						gt 'artem_date_events', 'stand_up'
 					end
 				else
 					act 'Stand up to them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -153,7 +153,7 @@ if $ARGS[0] = 'artemGopSkver':
 	if will_cost <= pcs_willpwr:
 		act 'Stand up to them (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
-			gt 'artemdate', 'stand_up'
+			gt 'artem_date_events', 'stand_up'
 		end
 	else
 		act 'Stand up to them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -253,13 +253,13 @@ if $ARGS[0] = 'stand_up':
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				else
 					'You slowly remove all of your clothes until you are completely naked in front of them, with that they turn off the music. All of the Gopniks gather around you and their leader grins and gives you a choice: "Not bad <<$pcs_nickname>>, nice tits. It''s a shame you''re wasting them on him. And now, you''re going to suck all us off. If you do a good job, we''ll let you go." You know you have no chance to run away, so you either have to do what they ask or you could try your luck at fighting them, but betting against six men? Most likely all that good that would do is getting the shit beat out of you and then raped. Maybe if you distract them you could run away.'
-					act 'Get down on your knees': gt 'artemdate', 'blow_bang'
+					act 'Get down on your knees': gt 'artem_date_events', 'blow_bang'
 					gs 'willpower', 'misc', 'self', 'hard'
 					if will_cost <= pcs_willpwr:
 						act 'Fight them (<<will_cost>> Willpower)':
 							gs 'willpower', 'misc', 'self', 'hard'
 							gs 'willpower', 'pay', 'self'
-							gt 'artemdate', 'fight_gang'
+							gt 'artem_date_events', 'fight_gang'
 						end
 					else
 						act 'Fight them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -344,12 +344,12 @@ if $ARGS[0] = 'stand_up':
 										'By now the other gopniks have caught up and now you are surrounded again, except now they are pissed off as well.'
 										'The leader drops to his knees and grabs you by the hair while you lie flat on your stomach: "We warned you, <<$pcs_nickname>>. Since you made us work for it, we are just going to take what we want."'
 										'You know your choices are limited, get raped or fight back and likely get the shit beat out of you and raped anyways.'
-										act 'Get raped': gt 'artemdate', 'gang_rape'
+										act 'Get raped': gt 'artem_date_events', 'gang_rape'
 										gs 'willpower', 'misc', 'self', 'hard'
 										if will_cost <= pcs_willpwr:
 											act 'Fight them (<<will_cost>> Willpower)':
 												gs 'willpower', 'pay', 'self'
-												gt 'artemdate', 'fight_gang'
+												gt 'artem_date_events', 'fight_gang'
 											end
 										else
 											act 'Fight them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -368,7 +368,7 @@ if $ARGS[0] = 'stand_up':
 end
 
 if $ARGS[0] = 'blow_bang':
-	gs 'artemdate', 'generatgopniks'
+	gs 'artem_date_events', 'generatgopniks'
 	*clr & cla
 	gs 'fame', 'pav', 'sex', 20
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggbj1.jpg"></center>'
@@ -482,7 +482,7 @@ if $ARGS[0] = 'fight_gang':
 		'You do your best, but their are too many of them. The blows start coming and never stop, and soon you feel yourself dazed and unable to fight anymore. With the fight now over, you find yourself laying naked on the ground, flat on your stomach. The leader drops to his knees and grabs you by the hair while. "We warned you, <<$pcs_nickname>>. You''re all ours now."'
 		'Several of them start to take off their pants as one of them threatens: "Open up whore, or we''ll be spilling your guts all over the ground."'
 		'Two of them go stand watch, while the other four gather around you, you know they are going to rape you but their is nothing more you can do about it. You silent pray someone would come by and save you as you start to cry.'
-		act 'Get raped': gt 'artemdate', 'gang_rape'
+		act 'Get raped': gt 'artem_date_events', 'gang_rape'
 	end
 end
 
@@ -504,7 +504,7 @@ if $ARGS[0] = 'gang_rape':
 		gs 'bras', 'dispose'
 	end
 	
-	gs 'artemdate', 'generatgopniks'
+	gs 'artem_date_events', 'generatgopniks'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/stripped.jpg"></center>'
 	'They grab you and lift you off the ground, one covering your mouth as some others carry you. They drag you off deeper into the park into the woods far away from any of the paths. You see two others are dragging the unconscious Artem along. When they get to a place they seem to like, where there is some old dirty mattress laying on the ground, they start ripping your clothes off. It hurts as they do and you can hear your clothes ripping and tearing, they seem to be intentionally destroying your clothes at this point. They keep ripping and tearing at your clothes until you are completely naked. Two of them drop Artem nearby and then go stand watch.' 
@@ -638,5 +638,5 @@ if $ARGS[0] = 'generatgopniks':
 	gs 'boyStat', $npclastgenerated, 'f'
 end
 
---- artemdate ---------------------------------
+--- artem_date_events ---------------------------------
 

+ 4 - 4
locations/artemhome.qsrc

@@ -1318,7 +1318,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we could go for a walk, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
-			act 'Walk in the park': gt 'artemdate','firstdate'
+			act 'Walk in the park': gt 'artem_date_events','firstdate'
 		end
 	elseif artdate > 0 and artdate <= 3 and pav_slut < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1341,7 +1341,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
+			act 'Go on a date': gt 'artem_date_events','artem_date'
 		end
 	elseif artdate = 4 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1449,7 +1449,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
+			act 'Go on a date': gt 'artem_date_events','artem_date'
 		end
 	elseif artdate = 9 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1534,7 +1534,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
+			act 'Go on a date': gt 'artem_date_events','artem_date'
 		end
 	else
 		act 'Make small talk':