DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 05:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed how Pokémon markings are recorded, and allowed variants of each mark (e.g. alternate colours)

Browse Source
This commit is contained in:
Maruno17
2021-12-06 23:26:18 +00:00
parent 5a81d447d1
commit a858408951
5 changed files with 150 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
View File

@@ -609,7 +609,7 @@ class PokemonEvolutionScene
new_pkmn = pkmn.clone
new_pkmn.species = new_species
new_pkmn.name = nil
new_pkmn.markings = 0
new_pkmn.markings = []
new_pkmn.poke_ball = :POKEBALL
new_pkmn.item = nil
new_pkmn.clearAllRibbons

43
Data/Scripts/016_UI/006_UI_Summary.rb
View File

@@ -102,6 +102,9 @@ end
#
#===============================================================================
class PokemonSummary_Scene
MARK_WIDTH = 16
MARK_HEIGHT = 16
def pbUpdate
pbUpdateSpriteHash(@sprites)
end
@@ -282,12 +285,13 @@ class PokemonSummary_Scene
end
def drawMarkings(bitmap,x,y)
mark_variants = @markingbitmap.bitmap.height / MARK_HEIGHT
markings = @pokemon.markings
markrect = Rect.new(0,0,16,16)
for i in 0...6
markrect.x = i*16
markrect.y = (markings&(1<<i)!=0) ? 16 : 0
bitmap.blt(x+i*16,y,@markingbitmap.bitmap,markrect)
markrect = Rect.new(0, 0, MARK_WIDTH, MARK_HEIGHT)
(@markingbitmap.bitmap.width / MARK_WIDTH).times do |i|
markrect.x = i * MARK_WIDTH
markrect.y = [(markings[i] || 0), mark_variants - 1].min * MARK_HEIGHT
bitmap.blt(x + i * MARK_WIDTH, y, @markingbitmap.bitmap, markrect)
end
end
@@ -1067,19 +1071,21 @@ class PokemonSummary_Scene
@sprites["markingsel"].visible = true
base = Color.new(248,248,248)
shadow = Color.new(104,104,104)
ret = pokemon.markings
markings = pokemon.markings
ret = pokemon.markings.clone
markings = pokemon.markings.clone
mark_variants = @markingbitmap.bitmap.height / MARK_HEIGHT
index = 0
redraw = true
markrect = Rect.new(0,0,16,16)
markrect = Rect.new(0, 0, MARK_WIDTH, MARK_HEIGHT)
loop do
# Redraw the markings and text
if redraw
@sprites["markingoverlay"].bitmap.clear
for i in 0...6
markrect.x = i*16
markrect.y = (markings&(1<<i)!=0) ? 16 : 0
@sprites["markingoverlay"].bitmap.blt(300+58*(i%3),154+50*(i/3),@markingbitmap.bitmap,markrect)
(@markingbitmap.bitmap.width / MARK_WIDTH).times do |i|
markrect.x = i * MARK_WIDTH
markrect.y = [(markings[i] || 0), mark_variants - 1].min * MARK_HEIGHT
@sprites["markingoverlay"].bitmap.blt(300 + 58 * (i % 3), 154 + 50 * (i / 3),
@markingbitmap.bitmap, markrect)
end
textpos = [
[_INTL("Mark {1}",pokemon.name),366,90,2,base,shadow],
@@ -1117,12 +1123,13 @@ class PokemonSummary_Scene
elsif index==7 # Cancel
break
else
mask = (1<<index)
if (markings&mask)==0
markings |= mask
else
markings &= ~mask
end
markings[index] = ((markings[index] || 0) + 1) % mark_variants
redraw = true
end
elsif Input.trigger?(Input::ACTION)
if index < 6 && markings[index] > 0
pbPlayDecisionSE
markings[index] = 0
redraw = true
end
elsif Input.trigger?(Input::UP)

34
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -564,6 +564,8 @@ end
#===============================================================================
class PokemonStorageScene
attr_reader :quickswap
MARK_WIDTH = 16
MARK_HEIGHT = 16
def initialize
@command = 1
@@ -1307,18 +1309,20 @@ class PokemonStorageScene
else
pokemon = @storage.boxes[selected[0]][selected[1]]
end
markings = pokemon.markings
markings = pokemon.markings.clone
mark_variants = @markingbitmap.bitmap.height / MARK_HEIGHT
index = 0
redraw = true
markrect = Rect.new(0,0,16,16)
markrect = Rect.new(0, 0, MARK_WIDTH, MARK_HEIGHT)
loop do
# Redraw the markings and text
if redraw
@sprites["markingoverlay"].bitmap.clear
for i in 0...6
markrect.x = i*16
markrect.y = (markings&(1<<i)!=0) ? 16 : 0
@sprites["markingoverlay"].bitmap.blt(336+58*(i%3),106+50*(i/3),@markingbitmap.bitmap,markrect)
(@markingbitmap.bitmap.width / MARK_WIDTH).times do |i|
markrect.x = i * MARK_WIDTH
markrect.y = [(markings[i] || 0), mark_variants - 1].min * MARK_HEIGHT
@sprites["markingoverlay"].bitmap.blt(336 + 58 * (i % 3), 106 + 50 * (i / 3),
@markingbitmap.bitmap, markrect)
end
textpos = [
[_INTL("OK"),402,208,2,base,shadow,1],
@@ -1353,12 +1357,7 @@ class PokemonStorageScene
elsif index==7 # Cancel
break
else
mask = (1<<index)
if (markings&mask)==0
markings |= mask
else
markings &= ~mask
end
markings[index] = ((markings[index] || 0) + 1) % mark_variants
redraw = true
end
end
@@ -1383,11 +1382,12 @@ class PokemonStorageScene
end
def drawMarkings(bitmap,x,y,_width,_height,markings)
markrect = Rect.new(0,0,16,16)
for i in 0...8
markrect.x = i*16
markrect.y = (markings&(1<<i)!=0) ? 16 : 0
bitmap.blt(x+i*16,y,@markingbitmap.bitmap,markrect)
mark_variants = @markingbitmap.bitmap.height / MARK_HEIGHT
markrect = Rect.new(0, 0, MARK_WIDTH, MARK_HEIGHT)
(@markingbitmap.bitmap.width / MARK_WIDTH).times do |i|
markrect.x = i * MARK_WIDTH
markrect.y = [(markings[i] || 0), mark_variants - 1].min * MARK_HEIGHT
bitmap.blt(x + i * MARK_WIDTH, y, @markingbitmap.bitmap, markrect)
end
end