Merge remote-tracking branch 'origin/develop-6.6' into develop-6.6

Allow changing gender of single gender Pokemon

Data/Scripts/012_Overworld/001_Overworld.rb

@@ -283,7 +283,13 @@ Events.onMapChange += proc { |_sender, e|
   if new_map_metadata && new_map_metadata.teleport_destination
     $PokemonGlobal.healingSpot = new_map_metadata.teleport_destination
   end
-  $PokemonMap.clear if $PokemonMap
+  if $PokemonMap
+    blackFluteUsed = $PokemonMap.blackFluteUsed
+    whiteFluteUsed = $PokemonMap.whiteFluteUsed
+    $PokemonMap.clear
+    $PokemonMap.blackFluteUsed = blackFluteUsed
+    $PokemonMap.whiteFluteUsed = whiteFluteUsed
+  end
   $PokemonEncounters.setup($game_map.map_id) if $PokemonEncounters
   $PokemonGlobal.visitedMaps[$game_map.map_id] = true
   next if old_map_ID == 0 || old_map_ID == $game_map.map_id

Data/Scripts/013_Items/002_Item_Effects.rb

@@ -148,17 +148,19 @@ Events.onStepTaken += proc {
 
 ItemHandlers::UseInField.add(:BLACKFLUTE, proc { |item|
   pbUseItemMessage(item)
-  pbMessage(_INTL("Wild Pokémon will be repelled."))
-  $PokemonMap.blackFluteUsed = true
+  message = $PokemonMap.blackFluteUsed ? "Wild Pokemon will no longer be repelled.": "Wild Pokémon will be repelled."
+  pbMessage(_INTL(message))
+  $PokemonMap.blackFluteUsed = !$PokemonMap.blackFluteUsed
   $PokemonMap.whiteFluteUsed = false
   next 1
 })
 
 ItemHandlers::UseInField.add(:WHITEFLUTE, proc { |item|
   pbUseItemMessage(item)
-  pbMessage(_INTL("Wild Pokémon will be lured."))
+  message = $PokemonMap.whiteFluteUsed ? "Wild Pokemon will no longer be lured.": "Wild Pokémon will be lured."
+  pbMessage(_INTL(message))
+  $PokemonMap.whiteFluteUsed = !$PokemonMap.whiteFluteUsed
   $PokemonMap.blackFluteUsed = false
-  $PokemonMap.whiteFluteUsed = true
   next 1
 })
 

Data/Scripts/014_Pokemon/001_Pokemon.rb

@@ -606,12 +606,12 @@ class Pokemon
 
   # Makes this Pokémon male.
   def makeMale
-    self.gender = 0;
+    @gender = 0
   end
 
   # Makes this Pokémon female.
   def makeFemale
-    self.gender = 1;
+    @gender = 1
   end
 
   # @return [Boolean] whether this Pokémon is male

Data/Scripts/016_UI/015_UI_Options.rb

@@ -131,13 +131,14 @@ end
 #===============================================================================
 #
 #===============================================================================
-class NumberOption
+class NumberOption < Option
   include PropertyMixin
   attr_reader :name
   attr_reader :optstart
   attr_reader :optend
 
-  def initialize(name, optstart, optend, getProc, setProc)
+  def initialize(name, optstart, optend, getProc, setProc, description="")
+    super(description)
     @name = name
     @optstart = optstart
     @optend = optend
@@ -214,6 +215,7 @@ class Window_PokemonOption < Window_DrawableCommand
     @mustUpdateDescription = false
     @selected_position = 0
     @allow_arrows_jump = false
+    @is_first_update = true
     for i in 0...@options.length
       @optvalues[i] = 0
     end
@@ -321,23 +323,43 @@ class Window_PokemonOption < Window_DrawableCommand
     oldindex = self.index
     @mustUpdateOptions = false
     super
-    dorefresh = (self.index != oldindex)
+
+    if @is_first_update
+      # Needed for displaying the description of the initially selected option correctly
+      @selected_position = self[self.index]
+      @mustUpdateOptions = true
+      @mustUpdateDescription = true
+      @is_first_update = false
+      refresh
+      return
+    end
+
     if self.active && self.index < @options.length
       if Input.repeat?(Input::LEFT)
         self[self.index] = @options[self.index].prev(self[self.index])
-        dorefresh =
-          @selected_position = self[self.index]
-        @mustUpdateOptions = true
-        @mustUpdateDescription = true
-      elsif Input.repeat?(Input::RIGHT)
-        self[self.index] = @options[self.index].next(self[self.index])
-        dorefresh = true
         @selected_position = self[self.index]
         @mustUpdateOptions = true
         @mustUpdateDescription = true
+        refresh if self[self.index]
+        return
+      end
+      if Input.repeat?(Input::RIGHT)
+        self[self.index] = @options[self.index].next(self[self.index])
+        @selected_position = self[self.index]
+        @mustUpdateOptions = true
+        @mustUpdateDescription = true
+        refresh
+        return
+      end
+      if Input.repeat?(Input::UP) || Input.repeat?(Input::DOWN)
+        @selected_position = self[self.index]
+        @mustUpdateOptions = true
+        @mustUpdateDescription = true
+        refresh
+        return
       end
     end
-    refresh if dorefresh
+    refresh if (self.index != oldindex)
   end
 end
 

README.md

@@ -0,0 +1,61 @@
+## Thank you for downloading Pokémon Infinite Fusion!
+
+Playing the game
+---
+**Windows**
+
+Use **Game.exe** to play the game. That's it!
+
+If you are experiencing issues such as long loading times, you can also try Game-performance.exe.
+
+-----
+**MacOS / Linux**
+
+The game is not made to run natively on anything other than Windows. However, it is possible to play it Mac and Linux using Wine or Whiskey.
+
+Refer to these tutorials:
+
+[Wine install guide](https://hackmd.io/@PIF-Tech/MacWineGuide)
+
+[Whiskey install guide](https://hackmd.io/@PIF-Tech/MacWhiskeyGuide)
+
+
+Once Wine is installed on your computer, you can use "launch-wine.sh" to launch the game.
+
+---
+**Android**
+
+To play Infinite Fusion on Android, you need to use a RPG Maker emulator called [JoiPlay](https://joiplay.net/).
+
+[Android setup guide](https://hackmd.io/@PIF-Tech/AndroidGuide)
+
+---
+## Contributing to the game
+
+Pokémon Infinite Fusion is open-source! All of the game's code is located in the Data/Scripts folder.
+
+We accept pull requests for bug fixes and minor features* (Please contact chardub on the game's Discord if you have a feature idea to get it pre-approved before you start working on it!)
+
+**Note: Any pull request that modifies the RPG Maker files outside of the Scripts folder will be automatically denied. 
+This includes any changes to the maps/game events. The reason for this is that unfortunately, the way RPG Maker XP's data
+files are structured does not allow to easily see what the changes made are.**
+
+To contribute:
+
+- Fork the game's repo from https://github.com/infinitefusion/infinitefusion-e18
+- Work from the **develop** branch to avoid merge conflicts 
+- Open a pull request once you're done to merge into **develop**. A pull request should only contain a single feature or bug fix. Any PR that bundles multiple features/fixes will be denied.
+
+**There is no guarantee that submitted pull requests will be accepted.*
+
+---
+## Useful links:
+- [Wiki](https://infinitefusion.fandom.com/)
+- [Discord](https://discord.gg/infinitefusion)
+- [Reddit](https://www.reddit.com/r/PokemonInfiniteFusion/)
+- [Pokecommunity](https://www.pokecommunity.com/showthread.php?t=347883)
+- [Showdown](http://play.pokeathlon.com)
+- [Fusion calculator](https://www.fusiondex.org/)
+
+This is a free-to-play Pokémon fan game. If you paid any amount of money to play this game, you have been scammed. 
+This game is not affiliated with Nintendo, Game Freak or Creatures Inc.

readme.txt

@@ -1,16 +0,0 @@
-Thank you for downloading Pok?mon Infinite Fusion!
-
-Use Game.exe to play the game.
-If you are experiencing issues such as long loading times, you can also try the alternate launcher.
-
-
-Useful links:
-Wiki: 				https://infinitefusion.fandom.com/
-Discord: 			https://discord.gg/infinitefusion
-Reddit: 			https://www.reddit.com/r/PokemonInfiniteFusion/
-Pokecommunity		https://www.pokecommunity.com/showthread.php?t=347883
-Showdown			play.pokeathlon.com
-Fusion calculator	https://www.fusiondex.org/
-
-This is a free-to-play Pok?mon fan game. If you paid any amount of money to play this game, you have been scammed. 
-This game is not affiliated with Nintendo, Game Freak or Creatures Inc.