snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mathewv/master'

Browse source
This commit is contained in:
Vinyl Darkscratch 2017-04-27 21:01:26 -07:00
commit a0e78e0e56
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/RPG.rb
View file

@ -2,7 +2,16 @@
module RPG module RPG
module Cache module Cache
def self.character(filename, hue)
if $game_switches[160] && filename.start_with?("niko")
filename.gsub!(/niko/, "en")
end
self.load_bitmap("Graphics/Characters/", filename, hue)
end
def self.face(filename) def self.face(filename)
if $game_switches[160] && filename.start_with?("niko")
filename.gsub!(/niko/, "en")
end
self.load_bitmap("Graphics/Faces/", filename) self.load_bitmap("Graphics/Faces/", filename)
end end
def self.menu(filename) def self.menu(filename)

12
scripts/Window_Message.rb
View file

@ -159,9 +159,13 @@ class Window_Message < Window_Selectable
# Blit face graphic # Blit face graphic
if $game_temp.message_face != nil if $game_temp.message_face != nil
if $game_player.character_name == "niko_gasmask" || $game_player.character_name == "niko_bulb_gasmask" if $game_player.character_name == "niko_gasmask" || $game_player.character_name == "niko_bulb_gasmask" \
|| $game_player.character_name == "en_gasmask" || $game_player.character_name == "en_bulb_gasmask"
if $game_temp.message_face.start_with?("niko") if $game_temp.message_face.start_with?("niko")
$game_temp.message_face = "niko_gasmask" $game_temp.message_face = "niko_gasmask"
end
if $game_temp.message_face.start_with?("en")
$game_temp.message_face = "en_gasmask"
end end
end end
face = RPG::Cache.face($game_temp.message_face) face = RPG::Cache.face($game_temp.message_face)
@ -236,9 +240,13 @@ class Window_Message < Window_Selectable
end end
self.contents.fill_rect(self.contents.width - 96, 0, 96, 96, Color.new(0,0,0,0)) self.contents.fill_rect(self.contents.width - 96, 0, 96, 96, Color.new(0,0,0,0))
$game_temp.message_face = face_name $game_temp.message_face = face_name
if $game_player.character_name == "niko_gasmask" || $game_player.character_name == "niko_bulb_gasmask" if $game_player.character_name == "niko_gasmask" || $game_player.character_name == "niko_bulb_gasmask" \
|| $game_player.character_name == "en_gasmask" || $game_player.character_name == "en_bulb_gasmask"
if $game_temp.message_face.start_with?("niko") if $game_temp.message_face.start_with?("niko")
$game_temp.message_face = "niko_gasmask" $game_temp.message_face = "niko_gasmask"
end
if $game_temp.message_face.start_with?("en")
$game_temp.message_face = "en_gasmask"
end end
end end
face = RPG::Cache.face($game_temp.message_face) face = RPG::Cache.face($game_temp.message_face)