snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from taedixon/localization 

Fix mutating strings
This commit is contained in:
GIRakaCHEEZER 2017-08-05 23:27:39 -07:00 committed by GitHub
parent fa03511289 442c16f93a
commit dc060a4b1d
6 changed files with 158 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scripts/Doc_Message.rb
View File

@ -9,14 +9,26 @@ class Doc_Message
def initialize
@viewport = Viewport.new(0, 0, 640, 480)
@sprite_bg = Sprite.new(@viewport)
@sprite_scroll_up = Sprite.new(@viewport)
@sprite_scroll_down = Sprite.new(@viewport)
if $game_switches[124] == true
@sprite_bg.bitmap = RPG::Cache.picture('lined_paper_red')
@sprite_scroll_up.bitmap = RPG::Cache.picture('scroll_up_red')
@sprite_scroll_down.bitmap = RPG::Cache.picture('scroll_down_red')
else
@sprite_bg.bitmap = RPG::Cache.picture('lined_paper_blue') #Bitmap.new(640, 480)
@sprite_scroll_up.bitmap = RPG::Cache.picture('scroll_up_blue')
@sprite_scroll_down.bitmap = RPG::Cache.picture('scroll_down_blue')
end
@sprite_bg.zoom_x = @sprite_bg.zoom_y = 2
@sprite_bg.x = 120
@sprite_bg.y = 24
@sprite_scroll_up.zoom_x = @sprite_scroll_up.zoom_y = 2
@sprite_scroll_up.x = 524
@sprite_scroll_up.y = 24
@sprite_scroll_down.zoom_x = @sprite_scroll_down.zoom_y = 2
@sprite_scroll_down.x = 524
@sprite_scroll_down.y = 424
#@sprite_bg.bitmap.fill_rect(0, 0, 640, 480, Color.new(0, 0, 0, 128))
@sprite_text = Sprite.new(@viewport)
@contents = Bitmap.new(200, 216)
@ -33,6 +45,11 @@ class Doc_Message
@sprite_bg.opacity = 0
@sprite_text.opacity = 0
@sprite_scroll_down.opacity = 0
@sprite_scroll_up.opacity = 0
@y_offset = 0
@scroll_limit = 0
# Animation flags
@fade_in = false
@ -59,6 +76,7 @@ class Doc_Message
$game_temp.message_proc = nil
end
$game_temp.message_doc_text = nil
@y_offset = 0
end
#--------------------------------------------------------------------------
# * Refresh: Load new message text and pre-process it
@ -92,7 +110,8 @@ class Doc_Message
text_raw.gsub!("\\\\", "\\")
# Now split text into lines by measuring text metrics
x = y = 0
x = 0
y = 1
maxwidth = @contents.width - HORIZ_MARGIN * 2
spacesize = @contents.text_size(' ')
for i in text_raw.split(/ /)
@ -126,6 +145,11 @@ class Doc_Message
end
end
@scroll_limit = 11 - y
if @scroll_limit > 0
@scroll_limit = 0
end
# Prepare renderer
@contents.clear
@contents.font.color = Color.new(100, 92, 255, 255)
@ -133,7 +157,7 @@ class Doc_Message
@contents.font.color = Color.new(255, 92, 100, 255)
end
x = 0
y = 0
y = 1
# Get 1 text character in c (loop until unable to get text)
while ((c = text.slice!(/./m)) != nil)
@ -155,7 +179,7 @@ class Doc_Message
next
end
# Draw text
@contents.draw_text(HORIZ_MARGIN + x, VERT_MARGIN + (y + 1) * 18 - spacesize.height, 40, 18, c)
@contents.draw_text(HORIZ_MARGIN + x, VERT_MARGIN + (y + @y_offset) * 18 - spacesize.height, 40, 18, c)
# Add x to drawn text width
x += @contents.text_size(c).width
end
@ -176,7 +200,6 @@ class Doc_Message
@viewport.visible = false
$game_temp.message_window_showing = false
end
return
end
# Handle fade-in effect
@ -189,6 +212,23 @@ class Doc_Message
@fade_in = false
$game_temp.message_window_showing = true
end
end
# set the scroll indicators to the opacity of the bg,
# or 0 if they cannot scroll further
if @y_offset < 0
@sprite_scroll_up.opacity = @sprite_bg.opacity
else
@sprite_scroll_up.opacity = 0
end
if @y_offset > @scroll_limit
@sprite_scroll_down.opacity = @sprite_bg.opacity
else
@sprite_scroll_down.opacity = 0
end
# don't perform control actions while fading msg box
if @fade_in || @fade_out
return
end
@ -197,6 +237,14 @@ class Doc_Message
terminate_message
@fade_out = true
end
if Input.trigger?(Input::UP) && @y_offset < 0
@y_offset += 1
refresh()
end
if Input.trigger?(Input::DOWN) && @y_offset > @scroll_limit
@y_offset -= 1
refresh()
end
end
# Message is over and should be hidden or advanced to next

6
scripts/Interpreter 3.rb
View File

@ -11,7 +11,11 @@ class Interpreter
#--------------------------------------------------------------------------
def command_101
# If other text has been set to message_text
if $game_temp.message_text != nil || $game_temp.message_ed_text != nil || $game_temp.message_doc_text != nil || $game_temp.message_desktop_text != nil || $game_temp.message_credits_text != nil
if $game_temp.message_text != nil ||
$game_temp.message_ed_text != nil ||
$game_temp.message_doc_text != nil ||
$game_temp.message_desktop_text != nil ||
$game_temp.message_credits_text != nil
# End
return false
end

14
scripts/RPG.rb
View File

@ -42,17 +42,3 @@ class Tone
self.red == 0 && self.green == 0 && self.blue == 0 && self.gray == 0
end
end
module Graphics
class << self
alias_method :update_native, :update
def update
#if $game_map.map_id == 97
# Oneshot.allow_exit false
#elsif $game_system.map_interpreter
# Oneshot.allow_exit ($scene == nil)
#end
update_native
end
end
end

110
scripts/Script.rb
View File

@ -373,11 +373,11 @@ module Script
end
def self.copy_journal
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games")
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games") unless File.exists?(Oneshot::DOCS_PATH + "/My Games")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot")
begin
File.open("_______.exe", "rb") do |input|
File.open(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\_______.exe","wb") do |output|
File.open(Oneshot::DOCS_PATH + "/My Games/Oneshot/_______.exe","wb") do |output|
while buff = input.read(4096)
output.write(buff)
end
@ -388,7 +388,7 @@ module Script
end
if File.exists?("README.txt")
File.open("README.txt", "rb") do |input|
File.open(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\README.txt","wb") do |output|
File.open(Oneshot::DOCS_PATH + "/My Games/Oneshot/README.txt","wb") do |output|
while buff = input.read(4096)
output.write(buff)
end
@ -398,12 +398,12 @@ module Script
end
def self.create_boxes
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games")
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot")
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal1") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal1")
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal2") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal2")
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal3") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal3")
Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games") unless File.exists?(Oneshot::DOCS_PATH + "/My Games")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal1") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal1")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal2") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal2")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal3") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal3")
Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal")
end
def self.delete_if_exists(f_name)
@ -412,25 +412,25 @@ module Script
def self.clear_boxes
for i in 1..3
portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal" + i.to_s
portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal" + i.to_s
case i
when 1
delete_if_exists(portal_path + "\\blue_npc_prototype.png")
delete_if_exists(portal_path + "\\proto1.png")
delete_if_exists(portal_path + "\\keyB.txt")
delete_if_exists(portal_path + "/blue_npc_prototype.png")
delete_if_exists(portal_path + "/proto1.png")
delete_if_exists(portal_path + "/keyB.txt")
when 2
delete_if_exists(portal_path + "\\green_npc_cedric.png")
delete_if_exists(portal_path + "\\cedric.png")
delete_if_exists(portal_path + "\\keyG.txt")
delete_if_exists(portal_path + "/green_npc_cedric.png")
delete_if_exists(portal_path + "/cedric.png")
delete_if_exists(portal_path + "/keyG.txt")
when 3
delete_if_exists(portal_path + "\\red_rue.png")
delete_if_exists(portal_path + "\\rue.png")
delete_if_exists(portal_path + "\\keyR.txt")
delete_if_exists(portal_path + "/red_rue.png")
delete_if_exists(portal_path + "/rue.png")
delete_if_exists(portal_path + "/keyR.txt")
end
end
delete_if_exists(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal\\keyB.txt")
delete_if_exists(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal\\keyG.txt")
delete_if_exists(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal\\keyR.txt")
delete_if_exists(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal/keyB.txt")
delete_if_exists(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal/keyG.txt")
delete_if_exists(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal/keyR.txt")
end
def self.copy_file(src, dst)
@ -454,20 +454,20 @@ module Script
end
def self.put_key_in_box(numb)
portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal" + numb.to_s
portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal" + numb.to_s
case numb
when 1
copy_file("Graphics\\Characters\\blue_npc_prototype.png", portal_path + "\\blue_npc_prototype.png")
copy_file("Graphics\\Faces\\proto1.png", portal_path + "\\proto1.png")
write_key(portal_path + "\\keyB.txt", PROTO_TEXT)
copy_file("Graphics/Characters/blue_npc_prototype.png", portal_path + "/blue_npc_prototype.png")
copy_file("Graphics/Faces/proto1.png", portal_path + "/proto1.png")
write_key(portal_path + "/keyB.txt", PROTO_TEXT)
when 2
copy_file("Graphics\\Characters\\green_npc_cedric.png", portal_path + "\\green_npc_cedric.png")
copy_file("Graphics\\Faces\\cedric.png", portal_path + "\\cedric.png")
write_key(portal_path + "\\keyG.txt", CEDRIC_TEXT)
copy_file("Graphics/Characters/green_npc_cedric.png", portal_path + "/green_npc_cedric.png")
copy_file("Graphics/Faces/cedric.png", portal_path + "/cedric.png")
write_key(portal_path + "/keyG.txt", CEDRIC_TEXT)
when 3
copy_file("Graphics\\Characters\\red_rue.png", portal_path + "\\red_rue.png")
copy_file("Graphics\\Faces\\rue.png", portal_path + "\\rue.png")
write_key(portal_path + "\\keyR.txt", RUE_TEXT)
copy_file("Graphics/Characters/red_rue.png", portal_path + "/red_rue.png")
copy_file("Graphics/Faces/rue.png", portal_path + "/rue.png")
write_key(portal_path + "/keyR.txt", RUE_TEXT)
end
end
@ -477,11 +477,11 @@ module Script
if !Language::LANGUAGES.include? locale
locale = 'en'
end
source_dir = "Graphics\\Fogs\\_\\scenario1\\" + locale.downcase
copy_file(source_dir + "\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
copy_file(source_dir + "\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
copy_file(source_dir + "\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
copy_file(source_dir + "\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
source_dir = "Graphics/Fogs/_/scenario1/" + locale.downcase
copy_file(source_dir + "/pw1.png", Oneshot::DOCS_PATH + "/ONESHOT_password1.png")
copy_file(source_dir + "/pw2.png", Oneshot::DOCS_PATH + "/ONESHOT_password2.png")
copy_file(source_dir + "/pw3.png", Oneshot::DOCS_PATH + "/ONESHOT_password3.png")
copy_file(source_dir + "/pw4.png", Oneshot::DOCS_PATH + "/ONESHOT_password4.png")
end
def self.password2
@ -489,46 +489,46 @@ module Script
if !Language::LANGUAGES.include? locale
locale = 'en'
end
source_dir = "Graphics\\Fogs\\_\\scenario2\\" + locale.downcase
copy_file(source_dir + "\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
copy_file(source_dir + "\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
copy_file(source_dir + "\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
copy_file(source_dir + "\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
source_dir = "Graphics/Fogs/_/scenario2/" + locale.downcase
copy_file(source_dir + "/pw1.png", Oneshot::DOCS_PATH + "/ONESHOT_password1.png")
copy_file(source_dir + "/pw2.png", Oneshot::DOCS_PATH + "/ONESHOT_password2.png")
copy_file(source_dir + "/pw3.png", Oneshot::DOCS_PATH + "/ONESHOT_password3.png")
copy_file(source_dir + "/pw4.png", Oneshot::DOCS_PATH + "/ONESHOT_password4.png")
end
=begin
def self.take_key_out_of_box(numb)
if File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Box" + numb.to_s + "\\key" + numb.to_s + ".png")
File.delete(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Box" + numb.to_s + "\\key" + numb.to_s + ".png")
if File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Box" + numb.to_s + "/key" + numb.to_s + ".png")
File.delete(Oneshot::DOCS_PATH + "/My Games/Oneshot/Box" + numb.to_s + "/key" + numb.to_s + ".png")
end
if File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigBox\\key" + numb.to_s + ".png")
File.delete(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigBox\\key" + numb.to_s + ".png")
if File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigBox/key" + numb.to_s + ".png")
File.delete(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigBox/key" + numb.to_s + ".png")
end
end
=end
def self.is_key_in_box(numb)
portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal" + numb.to_s
portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal" + numb.to_s
case numb
when 1
return File.exists?(portal_path + "\\keyB.txt")
return File.exists?(portal_path + "/keyB.txt")
when 2
return File.exists?(portal_path + "\\keyG.txt")
return File.exists?(portal_path + "/keyG.txt")
when 3
return File.exists?(portal_path + "\\keyR.txt")
return File.exists?(portal_path + "/keyR.txt")
end
return false
end
def self.is_key_in_bigbox(numb)
portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal"
portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal"
case numb
when 1
return File.exists?(portal_path + "\\keyB.txt")
return File.exists?(portal_path + "/keyB.txt")
when 2
return File.exists?(portal_path + "\\keyG.txt")
return File.exists?(portal_path + "/keyG.txt")
when 3
return File.exists?(portal_path + "\\keyR.txt")
return File.exists?(portal_path + "/keyR.txt")
end
return false
end

7
scripts/Sprite_MapText.rb
View File

@ -7,9 +7,14 @@ class Sprite_MapText < Sprite
@real_x = x * 4 * 32
@real_y = y * 4 * 32
self.bitmap = Bitmap.new(200, 24)
if (Language::FONT_WESTERN == Font.default_name)
self.zoom_x = 2
self.zoom_y = 2
self.bitmap = Bitmap.new(200, 24)
else
self.zoom_x = 1.5
self.zoom_y = 1.5
end
#calculate text width
spacewidth = self.bitmap.text_size(' ').width

5
scripts/i18n_Language.rb
View File

@ -51,14 +51,13 @@ class Language
# Translate some text
def tr(string)
#dbg_print(caller_locations(1, 1).first.tap{|loc| puts "#{loc.path}:#{loc.lineno}"})
dbg_print(string)
if @data
rv = @data[Zlib::crc32(string)] || string
else
rv = string
end
dbg_print(rv)
return rv
dbg_print(string + " -> " + rv)
return String.new(rv)
end
# Turn all database items into translatable strings