title screen selector

2025-12-06 06:01:46 +00:00 · 2021-07-22 12:15:07 -04:00
parent bc229f8713
commit 9fba10f5b0
3 changed files with 294 additions and 281 deletions
--- a/Data/Scripts/010_Data/001_Hardcoded
+++ b/Data/Scripts/010_Data/001_Hardcoded
@@ -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
 })
--- 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
--- 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,6 +14,7 @@ SCREENSTYLE = 1
 class Scene_Intro

  alias main_old main
+
  def main
    Graphics.transition(0)
    # Cycles through the intro pictures
@@ -108,14 +108,12 @@ class Scene_Intro
    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
@@ -140,6 +138,8 @@ class GenOneStyle
    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
@@ -153,7 +153,6 @@ class GenOneStyle
    #@totalFrames=getPlayTime("Audio/BGM/#{bgm}")*Graphics.frame_rate
    @totalFrames = 10 * Graphics.frame_rate

-
    pbBGMPlay(bgm)

    # creates all the necessary graphics
@@ -172,7 +171,6 @@ class GenOneStyle
    #@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
@@ -183,8 +181,11 @@ class GenOneStyle
    @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)
@@ -221,7 +222,6 @@ class GenOneStyle
    @sprites["2poke2"].y = Graphics.height
    @sprites["2poke2"].y = 100

-
    @sprites["logo"] = Sprite.new(@viewport)
    #bitmap2=pbBitmap("Graphics/Titles/pokelogo2")
    bitmap1 = pbBitmap("Graphics/Titles/pokelogo")
@@ -239,7 +239,6 @@ class GenOneStyle
    @sprites["star"].x = -50
    @sprites["star"].y = 0

-
  end

  def intro
@@ -285,6 +284,7 @@ class GenOneStyle
  end

  TONE_INCR = 15
+
  def makeShineEffect()
    newColor = @sprites["poke"].tone.red + TONE_INCR
    newTone = Tone.new(newColor, newColor, newColor, 0)
@@ -292,29 +292,45 @@ class GenOneStyle
    @sprites["2poke"].tone = newTone
  end

-
  def introloop
    @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
+
  end

+  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

  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
@@ -323,12 +339,12 @@ class GenOneStyle
      #@sprites["bg2"].opacity+=3
    end

-
    if @sprites["poke"].x <= @sprites["2poke"].x
      @sprites["poke"].opacity = 0
      @sprites["2poke"].opacity = 0
      #16.times do
      @sprites["fpoke"].opacity = 255
+      @sprites["selector"].opacity = 0
      #wait(1)
      #end
      @sprites["poke"].x = 400
@@ -370,8 +386,6 @@ class GenOneStyle
      #@sprites["bg2"].opacity=0
    end

-
-
    @sprites["fpoke"].opacity -= 10
    @sprites["effect"].ox += @speed

@@ -379,19 +393,6 @@ class GenOneStyle
      introloop
    end
  end
-end
-
-
-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
-  elsif Input.press?(Input::LEFT)
-    path = "Graphics/Battlers/"+ randpoke1s+"/"+randpoke1s+"."+randpoke2s
-  end
-  return path
-end
-

  #new version
  def getFusedPath(randpoke1, randpoke2)
@@ -404,7 +405,17 @@ def getFusedPath(randpoke1,randpoke2)
    return path
  end

+end

+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
+  elsif Input.press?(Input::LEFT)
+    path = "Graphics/Battlers/" + randpoke1s + "/" + randpoke1s + "." + randpoke2s
+  end
+  return path
+end

 def dispose
  Kernel.pbClearText()
@@ -435,10 +446,6 @@ end

 #end

-
-
-
-
 #===============================================================================
 # Styled to look like the gen 3 games
 #===============================================================================
@@ -484,7 +491,6 @@ class GenThreeStyle
    @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
@@ -497,8 +503,6 @@ class GenThreeStyle
    @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)
@@ -511,6 +515,7 @@ class GenThreeStyle
    @sprites["start"].y = 312
    @sprites["start"].visible = true
  end
+
  def intro
    16.times do
      @sprites["logo1"].opacity += 16
@@ -594,7 +599,6 @@ class GenThreeStyle
  def wait(frames)
    return if @skip

-
    frames.times do
      @currentFrame += 1
      Graphics.update