diff --git a/Data/Scripts/010_Data/001_Hardcoded data/011_TerrainTag.rb b/Data/Scripts/010_Data/001_Hardcoded data/011_TerrainTag.rb index 23591902f..9b023ce4b 100644 --- a/Data/Scripts/010_Data/001_Hardcoded data/011_TerrainTag.rb +++ b/Data/Scripts/010_Data/001_Hardcoded data/011_TerrainTag.rb @@ -95,7 +95,7 @@ GameData::TerrainTag.register({ GameData::TerrainTag.register({ :id => :Rock, - :id_number => 4, + :id_number => 15, :battle_environment => :Rock }) @@ -109,12 +109,20 @@ GameData::TerrainTag.register({ }) GameData::TerrainTag.register({ - :id => :StillWater, + :id => :WaterCurrent, :id_number => 6, :can_surf => true, :can_fish => true, - :battle_environment => :StillWater, - :shows_reflections => true + :battle_environment => :MovingWater +}) + +GameData::TerrainTag.register({ + :id => :StillWater, + :id_number => 17, + :can_surf => true, + :can_fish => true, + :battle_environment => :StillWater + #:shows_reflections => true }) GameData::TerrainTag.register({ @@ -182,7 +190,7 @@ GameData::TerrainTag.register({ GameData::TerrainTag.register({ :id => :Bridge, - :id_number => 15, + :id_number => 4, :bridge => true }) @@ -190,5 +198,5 @@ GameData::TerrainTag.register({ :id => :Puddle, :id_number => 16, :battle_environment => :Puddle, - :shows_reflections => true + :shows_reflections => false }) diff --git a/Data/Scripts/050_AddOns/BattleLounge.rb b/Data/Scripts/050_AddOns/BattleLounge.rb index ac27d65fd..43676ccdd 100644 --- a/Data/Scripts/050_AddOns/BattleLounge.rb +++ b/Data/Scripts/050_AddOns/BattleLounge.rb @@ -64,23 +64,23 @@ end GENERIC_PRIZES_MULTI = [:HEARTSCALE,:LEMONADE] GENERIC_PRIZES_SINGLE = [:RARECANDY,:RARECANDY,:PPUP,:EJECTBUTTON,:FOCUSBAND,:FOCUSSASH,:RESETURGE,:ABILITYURGE,:ITEMURGE,:ITEMDROP,:HPUP] -MONSTER_PRIZES = [:RAREBONE,:LAGGINGTAIL,:RAZORFANG,:RAZORCLAW] +MONSTER_PRIZES = [:RAREBONE,:LAGGINGTAIL,:RAZORFANG,:RAZORCLAW,:GRIPCLAW] WATER_PRIZES = [:MYSTICWATER,:BIGPEARL] BUG_PRIZES = [:SILVERPOWDER,:SHEDSHELL] -FLYING_PRIZES = [:HEALTHWING,:MUSCLEWING,:RESISTWING,:GENIUSWING,:CLEVERWING,:SWIFTWING] -FIELD_PRIZES = [:MOOMOOMILK,:IRONBALL] -FAIRY_PRIZES = [:STARPIECE,:DESTINYKNOT] +FLYING_PRIZES = [:AIRBALLOON,:FLOATSTONE] +FIELD_PRIZES = [:MOOMOOMILK,:IRONBALL,:RAREBONE] +FAIRY_PRIZES = [:STARPIECE,:DESTINYKNOT,:MAXELIXIR] HUMAN_PRIZES = [:BLACKBELT,:RINGTARGET,:EXPERTBELT] GRASS_PRIZES = [:REVIVALHERB,:POWERHERB,:HEALPOWDER,:ABSORBBULB,:BIGMUSHROOM] -MINERAL_PRIZES = [:CELLBATTERY] +MINERAL_PRIZES = [:CELLBATTERY,:SHINYSTONE,:BIGNUGGET,:RELICCOPPER,:RELICGOLD,:RELICSILVER] AMORPHOUS_PRIZES = [:SPELLTAG,:WIDELENS,:ZOOMLENS,:SCOPELENS] -DRAGON_PRIZES = [:DRAGONSCALE,:DRAGONFANG] +DRAGON_PRIZES = [:DRAGONSCALE,:DRAGONFANG,:RARECANDY] UNDISCOVERED_PRIZES = [:MASTERBALL,:SACREDASH] #todo: prizes related to the group (ex: dragon fang for dragon types, TMs, etc. ) # todo: if heartscale, give a random amount from 10-20 def get_random_battle_lounge_prize(group_type) generic_prizes = [GENERIC_PRIZES_MULTI, GENERIC_PRIZES_SINGLE] - is_generic_prize = rand(2)==1 + is_generic_prize = rand(3)==1 if is_generic_prize type = generic_prizes.sample return type.sample @@ -93,7 +93,8 @@ def get_random_battle_lounge_prize(group_type) when :Field ; return FIELD_PRIZES.sample when :Fairy ; return FAIRY_PRIZES.sample when :Grass ; return GRASS_PRIZES.sample - when :Humanlike ; return MINERAL_PRIZES.sample + when :Mineral ; return MINERAL_PRIZES.sample + when :Humanlike ; return HUMAN_PRIZES.sample when :Amorphous ; return AMORPHOUS_PRIZES.sample when :Dragon ; return DRAGON_PRIZES.sample when :Undiscovered ; return UNDISCOVERED_PRIZES.sample diff --git a/Data/Scripts/050_AddOns/IntroScreen.rb b/Data/Scripts/050_AddOns/IntroScreen.rb index 4e6af3e9b..b38d08997 100644 --- a/Data/Scripts/050_AddOns/IntroScreen.rb +++ b/Data/Scripts/050_AddOns/IntroScreen.rb @@ -1,4 +1,3 @@ - #=============================================================================== # New animated Title Screens for Pokemon Essentials # by Luka S.J. @@ -15,12 +14,13 @@ SCREENSTYLE = 1 class Scene_Intro alias main_old main + def main Graphics.transition(0) # Cycles through the intro pictures - @skip=false + @skip = false # Selects title screen style - @screen=GenOneStyle.new + @screen = GenOneStyle.new # Plays the title screen intro (is skippable) @screen.intro # Creates/updates the main title screen loop @@ -29,7 +29,7 @@ class Scene_Intro end def update - ret=0 + ret = 0 loop do @screen.update Graphics.update @@ -37,17 +37,17 @@ class Scene_Intro if Input.press?(Input::DOWN) && Input.press?(Input::B) && Input.press?(Input::CTRL) - ret=1 + ret = 1 break end if Input.trigger?(Input::C) - ret=2 + ret = 2 break end end case ret when 1 - closeSplashDelete(scene,args) + closeSplashDelete(scene, args) when 2 closeTitle end @@ -55,7 +55,7 @@ class Scene_Intro def closeTitle # Play Pokemon cry - pbSEPlay("Absorb2",100,100) + pbSEPlay("Absorb2", 100, 100) # Fade out pbBGMStop(1.0) # disposes current title screen @@ -71,8 +71,8 @@ class Scene_Intro # disposes current title screen disposeTitle # initializes delete screen - sscene=PokemonLoadScene.new - sscreen=PokemonLoad.new(sscene) + sscene = PokemonLoadScene.new + sscreen = PokemonLoad.new(sscene) sscreen.pbStartDeleteScreen end @@ -104,141 +104,140 @@ class Scene_Intro frames.times do Graphics.update Input.update - @skip=true if Input.trigger?(Input::C) + @skip = true if Input.trigger?(Input::C) end end end + #=============================================================================== # Styled to look like the FRLG games #=============================================================================== class GenOneStyle - - - def initialize - Kernel.pbDisplayText("Version " + Settings::GAME_VERSION_NUMBER,254,308,99999) - @maxPoke = 140 #1st gen, pas de legend la premiere fois, graduellement plus de poke + Kernel.pbDisplayText("Version " + Settings::GAME_VERSION_NUMBER, 254, 308, 99999) + @maxPoke = 140 #1st gen, pas de legend la premiere fois, graduellement plus de poke @customPokeList = getCustomSpeciesList() #Get random Pokemon (1st gen orandPokenly, pas de legend la prmeiere fois) - randPoke = getRandomCustomFusion(true,@customPokeList,@maxPoke) - randpoke1 = randPoke[0] #rand(@maxPoke)+1 - randpoke2 = randPoke[1] #rand(@maxPoke)+1 + randPoke = getRandomCustomFusion(true, @customPokeList, @maxPoke) + randpoke1 = randPoke[0] #rand(@maxPoke)+1 + randpoke2 = randPoke[1] #rand(@maxPoke)+1 randpoke1s = randpoke1.to_s randpoke2s = randpoke2.to_s - path_s1 = "Graphics/Battlers/"+ randpoke1s+"/"+randpoke1s +".png" - path_s2 = "Graphics/Battlers/"+ randpoke2s+"/"+randpoke2s +".png" - path_f = getFusedPath(randpoke1,randpoke2) + path_s1 = "Graphics/Battlers/" + randpoke1s + "/" + randpoke1s + ".png" + path_s2 = "Graphics/Battlers/" + randpoke2s + "/" + randpoke2s + ".png" + path_f = getFusedPath(randpoke1, randpoke2) @prevPoke1 = randpoke1 @prevPoke2 = randpoke2 #Get Fused Poke - fusedpoke = (randpoke2*NB_POKEMON)+randpoke1 - fusedpoke_s =fusedpoke.to_s + fusedpoke = (randpoke2 * NB_POKEMON) + randpoke1 + fusedpoke_s = fusedpoke.to_s + + @selector_pos = 0 #1: left, 0:right # sound file for playing the title screen BGM - bgm="Pokemon Red-Blue Opening" - @skip=false + bgm = "Pokemon Red-Blue Opening" + @skip = false # speed of the effect movement - @speed=16 - @opacity=17 - @disposed=false + @speed = 16 + @opacity = 17 + @disposed = false - @currentFrame=0 + @currentFrame = 0 # calculates after how many frames the game will reset #@totalFrames=getPlayTime("Audio/BGM/#{bgm}")*Graphics.frame_rate - @totalFrames=10*Graphics.frame_rate - + @totalFrames = 10 * Graphics.frame_rate pbBGMPlay(bgm) # creates all the necessary graphics - @viewport=Viewport.new(0,0,Graphics.width,Graphics.height) - @viewport.z=99998 - @sprites={} + @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) + @viewport.z = 99998 + @sprites = {} - @sprites["bars"]=Sprite.new(@viewport) - @sprites["bars"].bitmap=pbBitmap("Graphics/Titles/gen1_bars") - @sprites["bars"].x=Graphics.width - @sprites["bg"]=Sprite.new(@viewport) - @sprites["bg"].bitmap=pbBitmap("Graphics/Titles/gen1_bg") - @sprites["bg"].x=-Graphics.width + @sprites["bars"] = Sprite.new(@viewport) + @sprites["bars"].bitmap = pbBitmap("Graphics/Titles/gen1_bars") + @sprites["bars"].x = Graphics.width + @sprites["bg"] = Sprite.new(@viewport) + @sprites["bg"].bitmap = pbBitmap("Graphics/Titles/gen1_bg") + @sprites["bg"].x = -Graphics.width #@sprites["bg2"]=Sprite.new(@viewport) #@sprites["bg2"].bitmap=pbBitmap("Graphics/Titles/gen1_bg_litup") #@sprites["bg2"].opacity=0 - #@sprites["start"]=Sprite.new(@viewport) #@sprites["start"].bitmap=pbBitmap("Graphics/Titles/pokelogo3") #@sprites["start"].x=138 #@sprites["start"].y=300 #@sprites["start"].opacity=255 - @sprites["effect"]=AnimatedPlane.new(@viewport) - @sprites["effect"].bitmap=pbBitmap("Graphics/Titles/gen1_effect") - @sprites["effect"].opacity=155 - @sprites["effect"].visible=false + @sprites["effect"] = AnimatedPlane.new(@viewport) + @sprites["effect"].bitmap = pbBitmap("Graphics/Titles/gen1_effect") + @sprites["effect"].opacity = 155 + @sprites["effect"].visible = false + @sprites["selector"] = Sprite.new(@viewport) + @sprites["selector"].bitmap = pbBitmap("Graphics/Titles/selector") + @sprites["selector"].x = 0 + @sprites["selector"].y = 200 + @sprites["selector"].opacity = 0 + @sprites["poke"] = Sprite.new(@viewport) + @sprites["poke"].bitmap = pbBitmap(path_s1) + @sprites["poke"].x = 400 + @sprites["poke"].y = 75 + @sprites["2poke"] = Sprite.new(@viewport) + @sprites["2poke"].bitmap = pbBitmap(path_s2) + @sprites["2poke"].x = -150 + @sprites["2poke"].y = 75 - @sprites["poke"]=Sprite.new(@viewport) - @sprites["poke"].bitmap=pbBitmap(path_s1) - @sprites["poke"].x=400 - @sprites["poke"].y=75 + @sprites["fpoke"] = Sprite.new(@viewport) + @sprites["fpoke"].bitmap = pbBitmap(path_f) + @sprites["fpoke"].x = 125 + @sprites["fpoke"].y = 75 + @sprites["fpoke"].z = 999 + @sprites["fpoke"].opacity = 0 - @sprites["2poke"]=Sprite.new(@viewport) - @sprites["2poke"].bitmap=pbBitmap(path_s2) - @sprites["2poke"].x=-150 - @sprites["2poke"].y=75 + @sprites["poke"].tone = Tone.new(0, 0, 0, 255) + @sprites["poke"].opacity = 0 + @sprites["poke2"] = Sprite.new(@viewport) + @sprites["poke2"].bitmap = pbBitmap("Graphics/Battlers/21364") + @sprites["poke2"].tone = Tone.new(255, 255, 255, 255) + @sprites["poke2"].src_rect.set(0, Graphics.height, Graphics.width, 48) + @sprites["poke2"].y = Graphics.height + @sprites["poke2"].y = 100 - @sprites["fpoke"]=Sprite.new(@viewport) - @sprites["fpoke"].bitmap=pbBitmap(path_f) - @sprites["fpoke"].x=125 - @sprites["fpoke"].y=75 - @sprites["fpoke"].z=999 - @sprites["fpoke"].opacity=0 + @sprites["2poke"].tone = Tone.new(0, 0, 0, 255) + @sprites["2poke"].opacity = 0 + @sprites["2poke2"] = Sprite.new(@viewport) + @sprites["2poke2"].bitmap = pbBitmap("Graphics/Battlers/special/000") + @sprites["2poke2"].tone = Tone.new(255, 255, 255, 255) + @sprites["2poke2"].src_rect.set(0, Graphics.height, Graphics.width, 48) + @sprites["2poke2"].y = Graphics.height + @sprites["2poke2"].y = 100 - @sprites["poke"].tone=Tone.new(0,0,0,255) - @sprites["poke"].opacity=0 - @sprites["poke2"]=Sprite.new(@viewport) - @sprites["poke2"].bitmap=pbBitmap("Graphics/Battlers/21364") - @sprites["poke2"].tone=Tone.new(255,255,255,255) - @sprites["poke2"].src_rect.set(0,Graphics.height,Graphics.width,48) - @sprites["poke2"].y=Graphics.height - @sprites["poke2"].y=100 - - @sprites["2poke"].tone=Tone.new(0,0,0,255) - @sprites["2poke"].opacity=0 - @sprites["2poke2"]=Sprite.new(@viewport) - @sprites["2poke2"].bitmap=pbBitmap("Graphics/Battlers/special/000") - @sprites["2poke2"].tone=Tone.new(255,255,255,255) - @sprites["2poke2"].src_rect.set(0,Graphics.height,Graphics.width,48) - @sprites["2poke2"].y=Graphics.height - @sprites["2poke2"].y=100 - - - @sprites["logo"]=Sprite.new(@viewport) + @sprites["logo"] = Sprite.new(@viewport) #bitmap2=pbBitmap("Graphics/Titles/pokelogo2") - bitmap1=pbBitmap("Graphics/Titles/pokelogo") - @sprites["logo"].bitmap=Bitmap.new(bitmap1.width,bitmap1.height) - @sprites["logo"].bitmap.blt(0,0,bitmap1,Rect.new(0,0,bitmap1.width,bitmap1.height)) + bitmap1 = pbBitmap("Graphics/Titles/pokelogo") + @sprites["logo"].bitmap = Bitmap.new(bitmap1.width, bitmap1.height) + @sprites["logo"].bitmap.blt(0, 0, bitmap1, Rect.new(0, 0, bitmap1.width, bitmap1.height)) #@sprites["logo"].bitmap.blt(0,0,bitmap2,Rect.new(0,40,bitmap2.width,bitmap2.height)) - @sprites["logo"].tone=Tone.new(255,255,255,255) - @sprites["logo"].x=50 - @sprites["logo"].y=-20 - @sprites["logo"].opacity=0 - - @sprites["star"]=Sprite.new(@viewport) - @sprites["star"].bitmap=pbBitmap("Graphics/Pictures/darkness") - @sprites["star"].opacity=0 - @sprites["star"].x=-50 - @sprites["star"].y=0 + @sprites["logo"].tone = Tone.new(255, 255, 255, 255) + @sprites["logo"].x = 50 + @sprites["logo"].y = -20 + @sprites["logo"].opacity = 0 + @sprites["star"] = Sprite.new(@viewport) + @sprites["star"].bitmap = pbBitmap("Graphics/Pictures/darkness") + @sprites["star"].opacity = 0 + @sprites["star"].x = -50 + @sprites["star"].y = 0 end @@ -249,169 +248,181 @@ class GenOneStyle wait(32) 64.times do - @sprites["2poke"].opacity+=4 - @sprites["poke"].opacity+=4 + @sprites["2poke"].opacity += 4 + @sprites["poke"].opacity += 4 wait(1) end 8.times do - @sprites["bg"].x+=64 + @sprites["bg"].x += 64 wait(1) end wait(8) 8.times do - @sprites["bars"].x-=64 + @sprites["bars"].x -= 64 wait(1) end wait(8) - @sprites["logo"].opacity=255 - @sprites["poke2"].opacity=255 - @sprites["2poke2"].opacity=255 + @sprites["logo"].opacity = 255 + @sprites["poke2"].opacity = 255 + @sprites["2poke2"].opacity = 255 - @sprites["poke"].tone=Tone.new(0,0,0,0) - @sprites["2poke"].tone=Tone.new(0,0,0,0) + @sprites["poke"].tone = Tone.new(0, 0, 0, 0) + @sprites["2poke"].tone = Tone.new(0, 0, 0, 0) - @sprites["effect"].visible=false - c=255.0 + @sprites["effect"].visible = false + c = 255.0 16.times do - @sprites["poke2"].opacity-=255.0/16 - @sprites["2poke2"].opacity-=255.0/16 + @sprites["poke2"].opacity -= 255.0 / 16 + @sprites["2poke2"].opacity -= 255.0 / 16 - c-=255.0/16 - @sprites["logo"].tone=Tone.new(c,c,c) - @sprites["effect"].ox+=@speed + c -= 255.0 / 16 + @sprites["logo"].tone = Tone.new(c, c, c) + @sprites["effect"].ox += @speed wait(1) end end TONE_INCR = 15 + def makeShineEffect() newColor = @sprites["poke"].tone.red + TONE_INCR - newTone =Tone.new(newColor,newColor,newColor,0) - @sprites["poke"].tone=newTone - @sprites["2poke"].tone=newTone + newTone = Tone.new(newColor, newColor, newColor, 0) + @sprites["poke"].tone = newTone + @sprites["2poke"].tone = newTone end - def introloop - @sprites["star"].opacity=0 - @sprites["poke"].opacity=255 - @sprites["2poke"].opacity=255 - @sprites["fpoke"].opacity=0 + @sprites["star"].opacity = 0 + @sprites["poke"].opacity = 255 + @sprites["2poke"].opacity = 255 + @sprites["fpoke"].opacity = 0 + @sprites["poke"].x = @sprites["poke"].x - 1 + @sprites["2poke"].x = @sprites["2poke"].x + 1 - @sprites["poke"].x=@sprites["poke"].x-1 - @sprites["2poke"].x=@sprites["2poke"].x+1 end - - def update - @sprites["effect"].ox+=@speed - @currentFrame+=1 - @skip =false - - - if @sprites["poke"].x < 175#150 - makeShineEffect() + def update_selector_position() + if Input.press?(Input::RIGHT) || Input.press?(Input::LEFT) + if Input.press?(Input::RIGHT) + @selector_pos = 0 + @sprites["selector"].opacity = 100 + elsif Input.press?(Input::LEFT) + @selector_pos = 1 + @sprites["selector"].opacity = 100 + end + else + @sprites["selector"].opacity=0 end + if @selector_pos == 0 + @sprites["selector"].x = @sprites["poke"].x + else + @sprites["selector"].x = @sprites["2poke"].x + end + end - if @sprites["poke"].x > @sprites["2poke"].x - @sprites["poke"].x=@sprites["poke"].x-1 - @sprites["2poke"].x=@sprites["2poke"].x+1 + def update + @sprites["effect"].ox += @speed + @currentFrame += 1 + @skip = false + + if @sprites["poke"].x < 175 #150 + makeShineEffect() + end + update_selector_position() + if @sprites["poke"].x > @sprites["2poke"].x + @sprites["poke"].x = @sprites["poke"].x - 1 + @sprites["2poke"].x = @sprites["2poke"].x + 1 #@sprites["effect"].opacity-=1 #@sprites["bg"].opacity-=1 #@sprites["bg2"].opacity+=3 end - - if @sprites["poke"].x <= @sprites["2poke"].x - @sprites["poke"].opacity=0 - @sprites["2poke"].opacity=0 + if @sprites["poke"].x <= @sprites["2poke"].x + @sprites["poke"].opacity = 0 + @sprites["2poke"].opacity = 0 #16.times do - @sprites["fpoke"].opacity=255 + @sprites["fpoke"].opacity = 255 + @sprites["selector"].opacity = 0 #wait(1) #end - @sprites["poke"].x=400 - @sprites["poke"].tone = Tone.new(0,0,0,0) + @sprites["poke"].x = 400 + @sprites["poke"].tone = Tone.new(0, 0, 0, 0) - @sprites["2poke"].x=-150 - @sprites["2poke"].tone = Tone.new(0,0,0,0) + @sprites["2poke"].x = -150 + @sprites["2poke"].tone = Tone.new(0, 0, 0, 0) - if @maxPoke < NB_POKEMON-1 + if @maxPoke < NB_POKEMON - 1 @maxPoke += 5 #-1 pour que ca arrive pile. tant pis pour kyurem end - randPoke = getRandomCustomFusion(true,@customPokeList,@maxPoke) - randpoke1 = randPoke[0] #rand(@maxPoke)+1 - randpoke2 = randPoke[1] #rand(@maxPoke)+1 + randPoke = getRandomCustomFusion(true, @customPokeList, @maxPoke) + randpoke1 = randPoke[0] #rand(@maxPoke)+1 + randpoke2 = randPoke[1] #rand(@maxPoke)+1 randpoke1s = randpoke1.to_s randpoke2s = randpoke2.to_s - path_s1 = "Graphics/Battlers/"+ randpoke1s+"/"+randpoke1s +".png" - path_s2 = "Graphics/Battlers/"+ randpoke2s+"/"+randpoke2s + ".png" - path_f = getFusedPath(randpoke1,randpoke2) + path_s1 = "Graphics/Battlers/" + randpoke1s + "/" + randpoke1s + ".png" + path_s2 = "Graphics/Battlers/" + randpoke2s + "/" + randpoke2s + ".png" + path_f = getFusedPath(randpoke1, randpoke2) - path_fMod = getFusedPath(@prevPoke1,@prevPoke2) - @sprites["fpoke"].bitmap=pbBitmap(path_fMod) + path_fMod = getFusedPath(@prevPoke1, @prevPoke2) + @sprites["fpoke"].bitmap = pbBitmap(path_fMod) @prevPoke1 = randpoke1 @prevPoke2 = randpoke2 - @sprites["poke"].bitmap=pbBitmap(path_s1) - @sprites["2poke"].bitmap=pbBitmap(path_s2) + @sprites["poke"].bitmap = pbBitmap(path_s1) + @sprites["2poke"].bitmap = pbBitmap(path_s2) wait(150) # fusedpoke = (randpoke2*151)+randpoke1 #fusedpoke_s =fusedpoke.to_s - @sprites["fpoke"].bitmap=pbBitmap(path_f) + @sprites["fpoke"].bitmap = pbBitmap(path_f) #@sprites["effect"].opacity=155 #@sprites["bg"].opacity=255 #@sprites["bg2"].opacity=0 end + @sprites["fpoke"].opacity -= 10 + @sprites["effect"].ox += @speed - - @sprites["fpoke"].opacity-=10 - @sprites["effect"].ox+=@speed - - if @currentFrame>=@totalFrames + if @currentFrame >= @totalFrames introloop end end + + #new version + def getFusedPath(randpoke1, randpoke2) + path = rand(2) == 0 ? GetSpritePathForced(randpoke1, randpoke2, true) : GetSpritePathForced(randpoke2, randpoke1, true) + if Input.press?(Input::RIGHT) + path = GetSpritePathForced(randpoke1, randpoke2, true) + elsif Input.press?(Input::LEFT) + path = GetSpritePathForced(randpoke2, randpoke1, true) + end + return path + end + end - -def getFusedPatho(randpoke1s,randpoke2s) - path = rand(2) == 0 ? "Graphics/Battlers/"+ randpoke1s+"/"+randpoke1s+"."+randpoke2s : "Graphics/Battlers/"+ randpoke2s+"/"+randpoke2s+"."+randpoke1s +def getFusedPatho(randpoke1s, randpoke2s) + path = rand(2) == 0 ? "Graphics/Battlers/" + randpoke1s + "/" + randpoke1s + "." + randpoke2s : "Graphics/Battlers/" + randpoke2s + "/" + randpoke2s + "." + randpoke1s if Input.press?(Input::RIGHT) - path = "Graphics/Battlers/"+ randpoke2s+"/"+randpoke2s+"."+randpoke1s + path = "Graphics/Battlers/" + randpoke2s + "/" + randpoke2s + "." + randpoke1s elsif Input.press?(Input::LEFT) - path = "Graphics/Battlers/"+ randpoke1s+"/"+randpoke1s+"."+randpoke2s + path = "Graphics/Battlers/" + randpoke1s + "/" + randpoke1s + "." + randpoke2s end return path end - -#new version -def getFusedPath(randpoke1,randpoke2) - path = rand(2) == 0 ? GetSpritePathForced(randpoke1,randpoke2,true) :GetSpritePathForced(randpoke2,randpoke1,true) - if Input.press?(Input::RIGHT) - path = GetSpritePathForced(randpoke1,randpoke2,true) - elsif Input.press?(Input::LEFT) - path = GetSpritePathForced(randpoke2,randpoke1,true) - end - return path -end - - - def dispose Kernel.pbClearText() pbFadeOutAndHide(@sprites) pbDisposeSpriteHash(@sprites) @viewport.dispose - @disposed=true + @disposed = true end def disposed? @@ -421,8 +432,8 @@ end def wait(frames) return if @skip frames.times do - @currentFrame+=1 - @sprites["effect"].ox+=@speed + @currentFrame += 1 + @sprites["effect"].ox += @speed Graphics.update Input.update @@ -435,147 +446,141 @@ end #end - - - - #=============================================================================== # Styled to look like the gen 3 games #=============================================================================== class GenThreeStyle def initialize # sound file for playing the title screen BGM - bgm="rse opening" - @skip=false + bgm = "rse opening" + @skip = false # speed of the effect movement - @speed=1 - @opacity=2 - @frame=0 - @disposed=false + @speed = 1 + @opacity = 2 + @frame = 0 + @disposed = false - @currentFrame=0 + @currentFrame = 0 # calculates after how many frames the game will reset #@totalFrames=getPlayTime("Audio/BGM/#{bgm}")*Graphics.frame_rate - @totalFrames=10*Graphics.frame_rate + @totalFrames = 10 * Graphics.frame_rate pbBGMPlay(bgm) # creates all the necessary graphics - @viewport=Viewport.new(0,0,Graphics.width,Graphics.height) - @viewport.z=99999 - @sprites={} + @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) + @viewport.z = 99999 + @sprites = {} - @sprites["bg"]=Sprite.new(@viewport) - @sprites["bg"].bitmap=pbBitmap("Graphics/Titles/gen3_bg") - @sprites["bg"].tone=Tone.new(255,255,255) - @sprites["bg"].opacity=0 + @sprites["bg"] = Sprite.new(@viewport) + @sprites["bg"].bitmap = pbBitmap("Graphics/Titles/gen3_bg") + @sprites["bg"].tone = Tone.new(255, 255, 255) + @sprites["bg"].opacity = 0 #@sprites["bg2"]=Sprite.new(@viewport) #@sprites["bg2"].bitmap=pbBitmap("Graphics/Titles/gen3_bg") #@sprites["bg2"].tone=Tone.new(255,255,255) #@sprites["bg2"].opacity=0 - @sprites["poke1"]=Sprite.new(@viewport) - @sprites["poke1"].bitmap=pbBitmap("Graphics/Titles/gen3_poke1") - @sprites["poke1"].opacity=0 - @sprites["poke2"]=Sprite.new(@viewport) - @sprites["poke2"].bitmap=pbBitmap("Graphics/Titles/gen3_poke2") - @sprites["poke2"].opacity=0 - @sprites["effect"]=AnimatedPlane.new(@viewport) - @sprites["effect"].bitmap=pbBitmap("Graphics/Titles/gen3_effect") - @sprites["effect"].visible=false + @sprites["poke1"] = Sprite.new(@viewport) + @sprites["poke1"].bitmap = pbBitmap("Graphics/Titles/gen3_poke1") + @sprites["poke1"].opacity = 0 + @sprites["poke2"] = Sprite.new(@viewport) + @sprites["poke2"].bitmap = pbBitmap("Graphics/Titles/gen3_poke2") + @sprites["poke2"].opacity = 0 + @sprites["effect"] = AnimatedPlane.new(@viewport) + @sprites["effect"].bitmap = pbBitmap("Graphics/Titles/gen3_effect") + @sprites["effect"].visible = false + @sprites["logo2"] = Sprite.new(@viewport) + @sprites["logo2"].bitmap = pbBitmap("Graphics/Titles/pokelogo2") + @sprites["logo2"].x = 50 + @sprites["logo2"].y = 24 - 32 + @sprites["logo2"].opacity = 0 - @sprites["logo2"]=Sprite.new(@viewport) - @sprites["logo2"].bitmap=pbBitmap("Graphics/Titles/pokelogo2") - @sprites["logo2"].x=50 - @sprites["logo2"].y=24-32 - @sprites["logo2"].opacity=0 + @sprites["logo1"] = Sprite.new(@viewport) + @sprites["logo1"].bitmap = pbBitmap("Graphics/Titles/pokelogo") + @sprites["logo1"].x = 50 + @sprites["logo1"].y = 24 + 64 + @sprites["logo1"].opacity = 0 - @sprites["logo1"]=Sprite.new(@viewport) - @sprites["logo1"].bitmap=pbBitmap("Graphics/Titles/pokelogo") - @sprites["logo1"].x=50 - @sprites["logo1"].y=24+64 - @sprites["logo1"].opacity=0 - - - - @sprites["logo3"]=Sprite.new(@viewport) - @sprites["logo3"].bitmap=pbBitmap("Graphics/Titles/pokelogo") - @sprites["logo3"].tone=Tone.new(255,255,255) - @sprites["logo3"].x=18 - @sprites["logo3"].y=24+64 - @sprites["logo3"].src_rect.set(-34,0,34,230) - @sprites["start"]=Sprite.new(@viewport) - @sprites["start"].bitmap=pbBitmap("Graphics/Titles/pokelogo3") - @sprites["start"].x=178 - @sprites["start"].y=312 - @sprites["start"].visible=true + @sprites["logo3"] = Sprite.new(@viewport) + @sprites["logo3"].bitmap = pbBitmap("Graphics/Titles/pokelogo") + @sprites["logo3"].tone = Tone.new(255, 255, 255) + @sprites["logo3"].x = 18 + @sprites["logo3"].y = 24 + 64 + @sprites["logo3"].src_rect.set(-34, 0, 34, 230) + @sprites["start"] = Sprite.new(@viewport) + @sprites["start"].bitmap = pbBitmap("Graphics/Titles/pokelogo3") + @sprites["start"].x = 178 + @sprites["start"].y = 312 + @sprites["start"].visible = true end + def intro 16.times do - @sprites["logo1"].opacity+=16 + @sprites["logo1"].opacity += 16 wait(1) end wait(16) 12.times do - @sprites["logo3"].x+=34 - @sprites["logo3"].src_rect.x+=34 + @sprites["logo3"].x += 34 + @sprites["logo3"].src_rect.x += 34 wait(1) end - @sprites["logo3"].x=18 - @sprites["logo3"].src_rect.x=-34 + @sprites["logo3"].x = 18 + @sprites["logo3"].src_rect.x = -34 wait(32) 2.times do 12.times do - @sprites["logo3"].x+=34 - @sprites["logo3"].src_rect.x+=34 - @sprites["bg"].opacity+=21.5 + @sprites["logo3"].x += 34 + @sprites["logo3"].src_rect.x += 34 + @sprites["bg"].opacity += 21.5 wait(1) end - @sprites["logo3"].x=18 - @sprites["logo3"].src_rect.x=-34 + @sprites["logo3"].x = 18 + @sprites["logo3"].src_rect.x = -34 wait(4) 16.times do - @sprites["bg"].opacity-=16 + @sprites["bg"].opacity -= 16 wait(1) end wait(32) end - @sprites["logo3"].visible=false + @sprites["logo3"].visible = false 16.times do - @sprites["logo1"].y-=2 + @sprites["logo1"].y -= 2 wait(1) end 16.times do - @sprites["logo2"].y+=2 - @sprites["logo2"].opacity+=16 - @sprites["logo1"].y-=2 + @sprites["logo2"].y += 2 + @sprites["logo2"].opacity += 16 + @sprites["logo1"].y -= 2 wait(1) end wait(56) - @sprites["bg"].tone=Tone.new(0,0,0) - @sprites["bg"].opacity=255 - @sprites["poke1"].opacity=255 - @sprites["effect"].visible=true + @sprites["bg"].tone = Tone.new(0, 0, 0) + @sprites["bg"].opacity = 255 + @sprites["poke1"].opacity = 255 + @sprites["effect"].visible = true end def update - @currentFrame+=1 - @frame+=1 - @sprites["effect"].oy+=@speed - @sprites["poke2"].opacity+=@opacity - @opacity=-2 if @sprites["poke2"].opacity>=255 - @opacity=+2 if @sprites["poke2"].opacity<=0 - if @frame==8 - @sprites["start"].visible=true - elsif @frame==24 - @sprites["start"].visible=false - @frame=0 + @currentFrame += 1 + @frame += 1 + @sprites["effect"].oy += @speed + @sprites["poke2"].opacity += @opacity + @opacity = -2 if @sprites["poke2"].opacity >= 255 + @opacity = +2 if @sprites["poke2"].opacity <= 0 + if @frame == 8 + @sprites["start"].visible = true + elsif @frame == 24 + @sprites["start"].visible = false + @frame = 0 end - if @currentFrame>=@totalFrames + if @currentFrame >= @totalFrames raise Reset.new end end @@ -584,7 +589,7 @@ class GenThreeStyle pbFadeOutAndHide(@sprites) pbDisposeSpriteHash(@sprites) @viewport.dispose - @disposed=true + @disposed = true end def disposed? @@ -594,12 +599,11 @@ class GenThreeStyle def wait(frames) return if @skip - frames.times do - @currentFrame+=1 + @currentFrame += 1 Graphics.update Input.update - @skip=true if Input.trigger?(Input::C) + @skip = true if Input.trigger?(Input::C) end end