mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-19 13:29:54 +00:00
Fixes and updated
This commit is contained in:
DepressedTWM
parent
98c153037c
commit
b9b77d30f8
3 changed files with 10 additions and 76 deletions
|
|
@ -5,7 +5,6 @@ Ling faces updated
|
|||
Magpie faces updated
|
||||
Added ITS TIME FOR FIGHT CRIME setting(enabled fight_crime.ogg when niko on roomba)
|
||||
Added x86, ARM64 and IA-64 specific optimizations
|
||||
Game Optimized
|
||||
Added help screen in Settings
|
||||
"Skip Text (R)" fixed
|
||||
Fixed language selection
|
||||
|
|
@ -18,3 +17,5 @@ Dynamic light configured in Tower
|
|||
Added SANITIZERS build option
|
||||
"Watcher" time check function fixed
|
||||
Ruby CTime.hour added
|
||||
LoadQASave Deleted
|
||||
TPtL translation issue fixed
|
||||
|
|
|
|||
|
|
@ -162,23 +162,14 @@ module Script
|
|||
end
|
||||
|
||||
def self.countdown_over
|
||||
if Settings[:pre_solstice_update_content]
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
def self.countdown_extend_over
|
||||
if Settings[:pre_solstice_update_content]
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
def self.cdown_update(equinox)
|
||||
if Settings[:pre_solstice_update_content]
|
||||
diff = 10000
|
||||
else
|
||||
diff = 0
|
||||
end
|
||||
seconds = diff % 60
|
||||
|
|
@ -627,68 +618,6 @@ def check_exit(min, max, x: -1, y: -1)
|
|||
Script.tmp_s1 = $game_switches[11] ? false : result
|
||||
end
|
||||
|
||||
def loadQASave(fname)
|
||||
filename = "testing_saves/" + fname + ".rxdata"
|
||||
# If file doesn't exist
|
||||
unless FileTest.exist?(filename)
|
||||
filename = "testing_saves_postgame/" + fname + ".rxdata"
|
||||
unless FileTest.exist?(filename)
|
||||
# Play buzzer SE
|
||||
$game_system.se_play($data_system.buzzer_se)
|
||||
return
|
||||
end
|
||||
end
|
||||
# Play load SE
|
||||
$game_system.se_play($data_system.load_se)
|
||||
|
||||
# Read save data
|
||||
file = File.open(filename, "rb")
|
||||
# Read character data for drawing save file
|
||||
characters = Marshal.load(file)
|
||||
# Read frame count for measuring play time
|
||||
Graphics.frame_count = Marshal.load(file)
|
||||
# Read each type of game object
|
||||
$game_system = Marshal.load(file)
|
||||
$game_switches = Marshal.load(file)
|
||||
$game_variables = Marshal.load(file)
|
||||
$game_self_switches = Marshal.load(file)
|
||||
$game_screen = Marshal.load(file)
|
||||
$game_actors = Marshal.load(file)
|
||||
$game_party = Marshal.load(file)
|
||||
$game_troop = Marshal.load(file)
|
||||
$game_map = Marshal.load(file)
|
||||
$game_player = Marshal.load(file)
|
||||
$game_followers = Marshal.load(file)
|
||||
$game_oneshot = Marshal.load(file)
|
||||
$game_fasttravel = Marshal.load(file)
|
||||
$game_temp.footstep_sfx = Marshal.load(file)
|
||||
|
||||
# If magic number is different from when saving
|
||||
# (if editing was added with editor)
|
||||
if $game_system.magic_number != $data_system.magic_number
|
||||
# Load map
|
||||
$game_map.setup($game_map.map_id)
|
||||
$game_player.center($game_player.x, $game_player.y)
|
||||
end
|
||||
# Refresh party members
|
||||
$game_party.refresh
|
||||
|
||||
f_prev = $game_player
|
||||
for f in $game_followers
|
||||
f.leader = f_prev
|
||||
f.moveto($game_player.x, $game_player.y)
|
||||
f_prev = f
|
||||
end
|
||||
file.close
|
||||
# Restore BGM and BGS
|
||||
$game_system.bgm_play($game_system.playing_bgm)
|
||||
$game_system.bgs_play($game_system.playing_bgs)
|
||||
# Update map (run parallel process event)
|
||||
$game_map.update
|
||||
# Switch to map screen
|
||||
$scene = Scene_Map.new
|
||||
end
|
||||
|
||||
def kill_perma_flags
|
||||
for i in 151..175
|
||||
$game_switches[i] = false
|
||||
|
|
@ -767,7 +696,11 @@ end
|
|||
|
||||
# Misc
|
||||
def watcher_tell_time
|
||||
if Settings[:streamer_privacy]
|
||||
hour = 0
|
||||
else
|
||||
hour = CTime.hour
|
||||
end
|
||||
if hour >= 6 && hour < 12
|
||||
Script.tmp_v1 = 0
|
||||
elsif hour >= 12 && hour < 17
|
||||
|
|
@ -780,7 +713,8 @@ def watcher_tell_time
|
|||
end
|
||||
|
||||
def plight_start_timer
|
||||
$game_oneshot.plight_timer = 0 #Time.now
|
||||
# TODO: test and fix this bullshit
|
||||
$game_oneshot.plight_timer = CTime.at(0)
|
||||
end
|
||||
|
||||
def plight_update_timer
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ class Window_TPtL < Window_Selectable
|
|||
end
|
||||
|
||||
self.z = 9998
|
||||
RPG::Mod.exec_hooks("hooks/Window_TPtL/init", binding)
|
||||
end
|
||||
|
||||
def sort
|
||||
|
|
@ -122,7 +121,7 @@ class Window_TPtL < Window_Selectable
|
|||
self.contents.font.color = color
|
||||
|
||||
# Update item
|
||||
self.contents.draw_text(Rect.new(indent * 64, 32 * draw_ix, self.width - indent * 64, 32), tr(map_info&.name || "UNKNOWN_MAP"), 0)
|
||||
self.contents.draw_text(Rect.new(indent * 64, 32 * draw_ix, self.width - indent * 64, 32), map_info&.name || "UNKNOWN_MAP", 0)
|
||||
self.contents.draw_text(Rect.new(0, 32 * draw_ix, self.width - 38, 32), index.to_s, 2)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue