mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-21 06:19:56 +00:00
Merge branch 'master' of https://github.com/elizagamedev/mkxp-oneshot
This commit is contained in:
commit
c496e83cd1
2 changed files with 16 additions and 1 deletions
|
|
@ -13,6 +13,13 @@ module RPG
|
||||||
#lowercasing facepic name to be more case insensitive
|
#lowercasing facepic name to be more case insensitive
|
||||||
#to catch the few instances where we use "Niko" instead of "niko"
|
#to catch the few instances where we use "Niko" instead of "niko"
|
||||||
filename = filename.downcase
|
filename = filename.downcase
|
||||||
|
|
||||||
|
#april fools!
|
||||||
|
t = Time.now
|
||||||
|
if t.month == 4 && t.day == 1 && filename.start_with?("niko")
|
||||||
|
filename = "af"
|
||||||
|
end
|
||||||
|
|
||||||
if $game_switches[160] && filename.start_with?("niko")
|
if $game_switches[160] && filename.start_with?("niko")
|
||||||
filename.gsub!(/niko/, "en")
|
filename.gsub!(/niko/, "en")
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -383,7 +383,15 @@ class Window_Message < Window_Selectable
|
||||||
@text_pause -= 1
|
@text_pause -= 1
|
||||||
else
|
else
|
||||||
if @blip >= BLIP_TIME
|
if @blip >= BLIP_TIME
|
||||||
Audio.se_play("Audio/SE/#{@blipsound}.wav", 50) unless @text.empty?
|
#april fools
|
||||||
|
t = Time.now
|
||||||
|
if $game_temp.message_face != nil && t.month == 4 && t.day == 1 && $game_temp.message_face.start_with?("niko")
|
||||||
|
niko_sounds = [ "cat_2"]
|
||||||
|
@blipsound = niko_sounds[rand(niko_sounds.length)]
|
||||||
|
Audio.se_play("Audio/SE/#{@blipsound}.wav", 50, rand(100..125)) unless @text.empty?
|
||||||
|
else
|
||||||
|
Audio.se_play("Audio/SE/#{@blipsound}.wav", 50) unless @text.empty?
|
||||||
|
end
|
||||||
@blip = 0
|
@blip = 0
|
||||||
else
|
else
|
||||||
@blip += 1
|
@blip += 1
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue