Bladeren bron

Pharmacies Fix

Stephan Fuchs 9 maanden geleden
bovenliggende
commit
cc972f0673
2 gewijzigde bestanden met toevoegingen van 20 en 80 verwijderingen
  1. 19 73
      sugarcube/src/locations/city/city_pharmacy.tw
  2. 1 7
      sugarcube/src/locations/pavlov/pav_pharmacy.tw

+ 19 - 73
sugarcube/src/locations/city/city_pharmacy.tw

@@ -1,72 +1,24 @@
-:: city_pharmacy
-<<set $here = 'city_pharmacy'>>
-<<set $ARGS = $location_var[$here]>>
-<<if $location_var[$here][0] == 'start'>>
-	<<set $menu_off = 1>>
-	<<set $time.minutes += 5>>
-	<!-- FAILED TO CONVERT
-		gs 'stat' & ! Update the information about the past tense
-	-----
-		ERROR: FAILED TO CONVERT LITERAL: """& ! Update the information about the past tense"""
+:: pharmacy_shopList[include]
+	<<shopItemList>>
+		<<stockItem `{id:'vitamin',amount:30,price:130,label:'Vitamin Pills'}`>>
+		/*<<stockItem `{id:'painkiller',amount:50,price:435,label:'Painkillers'}`>>*/
+		<<stockItem `{id:'tampon',amount:20,price:200,label:'Tampons'}`>>
+		<<stockItem `{id:'sanpad',amount:20,price:100,label:'Sanitary napkins'}`>>
+		<<stockItem `{id:'lipbalm',amount:30,price:127,label:'Lip balm'}`>>
+	<</shopItemList>>
 
-	-->
-	<<warn "CONVERSION ERROR f03f62f0c7b30e447fffcb0becd1d1f4">>
-	<!-- !a time limit of work pharmacies in Pavlovo-->
-	<<set $people = rand(1,15)>>
-	<<if getvar("$people") <= 5>>
-		<!-- FAILED TO CONVERT
-			*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
-		-----
-			<<set  * ERROR: FAILED TO CONVERT LITERAL: """pl '<center><b><font color""" = ERROR: FAILED TO CONVERT LITERAL: """"maroon">Pharmacy<""" / ERROR: FAILED TO CONVERT LITERAL: """font><""" / ERROR: FAILED TO CONVERT LITERAL: """b><""" / ERROR: FAILED TO CONVERT LITERAL: """center>'""">>
+:: city_pharmacy[public indoors]
 
-		-->
-		<<warn "CONVERSION ERROR b53649f7f7cdc5b851c6cb1db9e47f56">>
-		<<image `'locations/pavlovsk/pharmacy/aptekabusy<<people>>.jpg'`>>
-		<p>There is people ' + iif(people < 2 or people > 4, 'people' , 'man' ) + ' in line as you walk up to the counter to check out.</p>
-		<<actCLA 'Leave'>>
-			<<set $time.minutes += 5>> <<gt 'city_residential'>>
-		<</actCLA>>
-		<<actCLA 'Wait in line'>>
-			<<set $time.minutes += rand(1,4) * $people>>
-			<<set $people = 0>>
-			<<gt 'city_pharmacy' 'shop'>>
-		<</actCLA>>
-	<<else>>
-		<<gt 'city_pharmacy' 'shop'>>
-	<</if>>
-<</if>>
-<<if $location_var[$here][0] == 'shop' or !$location_var[$here][0]>>
-	<<set $location_type = 'public_indoors'>>
-	<<set $loc = 'city_pharmacy'>>
-	<<set $loc_arg = 'shop'>>
-	<<set $menu_loc = 'city_pharmacy'>>
-	<<set $menu_arg = 'shop'>>
-	<<set $menu_off = 0>>
-	<!-- FAILED TO CONVERT
-		*pl '<center><b><font color="maroon">Pharmacy</font></b></center>'
-	-----
-		<<set  * ERROR: FAILED TO CONVERT LITERAL: """pl '<center><b><font color""" = ERROR: FAILED TO CONVERT LITERAL: """"maroon">Pharmacy<""" / ERROR: FAILED TO CONVERT LITERAL: """font><""" / ERROR: FAILED TO CONVERT LITERAL: """b><""" / ERROR: FAILED TO CONVERT LITERAL: """center>'""">>
+	<h2>Pharmacy</h2>
 
-	-->
-	<<warn "CONVERSION ERROR b53649f7f7cdc5b851c6cb1db9e47f56">>
-	<<if $pharma_day != $time.daystart>>
-		<<set $pharma_day = $time.daystart>> <<set $pharma_picrand = rand(1,4)>>
+	<<image `'locations/pavlovsk/pharmacy/apteka_worker_#.jpg'` 1 4>>
 
-	<</if>>
-	<<image `'locations/pavlovsk/pharmacy/apteka_worker_'+pharma_picrand+'.jpg'`>>
-	<<if $message != ''>>
-		$message
-		<<set $message to null>>
-		<center>"Do you need anything else?"</center>
-	<<else>>
-		<p>A young woman in a white coat stands behind the counter. She smiles as you approach. "Hello, what can I help you with?"</p>
-	<</if>>
-	<<actCLA 'Leave'>>
-		<<set $time.minutes += 5>> <<gt 'city_residential'>>
-	<</actCLA>>
-	<!-- !! output for purchased item-->
+	<<ConnectedLocation 'Leave' 'city_residential' '' 'locations/city/residential/street.jpg' 5>>
+
+	<<gs 'pharmacy_shopList'>>
+	
 
-	<<if getvar("$preziktype") == 0>>
+	/*<<if getvar("$preziktype") == 0>>
 		*P func ('$stock_item', 5, 'Condoms', 500, 'prezik', $curloc, $ARGS[0])
 
 	<</if>>
@@ -99,15 +51,8 @@
 	<<if getvar("$KandidNapr") == 1>>
 		<<set <<stockItem `{id:'$Kandidoz', $curloc, $ARGS[0], iif(mid($start_type,1,2) = 'sg',1,0), '(you have 0)',amount:1,price:1050,label:'Antifungal medication'}`>><</link>>_' '' `{limit:1}`>>+'')>>
 
-	<</if>>
-	<!-- FAILED TO CONVERT
-		*P '</table></center>'
-	-----
-		 * ERROR: FAILED TO CONVERT LITERAL: """P '<""" / ERROR: FAILED TO CONVERT LITERAL: """table><""" / ERROR: FAILED TO CONVERT LITERAL: """center>'"""
-
-	-->
-	<<warn "CONVERSION ERROR 91c42fded21348dc4c86f4b67f934fed">>
-<</if>>
+	<</if>>*/
+/*
 <<if $location_var[$here][0] == 'buy_antifungal'>>
 	<<if getvar("$Kandidoz") >= 30>>
 		<<set $finances.cash -= 1050>>
@@ -125,3 +70,4 @@
 		<<gt 'city_pharmacy' 'shop'>>
 	<</if>>
 <</if>>
+ */

+ 1 - 7
sugarcube/src/locations/pavlov/pav_pharmacy.tw

@@ -76,13 +76,7 @@
 		<</if>>
 	<</if>>
 
-	<<shopItemList>>
-		<<stockItem `{id:'vitamin',amount:30,price:130,label:'Vitamin Pills'}`>>
-		/*<<stockItem `{id:'painkiller',amount:50,price:435,label:'Painkillers'}`>>*/
-		<<stockItem `{id:'tampon',amount:20,price:200,label:'Tampons'}`>>
-		/*<<stockItem `{id:'sanpad',amount:20,price:100,label:'Sanitary napkins'}`>>*/
-		<<stockItem `{id:'lipbalm',amount:30,price:127,label:'Lip balm'}`>>
-	<</shopItemList>>
+	<<gs 'pharmacy_shopList'>>
 :: pav_pharmacy_old_shoplist
 		<!-- !!I want to change this so Sveta can always buy the stuff below regardless who is working. Not sure how to change the code so just leaving this note. The first time Sveta buys condoms, pregnancy test, birth control, or lubricant I want it to go to if $ARGS[0] = 'first_time_buy_luda':-->
 		<<if getvar("$LudaQW['work_hours']") == 0>>