Browse Source

[fixed] `cikl` generating `<br>`s and couple other minor fixes

LinaHirata 6 months ago
parent
commit
840a8ae776

+ 1 - 1
locations/LOCA.qsrc

@@ -61,7 +61,7 @@ end
 
 ! {
 call_trace_manual = 1
-$call_trace_line = "'PUT LOC NAME HERE'"
+$call_trace_line = "'PUT_LOC_NAME_HERE'"
 
 call_trace_index = 0
 :call_trace_loop

+ 1 - 1
locations/bank.qsrc

@@ -416,7 +416,7 @@ if $ARGS[0] = 'cikl':
 		count = ARRSIZE('$internet_action_messages')
 		i = 0
 		:loop_messages
-			'<<$internet_action_messages[i]>>'
+			if $internet_action_messages[i] ! '': *pl $internet_action_messages[i]
 			i += 1
 		if i < count: jump 'loop_messages'
 		killvar 'i'

+ 2 - 2
locations/cikl.qsrc

@@ -1060,7 +1060,7 @@ if blizoruk < 0: blizoruk = 0
 
 
 !!------------------------------------------------------------------------------------------------------------------------
-!!C and b array cleaning 
+!!C and B array cleaning 
 
 if InSleep = 1: gs 'npc','cleanarrays'
 
@@ -1165,7 +1165,7 @@ if ml_onlinesongcount > 0:
 			ml_tempsong_hotcat[j] = ml_onlinesong_hotcat[i]
 			ml_tempsong_skilllevel[j] = ml_onlinesong_skilllevel[i]
 			ml_tempsong_uploaded[j] = ml_onlinesong_uploaded[i]
-			*nl
+
 			if ml_tempsong_lastcalcday[j] <= (daystart - 7) and ml_tempsong_uploaded = 1:
 				gs 'fame', 'city', 'music', rand(0, ml_tempsong_freshness[j]/100)
 				ml_tempsong_freshness[j] -= 10

+ 1 - 1
locations/npc.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'cleanarrays':
 		if arrpos('$ChildFath', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
 		if arrpos('$ChildThFath', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
 
-		if mid($npc_index[i_gs_cl],1,1) = 'C' or mid($npc_index[i_gs_cl],1,1) = 'b' :
+		if ucase(mid($npc_index[i_gs_cl],1,1)) = 'C' or ucase(mid($npc_index[i_gs_cl],1,1)) = 'B':
 			gs 'npccleanc',ucase($npc_index[i_gs_cl])
 			jump 'CiklNpcCleanLoop'
 		end

+ 2 - 2
locations/npc_reactions.qsrc

@@ -37,8 +37,8 @@ Physical traits:
 - exposed breast
 }
 
-dyneval $npc_preferences[$ARGS[1]]
-dyneval $npc_pref_values[$ARGS[1]]
+dynamic $npc_preferences[$ARGS[1]]
+dynamic $npc_pref_values[$ARGS[1]]
 
 if $ARGS[0] = 'stat':
 	killvar 'npc_reaction_hourly'

+ 4 - 4
locations/stat_display.qsrc

@@ -6,12 +6,12 @@ if call_trace_shown ! 0:
 	if $git_hash ! '': pl '<<$git_hash>>'
 	pl iif(call_trace_manual = 0, 'auto', 'manual')
 	if call_trace_enabled = 0:
-		p '<a href="exec:call_trace_enabled = 1 & gs ''stat_display''">enable</a> | '
+		p '<a href="exec:call_trace_enabled = 1 & gs ''stat_display''">enable</a>&nbsp;|&nbsp;'
 	else
-		p '<a href="exec:call_trace_enabled = 0 & call_trace_shown = 0 & gs ''stat''">disable</a> | '
+		p '<a href="exec:call_trace_enabled = 0 & call_trace_shown = 0 & gs ''stat''">disable</a>&nbsp;|&nbsp;'
 	end
-	p '<a href="exec:killvar ''$call_trace'' & gs ''stat_display''">clear</a> | '
-	pl '<a href="exec:call_trace_shown = 0 & gs ''stat''">return</a></center>'
+	p '<a href="exec:killvar ''$call_trace'' & gs ''stat_display''">clear</a>&nbsp;|&nbsp;'
+	p '<a href="exec:call_trace_shown = 0 & gs ''stat''">return</a></center>'
 	p $call_trace
 	exit
 end

+ 1 - 1
locations/wakeup.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = 'get_out':
 				fullmorrout = 1
 				minut += 15
 				gs 'wardrobe', 'school_outfit'
-			xgt 'bed_get_out', 'start'
+				xgt 'bed_get_out', 'start'
 			end
 		end
 	end