Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# 1.2.2

Additions
- Added Cobblemon 1.7.2 compatibility!
- Added an S icon to PC for Galaxy, Pastel, Shadow, Sketch, and Vintage Pokemon

Changes
- Removed Ruby Rod recipe, Lake Guardian Crystals can be obtained from Cobblemon's fishing treasure loot table
- Changed Legendary Pokemon Wing items to stack at 64
- Shifted most Legendaries to only spawn above ground

Bug Fixes
- Fixed Galarian Articuno/Moltres/Zapdos summoning as Kantoian
- Fixed Mythicals not having 3 guaranteed 31 IVs
- Fixed Arceus/Silvally types not changing
- Fixed Terapagos abilities
- Fixed external transformations on shift right click, eg. mega
- Fixed Legendary item charging overflowing into all in inventory
- Fixed Rotom spawns
- Fixed some Pokemon not appearing as implemented for Pokedex completion
- Fixed Pokemon spawn context to spawnablePositionType


# 1.2.1

Bug Fixes
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package generations.gg.generations.core.generationscore.common.client.screen

import com.cobblemon.mod.common.api.gui.blitk
import generations.gg.generations.core.generationscore.common.GenerationsCore
import net.minecraft.client.gui.GuiGraphics

class SpecialAspectIcon(
val x: Number,
val y: Number,
val centeredX: Boolean = false,
val small: Boolean = false,
val opacity: Float = 1F
) {
companion object {
private const val ICON_DIAMETER = 16
private const val SCALE = 1F
private val iconResource = GenerationsCore.id("textures/gui/special_aspect_icon.png")
}

fun render(context: GuiGraphics) {
val diameter = if (small) (ICON_DIAMETER / 2) else ICON_DIAMETER
val offsetX = if (centeredX) (((diameter / 2) * SCALE)) else 0F

blitk(
matrixStack = context.pose(),
texture = iconResource,
x = (x.toFloat() - offsetX) / SCALE,
y = y.toFloat() / SCALE,
height = diameter,
width = diameter,
uOffset = 0F,
textureWidth = diameter,
textureHeight = diameter,
alpha = opacity,
scale = SCALE
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import generations.gg.generations.core.generationscore.common.client.screen.SpecialAspectIcon;
import java.util.Set;

@Mixin(PCGUI.class)
public abstract class PcGuiMixin extends Screen {
Expand All @@ -39,6 +41,14 @@ public void renderThings(GuiGraphics context, int mouseX, int mouseY, float delt
var y = (height - BASE_HEIGHT) / 2;

new TeraTypeIcon(x + 6 + 1, y + 27 + 66 - 9 - 1, previewPokemon.getTeraType(), false, true, 1f).render(context);
if (generations$hasSpecialAspect(previewPokemon)) {
new SpecialAspectIcon(x + 62, y + 83, false, true, 1f).render(context);
}
}
}
@Unique
private boolean generations$hasSpecialAspect(Pokemon pokemon) {
Set<String> pokemonAspectsString = pokemon.getAspects();
return pokemonAspectsString.contains("vintage") || pokemonAspectsString.contains("pastel") || pokemonAspectsString.contains("galaxy") || pokemonAspectsString.contains("sketch") || pokemonAspectsString.contains("shadow");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ object GenerationsItems: ItemPlatformRegistry() {
val DARK_STONE = register("dark_stone", { TaoTrioStoneItem(it.stacksTo(1).durability(100), LegendKeys.ZEKROM) }, LEGENDARY_ITEMS)
val DRAGON_STONE = register("dragon_stone", { TaoTrioStoneItem(it.stacksTo(1).durability(100), LegendKeys.KYUREM) }, LEGENDARY_ITEMS)
val RAINBOW_WING = register("rainbow_wing", { WingItem(it, "rainbow", ElementalTypes.FLYING, LegendKeys.HO_OH) }, LEGENDARY_ITEMS)
val SILVER_WING = register("silver_wing", { WingItem(it.stacksTo(1), "silver", ElementalTypes.FLYING, LegendKeys.LUGIA) }, LEGENDARY_ITEMS)
val SILVER_WING = register("silver_wing", { WingItem(it, "silver", ElementalTypes.FLYING, LegendKeys.LUGIA) }, LEGENDARY_ITEMS)
val DARK_SOUL = register("dark_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS)
val DRAGON_SOUL = register("dragon_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS)
val MELODY_FLUTE = register("melody_flute", ::MelodyFluteItem, LEGENDARY_ITEMS)
Expand Down Expand Up @@ -928,12 +928,12 @@ object GenerationsItems: ItemPlatformRegistry() {
val REGIDRAGO_ORB = register("regidrago_orb", { RegiOrbItem(it, "regidrago") }, LEGENDARY_ITEMS)
val REGIELEKI_ORB = register("regieleki_orb", { RegiOrbItem(it, "regieleki") }, LEGENDARY_ITEMS)
val MAGMA_CRYSTAL = register("magma_crystal", { MagmaCrystal(it.stacksTo(1)) }, LEGENDARY_ITEMS)
val ICY_WING = register("icy_wing", { WingItem(it.stacksTo(1), "icy", ElementalTypes.ICE, LegendKeys.ARTICUNO) }, LEGENDARY_ITEMS)
val ELEGANT_WING = register("elegant_wing", { WingItem(it.stacksTo(1), "elegant", ElementalTypes.PSYCHIC, LegendKeys.GALARIAN_ARTICUNO) }, LEGENDARY_ITEMS)
val STATIC_WING = register("static_wing", { WingItem(it.stacksTo(1), "static", ElementalTypes.ELECTRIC, LegendKeys.ZAPDOS) }, LEGENDARY_ITEMS)
val BELLIGERENT_WING = register("belligerent_wing", { WingItem(it.stacksTo(1), "belligerent", ElementalTypes.FIGHTING, LegendKeys.GALARIAN_ZAPDOS) }, LEGENDARY_ITEMS)
val FIERY_WING = register("fiery_wing", { WingItem(it.stacksTo(1).fireResistant(), "fiery", ElementalTypes.FIRE, LegendKeys.MOLTRES) }, LEGENDARY_ITEMS)
val SINISTER_WING = register("sinister_wing", { WingItem(it.stacksTo(1), "sinister", ElementalTypes.DARK, LegendKeys.GALARIAN_MOLTRES) }, LEGENDARY_ITEMS)
val ICY_WING = register("icy_wing", { WingItem(it, "icy", ElementalTypes.ICE, LegendKeys.ARTICUNO) }, LEGENDARY_ITEMS)
val ELEGANT_WING = register("elegant_wing", { WingItem(it, "elegant", ElementalTypes.PSYCHIC, LegendKeys.GALARIAN_ARTICUNO) }, LEGENDARY_ITEMS)
val STATIC_WING = register("static_wing", { WingItem(it, "static", ElementalTypes.ELECTRIC, LegendKeys.ZAPDOS) }, LEGENDARY_ITEMS)
val BELLIGERENT_WING = register("belligerent_wing", { WingItem(it, "belligerent", ElementalTypes.FIGHTING, LegendKeys.GALARIAN_ZAPDOS) }, LEGENDARY_ITEMS)
val FIERY_WING = register("fiery_wing", { WingItem(it.fireResistant(), "fiery", ElementalTypes.FIRE, LegendKeys.MOLTRES) }, LEGENDARY_ITEMS)
val SINISTER_WING = register("sinister_wing", { WingItem(it, "sinister", ElementalTypes.DARK, LegendKeys.GALARIAN_MOLTRES) }, LEGENDARY_ITEMS)
val MEW_DNA_FIBER = register("mew_dna_fiber", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS)
val MEW_FOSSIL = register("mew_fossil", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS)
val LIGHT_SOUL = register("light_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "ultra-rare",
"level": "4-29",
"weight": 6.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "ultra-rare",
"level": "70-75",
"weight": 2.0,
"condition": {
"minSkyLight": 8,
"maxSkyLight": 15,
"biomes": [
"#cobblemon:is_jungle"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "common",
"level": "5-24",
"weight": 5.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "4-16",
"weight": 5.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "rare",
"level": "10-44",
"weight": 5.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "4-16",
"weight": 5.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "rare",
"level": "10-44",
"weight": 5.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "12-29",
"weight": 9.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "rare",
"level": "16-55",
"weight": 9.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "6-28",
"weight": 1.8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "rare",
"level": "26-55",
"weight": 1.8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "12-55",
"weight": 1.8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "12-55",
"weight": 1.8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "rare",
"level": "4-55",
"weight": 5.94,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "ultra-rare",
"level": "70-75",
"weight": 2.0,
"condition": {
"minSkyLight": 8,
"maxSkyLight": 15,
"biomes": [
"#cobblemon:is_highlands"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "common",
"level": "5-25",
"weight": 9.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "20-50",
"weight": 9.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "20-50",
"weight": 9.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "5-30",
"weight": 9.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "rare",
"level": "25-50",
"weight": 9.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "uncommon",
"level": "5-24",
"weight": 5.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "rare",
"level": "34-50",
"weight": 5.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"natural"
],
"type": "pokemon",
"context": "grounded",
"spawnablePositionType": "grounded",
"bucket": "common",
"level": "4-40",
"weight": 5.94,
Expand Down
Loading