Mona.Lisa 1 year ago
parent
commit
0699e9bac4

+ 2 - 2
locations/gschool_socialchg.qsrc

@@ -641,8 +641,8 @@ if $ARGS[0] = 'group_student_rel_change':
 		if npc_rel['A17'] <= 20: grupvalue[1] -= 1
 		if npc_rel['A19'] >= 60: grupvalue[2] += 1     
 		if npc_rel['A19'] <= 20: grupvalue[2] -= 1   
-		if npc_rel['A200'] >= 60: grupvalue[4] += 1     
-		if npc_rel['A200'] <= 20: grupvalue[4] -= 1   
+		if npc_rel['A20'] >= 60: grupvalue[4] += 1
+		if npc_rel['A20'] <= 20: grupvalue[4] -= 1
 		if npc_rel['A21'] >= 60: grupvalue[4] += 1     
 		if npc_rel['A21'] <= 20: grupvalue[4] -= 1   
 		if npc_rel['A22'] >= 60: grupvalue[1] += 1     

+ 1 - 1
locations/pav_hotel.qsrc

@@ -349,7 +349,7 @@ if $ARGS[0] = 'Pavlin' :
 			act 'Move away':gt'pav_hotel','skip_resepevent'
 		end
 	end
-	if npc_rel['A217'] > 19 and proshotelday ! daystart and mid($start_type,1,2) = 'sg' and TwinQW < 0:
+	if npc_rel['A217'] > 19 and proshotelday ! daystart and mid($start_type,1,2) = 'sg' and TwinQW < 1:
 		!!! TwinQW: 0 quest not started; > 0: quest started; < 5: talking with sis; 5: sis agreed; 6: finished
 		!!! changing 'TwinQW < 0' in the above if statement to 'TwinQW < 1' reenables the quest line
 		!!! Kevin Smarts:

+ 0 - 6
locations/stat.qsrc

@@ -1098,12 +1098,6 @@ end
 !!stop auto birth control pill taking if the player believes they are pregnant or are pregnant
 if (thinkpreg = 1 or knowpreg = 1) and tabletkicheck = 1: tabletkicheck = 0
 
-if birth_control['remind_hour'] > 0 and hour >= birth_control['remind_hour'] and hour <= birth_control['remind_hour'] + 1 and tabletkiday ! daystart:
-	birth_control['remind_icon'] = 1
-else
-	birth_control['remind_icon'] = 0
-end
-
 !!Mood
 if cheatNoMood = 0:
 	maxmood = 100 - moodmodifier

+ 4 - 0
locations/treeCircActs.qsrc

@@ -23,5 +23,9 @@ else
 	end
 end
 
+if canTeleport = 1 and tpKnown[$ARGS[0]] = 1:
+    $dynAction = "act 'Will yourself to <<$treeCircName[$ARGS[0]]>>': gs 'castSpell', 'teleport', '<<$ARGS[0]>>'"
+    dynamic $dynAction
+end
 
 --- treeCircActs ---------------------------------