pause language string fix, timing explosions opt-in

StriipE · Mar 9, 2018 · ad1ed0b · ad1ed0b
1 parent 31f5903
commit ad1ed0b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/NoteSkins/default/explosions.lua b/NoteSkins/default/explosions.lua
@@ -21,6 +21,7 @@ return function(button_list, stepstype, skin_params)
 	local pardist= explosion_params.particle_dist
 	local particle_life= explosion_params.particle_life
 	local have_particles= explosion_params.particles
+	local explode_timing= explosion_params.explode_timing
 	if have_particles then
 		local angle_per_particle= (end_angle - start_angle) / (num_particles - 1)
 		for i= 0, num_particles-1 do
@@ -114,8 +115,12 @@ return function(button_list, stepstype, skin_params)
 				param.column:set_layer_fade_type(self, "FieldLayerFadeType_Explosion")
 			end,
 			ColumnJudgmentCommand= function(self, param)
-				param.column:set_layer_second_offset(self, -param.second_offset);
-				param.column:set_layer_beat_offset(self, -param.beat_offset);
+				if explode_timing == true then
+				-- This moves the explosion to correspond with the timing of the  
+				-- pressed note.
+					param.column:set_layer_second_offset(self, -param.second_offset);
+					param.column:set_layer_beat_offset(self, -param.beat_offset);
+				end
 			end,
 			Def.Sprite{
 				Texture= "_glow", InitCommand= function(self)

diff --git a/NoteSkins/default/noteskin.lua b/NoteSkins/default/noteskin.lua
@@ -44,6 +44,7 @@ return {
 			particle_size= 32,
 			num_particles= 16,
 			particle_blend= "BlendMode_WeightedMultiply",
+			explode_timing=false,
 		},
 		receptors= {
 			warning_time= 2,
@@ -129,6 +130,10 @@ return {
 					},
 				},
 			},
+			explode_timing= {
+				translation= {
+					en= {title= "Timing Explosions", explanation= "When set to true, where the note explosion occurs on-screen is based on timing (before the receptors for early, past them for late)."},
+			}},
 		},
 		receptors= {
 			translation= {

diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua
@@ -425,10 +425,10 @@ t[#t+1] = StandardDecorationFromFileOptional("TimingDifficulty","TimingDifficult
 if gameplay_pause_count > 0 then
 	t[#t+1]= Def.BitmapText{
 		Font= "Common Italic Condensed",
-		Text= THEME:GetString("PauseMenu", "pause_count") .. ": " .. gameplay_pause_count,
+		Text= THEME:GetString("notefield_options", "pause_count") .. ": " .. gameplay_pause_count,
 		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-130;shadowlength,1;maxwidth,140;);
 		OnCommand=function(self)
-			self:diffuse(color("#FF0000")):diffusebottomedge(color("#512232")):zoom(0.8);
+			self:diffuse(color("#FF0000")):strokecolor(color("#512232")):zoom(0.8);
 			self:diffusealpha(0):sleep(1.5):smooth(0.3):diffusealpha(1);
 		end;
 		OffCommand=cmd(sleep,0.2;decelerate,0.3;diffusealpha,0;);