Browse Source

Added city_ prefix and removed capital letters where needed

Netuttki 4 years ago
parent
commit
3a59dc3d1d
3 changed files with 29 additions and 29 deletions
  1. 4 4
      locations/city_dima.qsrc
  2. 16 16
      locations/city_irinaroom.qsrc
  3. 9 9
      locations/city_pharmacy.qsrc

+ 4 - 4
locations/dima.qsrc → locations/city_dima.qsrc

@@ -1,8 +1,8 @@
-# dima
+# city_dima
 
-$loc = 'dima'
+$loc = 'city_dima'
 $metka = 'start'
-$menu_loc = 'dima'
+$menu_loc = 'city_dima'
 $menu_arg = ''
 menu_off = 0
 
@@ -21,5 +21,5 @@ if $ARGS[0] = 'start':
 	end
 end
 
---- dima ---------------------------------
+--- city_dima ---------------------------------
 

+ 16 - 16
locations/IrinaRoom.qsrc → locations/city_irinaroom.qsrc

@@ -1,9 +1,9 @@
-# IrinaRoom
+# city_irinaroom
 
 if $ARGS[0] = 'start':
 	cla
 	*clr
-	$menu_loc = 'IrinaRoom'
+	$menu_loc = 'city_irinaroom'
 	$menu_arg = 'start'
 	menu_off = 0
 	minut += 5
@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 		if hour >= 16 and hour <= 21 and week >= 6 and IrinaQW ! 2:
 			'You ring the bell and Ira opens the door, she smiles and invites you in.'
 
-			act 'Enter apartment':gt 'IrinaRoom', 'first'
+			act 'Enter apartment':gt 'city_irinaroom', 'first'
 		else
 			'You rang the doorbell but no one answers.'
 
@@ -41,7 +41,7 @@ if $ARGS[0] = 'first':
 	cla
 	clr
 	*clr
-	$menu_loc = 'IrinaRoom'
+	$menu_loc = 'city_irinaroom'
 	$menu_arg = 'first'
 	menu_off = 0
 	gs 'stat'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'first':
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/irinaroom.jpg"></center>'
 	'A small studio apartment, Ira keeps it neat and tidy'
 
-	act 'Drink in the kitchen':gt 'IrinaRoom', 'first1'
+	act 'Drink in the kitchen':gt 'city_irinaroom', 'first1'
 end
 
 if $ARGS[0] = 'first1':
@@ -73,11 +73,11 @@ if $ARGS[0] = 'first1':
 	act 'Leave':gt 'city_residential'
 
 	if IrinaQW = 1:
-		act 'Suggest drinking to sisterhood':gt 'IrinaRoom', 'first2'
+		act 'Suggest drinking to sisterhood':gt 'city_irinaroom', 'first2'
 	end
 
 	if IrinaQW >= 10:
-		act 'Kiss':gt 'IrinaRoom', 'kiss'
+		act 'Kiss':gt 'city_irinaroom', 'kiss'
 	end
 end
 
@@ -93,7 +93,7 @@ if $ARGS[0] = 'kiss':
 	gs 'arousal', 'kiss', 10, 'lesbian'
 	gs 'stat'
 
-	act 'Sex':gt 'IrinaRoom', 'sex'
+	act 'Sex':gt 'city_irinaroom', 'sex'
 end
 
 if $ARGS[0] = 'sex':
@@ -145,7 +145,7 @@ if $ARGS[0] = 'first2':
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/irinaqw1.jpg"></center>'
 	'You suggest drinking to sister to Ira. Although slightly odd, this simple ritual removes tensions and brings you closer.'
 
-	act 'Kiss':gt 'IrinaRoom', 'first3'
+	act 'Kiss':gt 'city_irinaroom', 'first3'
 end
 
 if $ARGS[0] = 'first3':
@@ -160,8 +160,8 @@ if $ARGS[0] = 'first3':
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Ira undress':gt 'IrinaRoom', 'first4'
-	act 'Ira drink more':gt 'IrinaRoom', 'first5'
+	act 'Ira undress':gt 'city_irinaroom', 'first4'
+	act 'Ira drink more':gt 'city_irinaroom', 'first5'
 end
 
 if $ARGS[0] = 'first4':
@@ -197,7 +197,7 @@ if $ARGS[0] = 'first5':
 	gs 'arousal', 'foreplay', 10, 'lesbian'
 	gs 'stat'
 
-	act 'Kiss':gt 'IrinaRoom', 'first6'
+	act 'Kiss':gt 'city_irinaroom', 'first6'
 end
 
 if $ARGS[0] = 'first6':
@@ -211,7 +211,7 @@ if $ARGS[0] = 'first6':
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Fondle breasts':gt 'IrinaRoom', 'first7'
+	act 'Fondle breasts':gt 'city_irinaroom', 'first7'
 end
 
 if $ARGS[0] = 'first7':
@@ -225,7 +225,7 @@ if $ARGS[0] = 'first7':
 	gs 'arousal', 'foreplay_give', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Lick pussy':gt 'IrinaRoom', 'first8'
+	act 'Lick pussy':gt 'city_irinaroom', 'first8'
 end
 
 if $ARGS[0] = 'first8':
@@ -245,7 +245,7 @@ if $ARGS[0] = 'first8':
 	minut -= 10
 	gs 'stat'
 
-	act 'Enjoy':gt 'IrinaRoom', 'first9'
+	act 'Enjoy':gt 'city_irinaroom', 'first9'
 end
 
 if $ARGS[0] = 'first9':
@@ -269,5 +269,5 @@ if $ARGS[0] = 'first9':
 	end
 end
 
---- IrinaRoom ---------------------------------
+--- city_irinaroom ---------------------------------
 

+ 9 - 9
locations/pharmacy.qsrc → locations/city_pharmacy.qsrc

@@ -1,4 +1,4 @@
-# pharmacy
+# city_pharmacy
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -17,19 +17,19 @@ if $ARGS[0] = 'start':
 			minut += rand(1,4) * people
 			people = 0
 			gs 'stat'
-			gt 'pharmacy', 'shop'
+			gt 'city_pharmacy', 'shop'
 		end
 	else
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	end
 end
 
 if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	*clr & cla
 	$location_type = 'public_indoors'
-	$loc = 'pharmacy'
+	$loc = 'city_pharmacy'
 	$metka = 'shop'
-	$menu_loc = 'pharmacy'
+	$menu_loc = 'city_pharmacy'
 	$menu_arg = 'shop'
 	menu_off = 0
 	gs 'stat'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	if pcs_knows_nipplecream > 0:
 		*P func ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $curloc, $ARGS[0])
 	end
-	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
+	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''city_pharmacy'', ''buy_antifungal''">buy</a>','')+'')
 	*P '</table></center>'
 end
 
@@ -82,15 +82,15 @@ if $ARGS[0] = 'buy_antifungal':
 		Kandidoz = 0
 		gs 'stat'
 		$gardmess = '<center><font color="green">You bought 1 <b>Antifungal medication</b>.</font></center><br>You put the money on the counter and immediately open the package and swallow the tablet. A while later, you feel better.'
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	elseif Kandidoz < 30 and KandidozOnce > 0:
 		'You don''t need the medication right now. Your thrush is currently in remission, taking vitamins will ensure that it stays that way.'
 	else
 		msg '<center>You don''t need any antifungal medication right now.</center>'
 		*nl
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	end
 end
 
---- pharmacy ---------------------------------
+--- city_pharmacy ---------------------------------