Changing encounter_version now updates the encounter tables immediately, title screen now plays properly if there are no splashes, compiling is now forced if any dat files are missing, other tweaks

This commit is contained in:
Maruno17
2021-12-12 23:10:01 +00:00
parent 2444b70ef6
commit 3da8b563da
5 changed files with 30 additions and 13 deletions

View File

@@ -202,6 +202,7 @@ end
class Battle::Scene::FightMenu < Battle::Scene::MenuBase class Battle::Scene::FightMenu < Battle::Scene::MenuBase
attr_reader :battler attr_reader :battler
attr_reader :shiftMode attr_reader :shiftMode
GET_MOVE_TEXT_COLOR_FROM_MOVE_BUTTON = true
# If true, displays graphics from Graphics/Pictures/Battle/overlay_fight.png # If true, displays graphics from Graphics/Pictures/Battle/overlay_fight.png
# and Graphics/Pictures/Battle/cursor_fight.png. # and Graphics/Pictures/Battle/cursor_fight.png.
@@ -350,12 +351,12 @@ class Battle::Scene::FightMenu < Battle::Scene::MenuBase
x = button.x-self.x+button.src_rect.width/2 x = button.x-self.x+button.src_rect.width/2
y = button.y-self.y+2 y = button.y-self.y+2
moveNameBase = TEXT_BASE_COLOR moveNameBase = TEXT_BASE_COLOR
if moves[i].display_type(@battler) if GET_MOVE_TEXT_COLOR_FROM_MOVE_BUTTON && moves[i].display_type(@battler)
# NOTE: This takes a colour from a particular pixel in the button # NOTE: This takes a color from a particular pixel in the button
# graphic and makes the move name's base colour that same colour. # graphic and makes the move name's base color that same color.
# The pixel is at coordinates 10,34 in the button box. If you # The pixel is at coordinates 10,34 in the button box. If you
# change the graphic, you may want to change/remove the below line # change the graphic, you may want to change the below line of
# of code to ensure the font is an appropriate colour. # code to ensure the font is an appropriate color.
moveNameBase = button.bitmap.get_pixel(10,button.src_rect.y+34) moveNameBase = button.bitmap.get_pixel(10,button.src_rect.y+34)
end end
textPos.push([moves[i].name,x,y,2,moveNameBase,TEXT_SHADOW_COLOR]) textPos.push([moves[i].name,x,y,2,moveNameBase,TEXT_SHADOW_COLOR])

View File

@@ -23,6 +23,7 @@ class Battle::Scene::Animation
picture.x = s.x picture.x = s.x
picture.y = s.y picture.y = s.y
picture.visible = s.visible picture.visible = s.visible
picture.color = s.color.clone
picture.tone = s.tone.clone picture.tone = s.tone.clone
picture.setOrigin(0,origin) picture.setOrigin(0,origin)
@pictureEx[num] = picture @pictureEx[num] = picture

View File

@@ -35,7 +35,7 @@ class PokemonGlobalMetadata
attr_accessor :bridge attr_accessor :bridge
attr_accessor :repel attr_accessor :repel
attr_accessor :flashUsed attr_accessor :flashUsed
attr_accessor :encounter_version attr_reader :encounter_version
# Map transfers # Map transfers
attr_accessor :healingSpot attr_accessor :healingSpot
attr_accessor :escapePoint attr_accessor :escapePoint
@@ -106,6 +106,13 @@ class PokemonGlobalMetadata
# Save file # Save file
@safesave = false @safesave = false
end end
def encounter_version=(value)
validate value => Integer
return if @encounter_version == value
@encounter_version = value
$PokemonEncounters.setup($game_map.map_id) if $PokemonEncounters && $game_map
end
end end

View File

@@ -18,7 +18,11 @@ class IntroEventScene < EventScene
@pic2.setOpacity(0, 0) # set opacity to 0 after waiting 0 frames @pic2.setOpacity(0, 0) # set opacity to 0 after waiting 0 frames
@index = 0 @index = 0
pbBGMPlay($data_system.title_bgm) pbBGMPlay($data_system.title_bgm)
open_splash(self, nil) if SPLASH_IMAGES.empty?
open_title_screen(self, nil)
else
open_splash(self, nil)
end
end end
def open_splash(_scene, *args) def open_splash(_scene, *args)

View File

@@ -813,13 +813,17 @@ module Compiler
# Check data files and PBS files, and recompile if any PBS file was edited # Check data files and PBS files, and recompile if any PBS file was edited
# more recently than the data files were last created # more recently than the data files were last created
dataFiles.each do |filename| dataFiles.each do |filename|
next if !safeExists?("Data/" + filename) if safeExists?("Data/" + filename)
begin begin
File.open("Data/#{filename}") { |file| File.open("Data/#{filename}") { |file|
latestDataTime = [latestDataTime, file.mtime.to_i].max latestDataTime = [latestDataTime, file.mtime.to_i].max
} }
rescue SystemCallError rescue SystemCallError
mustCompile = true
end
else
mustCompile = true mustCompile = true
break
end end
end end
textFiles.each do |filename| textFiles.each do |filename|