Преглед на файлове

[fixed] gossip calls sometimes returning blank

Sicaa преди 4 години
родител
ревизия
ec5cdc6fb4
променени са 1 файла, в които са добавени 21 реда и са изтрити 27 реда
  1. 21 27
      locations/gschool_gossip.qsrc

+ 21 - 27
locations/gschool_gossip.qsrc

@@ -313,13 +313,11 @@ if $ARGS[0] = 'mixed':
 		'"She shot him down. Just turned around and left without saying anything."'
 		'"Wow, that''s cold."'
 		'"I know, right? I almost felt a little sorry for the nerd."'
-	elseif chat_rand = 76:
-		if igor_kdprogulka >= 3:
-			'"Hey, recently I saw <<$PC_nickname>> walking through the park with some girl I''ve never seen. She was really pretty…"'
-			'"Was she a girl from our school?"'
-			'"I couldn''t get a good look at her face, but they were being really friendly with each other. Maybe a bit too friendly…"'
-			'"Maybe she''s a lesbian!"'
-		end
+	elseif chat_rand = 76 and igor_kdprogulka >= 3:
+		'"Hey, recently I saw <<$PC_nickname>> walking through the park with some girl I''ve never seen. She was really pretty…"'
+		'"Was she a girl from our school?"'
+		'"I couldn''t get a good look at her face, but they were being really friendly with each other. Maybe a bit too friendly…"'
+		'"Maybe she''s a lesbian!"'
 	elseif chat_rand = 77:
 		'"Did I tell you that retard Evgeny spazzed out on me in class yesterday?"'
 		'"No, what happened?"'
@@ -331,28 +329,22 @@ if $ARGS[0] = 'mixed':
 		'"Just get Gerasim to do it. That''s what I do."'
 		'"Do I need to pay him or something?"'
 		'"Nah, just act like you really need it done and he''ll say yes. It''s almost annoying how nice he is to everyone, but I haven''t gotten a bad grade yet from him, so…"'
-	elseif chat_rand = 79:
 !!Vitek + relationship 45 and above + sveta is not a gopnik
-		if npc_rel['A9'] >= 45 and grupTipe ! 4:
-			'"Have you noticed <<$PCs_nickname>> hanging out with Vitek lately?"'
-			'"You think she''s a gopnik now? Oh god, maybe she''s fucking him!"'
-			'"Ew, I didn''t need that mental image!"'
-		end
-	elseif chat_rand = 80:
+	elseif chat_rand = 79 and npc_rel['A9'] >= 45 and grupTipe ! 4:
+		'"Have you noticed <<$PCs_nickname>> hanging out with Vitek lately?"'
+		'"You think she''s a gopnik now? Oh god, maybe she''s fucking him!"'
+		'"Ew, I didn''t need that mental image!"'
 !!Vitek + relationship 45 and above + sveta is a gopnik
-		if npc_rel['A9'] >= 45 and grupTipe = 4:
-			'"Even for a gopnik, <<$pcs_nickname>> has been hanging around Vitek a lot more lately."'
-			'"Y''know, I heard he sells drugs… you think he''s selling some to her?"'
-			'"Pfft, obviously! I mean, they''re both gopniks, so ofcourse all they do is drink, be loud and do drugs."'
-		end
-	elseif chat_rand = 81:
+	elseif chat_rand = 80 and npc_rel['A9'] >= 45 and grupTipe = 4:
+		'"Even for a gopnik, <<$pcs_nickname>> has been hanging around Vitek a lot more lately."'
+		'"Y''know, I heard he sells drugs… you think he''s selling some to her?"'
+		'"Pfft, obviously! I mean, they''re both gopniks, so ofcourse all they do is drink, be loud and do drugs."'
 !!Vasily + relationship 25 and below + sveta is not a gopnik
-		if npc_rel['A11'] <= 25 and grupTipe ! 4:
-			'"Aren''t <<$PCs_nickname>> and Vasily childhood friends?"'
-			'"More like were. They''re not close anymore."'
-			'"Aww… when you think about it, it''s kinda sad."'
-			'"It''s hard for me to feel bad for someone that calls Dan and Vitek his best friends."'
-		end
+	elseif chat_rand = 81 and npc_rel['A11'] <= 25 and grupTipe ! 4:
+		'"Aren''t <<$PCs_nickname>> and Vasily childhood friends?"'
+		'"More like were. They''re not close anymore."'
+		'"Aww… when you think about it, it''s kinda sad."'
+		'"It''s hard for me to feel bad for someone that calls Dan and Vitek his best friends."'
 	elseif chat_rand = 82:
 		'"Did you hear about the rapist in St Petersburg?"'
 		'"Which one? There are so many."'
@@ -395,6 +387,8 @@ if $ARGS[0] = 'mixed':
 		'The other student laughs. "Your grandmother is crazy, I want some of what she is taking. Magic and demons aren''t real."'
 		'"So you don''t believe in god and stuff? I mean if that is all real, why wouldn''t demons and stuff be?"'
 		'Then they both go silent as if really considering it'
+	else
+		gs 'gschool_gossip', 'mixed'
 	end
 
 	if dimaRevenge = 4 and dimaRevChoice = 2 and hour >= 13:
@@ -405,7 +399,7 @@ if $ARGS[0] = 'mixed':
 end
 
 if $ARGS[0] = 'boys':
-	chat_rand = rand(1, 38)
+	chat_rand = rand(1, 39)
 	if chat_rand = 1:
 		'"Dude, you should''ve seen me in League of Legends yesterday. I totally carried my crappy team to victory!" His friend does not seem impressed and scoffs back, "Man, I''ve seen you play before. You couldn''t carry a paper bag to the litter bin, if your life depended on it."'
 	elseif chat_rand = 2: