Prechádzať zdrojové kódy

Merge remote-tracking branch 'Anjuna/master'

Kevin_Smarts 11 mesiacov pred
rodič
commit
03d0275418

+ 20 - 3
locations/SMStext_builder.qsrc

@@ -44,14 +44,31 @@ elseif $ARGS[0] = 'end':
 end
 
 if $ARGS[0] = 'send':
-	$temp_SMStext += '<table width=80%><tr><td width=10%></td><td collspan=2 bgcolor=pink><font color=black>'
+	temp_text_width = max(10, 90 - (len($ARGS[1]) * 90 / 50))
+	$temp_SMStext += '<table width=80%><tr><td width=<<temp_text_width>>%></td><td collspan=2 bgcolor=pink style="padding-top:5pt; padding-bottom:5pt; padding-left:10pt; padding-right:10pt"><font color=black>'
 	$temp_SMStext += $ARGS[1]
 	$temp_SMStext += '</font></td></tr></table>'
+	killvar 'temp_text_width'
+
+elseif $ARGS[0] = 'send_img':
+	$temp_SMStext += '<table width=80%><tr><td width=10%></td><td collspan=2 bgcolor=pink align=center style="white-space:pre-wrap">'
+	if $ARGS[2] = '': $ARGS[2] = $ARGS[1]
+	$temp_SMStext += '<br><img src="<<$ARGS[1]>>" alt="<<$ARGS[2]>>" style="horizontal-align:center; max-height:90%; max-width:90%"><br><br>'
+	$temp_SMStext += '</td></tr></table>'
+
 
 elseif $ARGS[0] = 'receive':
-	$temp_SMStext += '<table width=80%><tr><td collspan=2 bgcolor="#D4CEF9"><font color=black>'
+	temp_text_width = max(10, 90 - (len($ARGS[1]) * 90 / 50))
+	$temp_SMStext += '<table width=80%><tr><td collspan=2 bgcolor="#D4CEF9" style="padding-top:5pt; padding-bottom:5pt; padding-left:10pt; padding-right:10pt"><font color=black>'
 	$temp_SMStext += $ARGS[1]
-	$temp_SMStext += '</font></td><td width=10%></td></tr></table>'
+	$temp_SMStext += '</font></td><td width=<<temp_text_width>>%></td></tr></table>'
+	killvar 'temp_text_width'
+
+elseif $ARGS[0] = 'receive_img':
+	$temp_SMStext += '<table width=80%><tr><td collspan=2 bgcolor="#D4CEF9" align=center style="white-space:pre-wrap">'
+	if $ARGS[2] = '': $ARGS[2] = $ARGS[1]
+	$temp_SMStext += '<br><img src="<<$ARGS[1]>>" alt="<<$ARGS[2]>>" style="horizontal-align:center; max-height:90%; max-width:90%"><br><br>'
+	$temp_SMStext += '</td><td width=10%></td></tr></table>'
 end
 
 

+ 17 - 17
locations/band_tour_anushka_SMS.qsrc

@@ -86,19 +86,20 @@ if $ARGS[0] = 'Week1':
 	! Tree with all options, for reading ease
 	
 	$SMSTree[ '0'] = '"Hey, what up? Just got up, it was a long night last night. Did our first gig at this little club in Pskov, it was pretty cool. Stayed up drinking afterwards, have a hell of a headache. Hope you are having half as much fun as I am bitch." Her text is followed by emojis aligned in a lewd way.'
-	
+
 		$SMSTree['a1'] = 'Good luck!'
 	!!		$SMSTree['a2'] = 'Receiving respons a'
-	
+
 	!!Add the SMS to the phone
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week1.jpg'
 		
 			!replies
 			gs 'SMStext_builder', 'add_reply', $SMSTree['a1'], 'band_tour_anushka_SMS', 'Week1', 'Choice_a'
 			!	gs 'SMStext_builder', 'add_reply', $SMSTree['b1'], 'band_tour_anushka_SMS', 'Week1', 'Choice_b'
-
+			
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 
@@ -112,8 +113,8 @@ if $ARGS[0] = 'Week1':
 
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week1.jpg'
 			gs 'SMStext_builder', 'send', $SMSTree['a1']
-
 			gs 'SMStext_builder', 'show_sms', ARGS[2]
 		gs 'SMStext_builder', 'end'
 	end
@@ -126,7 +127,8 @@ elseif $ARGS[0] = 'Week2':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
-			gs 'SMStext_builder', 'add_sms', 'A144'
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week2.jpg'
+			gs 'SMStext_builder', 'add_sms', 'A144', 'images/characters/pavlovsk/school/girl/anushka/tour/week2.jpg'
 		gs 'SMStext_builder', 'end'
 	end
 
@@ -139,13 +141,9 @@ elseif $ARGS[0] = 'Week3':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
-
-			!! Insert image path here ---- $SMSPicture1[ARGS[2]] = 'images/pc/glare.jpg'
-			$temp_imagepath1 = ''
-			gs 'SMStext_builder', 'add_sms', 'A144', $temp_imagepath1
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week3.jpg'
+			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
-
-		killvar '$temp_imagepath1'
 	end
 
 
@@ -156,6 +154,7 @@ elseif $ARGS[0] = 'Week4':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week4.jpg'
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 	end
@@ -169,13 +168,8 @@ elseif $ARGS[0] = 'Week5':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
-
-			!! Insert image path here ---- $SMSPicture1[ARGS[2]] = 'images/pc/glare.jpg'
-			$temp_imagepath1 = ''
-			gs 'SMStext_builder', 'add_sms', 'A144', $temp_imagepath1
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week5.jpg'
 		gs 'SMStext_builder', 'end'
-
-		killvar '$temp_imagepath1'
 	end
 
 
@@ -186,6 +180,7 @@ elseif $ARGS[0] = 'Week6':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week6.jpg'
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 	end
@@ -198,6 +193,7 @@ elseif $ARGS[0] = 'Week7':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week7.jpg'
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 	end
@@ -210,6 +206,7 @@ elseif $ARGS[0] = 'Week8':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week8.jpg'
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 	end
@@ -222,6 +219,7 @@ elseif $ARGS[0] = 'Week9':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week9.jpg'
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 	end
@@ -234,6 +232,7 @@ elseif $ARGS[0] = 'Week10':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week10.jpg'
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 	end
@@ -245,6 +244,7 @@ elseif $ARGS[0] = 'Week11':
 	if $ARGS[1] = 'Add SMS':
 		gs 'SMStext_builder', 'start'
 			gs 'SMStext_builder', 'receive', $SMSTree[ '0']
+			gs 'SMStext_builder', 'receive_img', 'images/characters/pavlovsk/school/girl/anushka/tour/week11.jpg'
 			gs 'SMStext_builder', 'add_sms', 'A144'
 		gs 'SMStext_builder', 'end'
 	end