6 Commits

Author SHA1 Message Date
infinitefusion
064a09664a adds new batch of custom pokedex entries 2025-01-22 10:15:04 -05:00
infinitefusion
6c621d04e4 small fixes 2025-01-18 10:35:28 -05:00
infinitefusion
d523f30eb7 fIXES SCRAGGY POKERADAR 2025-01-17 13:24:31 -05:00
infinitefusion
b2b8a4ec12 Makes Magikarp contest easier the first time 2025-01-13 21:51:19 -05:00
infinitefusion
33ab16c3c6 Makes Magikarp contest easier the first time 2025-01-13 21:50:39 -05:00
infinitefusion
4730228557 updates outdoor tileset 2025-01-13 21:16:23 -05:00
46 changed files with 32358 additions and 323 deletions

4
.gitignore vendored
View File

@@ -1,5 +1,7 @@
Graphics/CustomBattlers/local_sprites/*
Graphics/Pokemon/FusionIcons/* Graphics/Pokemon/FusionIcons/*
Graphics/CustomBattlers/spritesheets/*
Data/sprites/* Data/sprites/*
Data/VERSION Data/VERSION

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -486,7 +486,7 @@ module Settings
[562, 50, :NINJASK,45,50], #Boon Island [562, 50, :NINJASK,45,50], #Boon Island
[603, 50, :KECLEON,45,50], #Chrono Island [603, 50, :KECLEON,45,50], #Chrono Island
[654, 50, :WHIMSICOTT,32,45], #Brine Road [654, 50, :WHIMSICOTT,32,45], #Brine Road
[654, 50, :SCRAGGY,32,45] #Kindle Road [559, 50, :SCRAGGY,32,45] #Kindle Road
] ]
#============================================================================= #=============================================================================

View File

@@ -221,6 +221,7 @@ VAR_NB_ROCKET_MISSIONS = 286
VAR_BOUTIQUE_OUTFIT=290 VAR_BOUTIQUE_OUTFIT=290
VAR_FISHING_CONTEST_RECORD=294 VAR_FISHING_CONTEST_RECORD=294
VAR_FISHING_CONTEST_NERF=333

View File

@@ -1398,7 +1398,7 @@ def get_mart_exclusive_items(city)
return items_list return items_list
end end
def calculate_pokemon_weight(pokemon) def calculate_pokemon_weight(pokemon,nerf=0)
base_weight = pokemon.weight base_weight = pokemon.weight
ivs = [] ivs = []
@@ -1426,18 +1426,20 @@ def calculate_pokemon_weight(pokemon)
# Cap the weight between min and max values # Cap the weight between min and max values
weight = [[weight, min_weight].max, max_weight].min weight = [[weight, min_weight].max, max_weight].min
weight -= nerf if weight- nerf > min_weight
return weight.round(2) # Round to 2 decimal places return weight.round(2) # Round to 2 decimal places
end end
def generate_weight_contest_entries(species, level, resultsVariable) #nerf: remove x kg from each generated pokemon
def generate_weight_contest_entries(species, level, resultsVariable,nerf=0)
#echoln "Generating Pokemon" #echoln "Generating Pokemon"
pokemon1 = pbGenerateWildPokemon(species, level) #Pokemon.new(species,level) pokemon1 = pbGenerateWildPokemon(species, level) #Pokemon.new(species,level)
pokemon2 = pbGenerateWildPokemon(species, level) #Pokemon.new(species,level) pokemon2 = pbGenerateWildPokemon(species, level) #Pokemon.new(species,level)
new_weights = [] new_weights = []
new_weights << calculate_pokemon_weight(pokemon1) new_weights << calculate_pokemon_weight(pokemon1,nerf)
new_weights << calculate_pokemon_weight(pokemon2) new_weights << calculate_pokemon_weight(pokemon2,nerf)
echoln new_weights echoln new_weights
echoln "(nerfed by -#{nerf})"
pbSet(resultsVariable, new_weights.max) pbSet(resultsVariable, new_weights.max)
end end

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@@ -1,3 +1,5 @@
1736379358 1737558625
1736379359 1737558626
1736379359 1737558626
1737558656
1737558656

View File

@@ -4,3 +4,52 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/206/206.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/240.png Graphics/CustomBattlers/spritesheets/spritesheets_base/240.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/296.png Graphics/CustomBattlers/spritesheets/spritesheets_base/296.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/296/296.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/296/296.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/219.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/457.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/457/457.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/298.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/390.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/174.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/311.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/311/311.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/115.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/129.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/129/129.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/67.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/329.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/53.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/358.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/358/358b.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/9.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/287.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/155.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/155/155.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/461.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/84.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/84/84.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/98.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/180.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/139.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/245.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/245/245.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/331.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/3.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/3/3.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/286.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/410.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/410/410.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/181.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/469.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/469/469.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/380.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/260.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/358/358.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/498.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/429.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/124.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/124/124a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/267.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/263.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/100.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/448.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/448/448.png

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 KiB

After

Width:  |  Height:  |  Size: 262 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 844 KiB

After

Width:  |  Height:  |  Size: 845 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 792 KiB

After

Width:  |  Height:  |  Size: 788 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 377 KiB

After

Width:  |  Height:  |  Size: 372 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 711 KiB

After

Width:  |  Height:  |  Size: 704 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 479 KiB

After

Width:  |  Height:  |  Size: 476 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 878 KiB

After

Width:  |  Height:  |  Size: 874 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 522 KiB

After

Width:  |  Height:  |  Size: 519 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 798 KiB

After

Width:  |  Height:  |  Size: 804 KiB