Procházet zdrojové kódy

[added] new lact_ev variable to keep track of the total amount of money erned through milk donations (both directly and through bottles)

anjuna krokus před 1 měsícem
rodič
revize
1f51b8e299
2 změnil soubory, kde provedl 45 přidání a 29 odebrání
  1. 43 29
      locations/city_clinic.qsrc
  2. 2 0
      locations/saveupdater.qsrc

+ 43 - 29
locations/city_clinic.qsrc

@@ -1673,7 +1673,7 @@ if $ARGS[0] = 'milk_bank':
 			'Donated milk volume in liter: <<lact_ev[''poli_totalmilkdonated'']/1000>>.<<$mid(1000 + (lact_ev[''poli_totalmilkdonated''] mod 1000), 2, 3)>>l'
 			'Donation count: <<lact_ev[''poli_totalmilkdonation_count'']>>'
 			'Average milk volume per donation in ml: <<lact_ev[''poli_totalmilkdonated'']/lact_ev[''poli_totalmilkdonation_count'']>>.<<$mid(100 + ((100 * lact_ev[''poli_totalmilkdonated''] / lact_ev[''poli_totalmilkdonation_count'']) mod 100), 2, 2)>>'
-			'Paid money: <<((lact_ev[''poli_totalmilkdonated'']/50)*100)>><b>₽</b>'
+			'Paid money: <<lact_ev[''poli_totaldonatemoney'']>><b>₽</b>'
 			'<br>----------------------------------------'
 		end
 		act 'Leave': gt 'city_clinic', 'milk_donation_room'
@@ -1729,15 +1729,17 @@ if $ARGS[0] = 'milk_bank':
 		act 'Donate a small bottle of milk':
 			*clr & cla
 			minut += 5
-			temp_pay = func('city_clinic', 'donate_milk_bottle', 'small')
-			money += temp_pay
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
 			gs 'stat'
 
 			!! IMAGE
 			!! TEXT
-			'You donated a small milk bottle and got paid <<temp_pay>> ₽.'
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
 
-			killvar 'temp_pay'
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
 			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
 		end
 	end
@@ -1745,19 +1747,21 @@ if $ARGS[0] = 'milk_bank':
 		act 'Donate 5 small bottles of milk':
 			*clr & cla
 			minut += 10
-			temp_pay = func('city_clinic', 'donate_milk_bottle', 'small')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'small')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'small')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'small')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'small')
-			money += temp_pay
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
+			gs 'city_clinic', 'donate_milk_bottle', 'small'
 			gs 'stat'
 
 			!! IMAGE
 			!! TEXT
-			'You donated 5 small milk bottles and got paid <<temp_pay>> ₽.'
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
 
-			killvar 'temp_pay'
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
 			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
 		end
 	end
@@ -1765,15 +1769,17 @@ if $ARGS[0] = 'milk_bank':
 		act 'Donate a medium bottle of milk':
 			*clr & cla
 			minut += 5
-			temp_pay = func('city_clinic', 'donate_milk_bottle', 'medium')
-			money += temp_pay
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
 			gs 'stat'
 
 			!! IMAGE
 			!! TEXT
-			'You donated a medium milk bottle and got paid <<temp_pay>> ₽.'
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
 
-			killvar 'temp_pay'
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
 			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
 		end
 	end
@@ -1781,19 +1787,21 @@ if $ARGS[0] = 'milk_bank':
 		act 'Donate 5 medium bottles of milk':
 			*clr & cla
 			minut += 10
-			temp_pay = func('city_clinic', 'donate_milk_bottle', 'medium')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'medium')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'medium')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'medium')
-			temp_pay += func('city_clinic', 'donate_milk_bottle', 'medium')
-			money += temp_pay
+			temp_total_pay = 0
+			temp_total_milk = 0
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
+			gs 'city_clinic', 'donate_milk_bottle', 'medium'
 			gs 'stat'
 
 			!! IMAGE
 			!! TEXT
-			'You donated 5 medium milk bottles and got paid <<temp_pay>> ₽.'
+			'You donated a <<temp_total_milk>> ml of milk and got paid <<temp_total_pay>><b>₽</b>.'
 
-			killvar 'temp_pay'
+			killvar 'temp_total_pay'
+			killvar 'temp_total_milk'
 			act 'Leave': minut += 5 & gt 'city_clinic', 'milk_donation_room'
 		end
 	end
@@ -1854,7 +1862,7 @@ if $ARGS[0] = 'milk_donation':
 			end
 			lact_ev['poli_milkedvolume'] = 0
 			if lact_ev['poli_donationsessioncount'] > 0:
-				lact_ev['poli_donatemoney'] = (lact_ev['poli_donationsessioncount']*5)/10*10
+				lact_ev['poli_donatemoney'] = (lact_ev['poli_donationsessioncount'] / 2) * 10
 			else
 				lact_ev['poli_donatemoney'] = 0
 			end
@@ -1872,6 +1880,7 @@ if $ARGS[0] = 'milk_donation':
 				gs 'stat'
 				if lact_ev['poli_donationsessioncount'] > 0:
 					money += lact_ev['poli_donatemoney']
+					lact_ev['poli_totaldonatemoney'] += lact_ev['poli_donatemoney']
 					'You put your top back on and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
 				else
 					'You put your top back on.'
@@ -1905,10 +1914,16 @@ if $ARGS[0] = 'donate_milk_bottle':
 	!!	if $mbarrtemp[temp_id] = 'hot' / 'warm' / 'lukewarm' / 'cold' / 'frozen':
 
 
+	temp_total_pay += temp_pay
+	money += temp_pay
+	lact_ev['poli_totaldonatemoney'] += temp_pay
+
+	temp_total_milk += mbarrfill[temp_id]
+	lact_ev['poli_totalmilkdonated'] += mbarrfill[temp_id]
+
 	gs 'lact_bp', 'empty_milk_bottle', temp_id
-	RESULT = temp_pay
 
-	killvar 'temp_pay'
+	killvar 'temp_don_pay'
 	killvar 'temp_id'
 
 	if $ARGS[1] = 'small':
@@ -1921,4 +1936,3 @@ end
 
 
 --- city_clinic ---------------------------------
-

+ 2 - 0
locations/saveupdater.qsrc

@@ -2806,6 +2806,8 @@ if temp_current_save_version < 00090300:
 	if pants_out_full			> 0:	killvar 'pants_out_full'
 	if pants_out_full_hairy		> 0:	killvar 'pants_out_full_hairy'
 
+	!! Introduction of lact_ev['poli_totaldonatemoney']
+	if lact_ev['poli_totaldonatemoney'] <= 0 and lact_ev['poli_totalmilkdonated'] >= 5: lact_ev['poli_totaldonatemoney'] = (lact_ev['poli_totalmilkdonated'] / 5) * 10
 
 
 end