Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: relic outline color not being applied with chimera cards #221

Merged
merged 2 commits into from
Aug 5, 2023
Merged

fix: relic outline color not being applied with chimera cards #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ea79c
fix: relic outline color not working on occasion
scarf005 Aug 5, 2023
c223bdd
feat: make outline color more bright
scarf005 Aug 5, 2023
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
7 changes: 5 additions & 2 deletions src/main/kotlin/marisa/MarisaContinued.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ class MarisaContinued :
MiniHakkero(), BewitchedHakkero(), MagicBroom(), AmplifyWand(),
ExperimentalFamiliar(), RampagingMagicTools(), BreadOfAWashokuLover(), SimpleLauncher(),
HandmadeGrimoire(), ShroomBag(), SproutingBranch(), BigShroomBag()
).forEach { BaseMod.addRelicToCustomPool(it, AbstractCardEnum.MARISA_COLOR) }
).forEach { relic ->
logger.info("""Adding relic: ${relic.name}""")
BaseMod.addRelicToCustomPool(relic, AbstractCardEnum.MARISA_COLOR)
}
BaseMod.addRelic(CatCart(), RelicType.SHARED)
}

Expand Down Expand Up @@ -235,7 +238,7 @@ class MarisaContinued :
private const val SKILL_CC_PORTRAIT = "marisa/img/1024/bg_skill_MRS.png"
private const val POWER_CC_PORTRAIT = "marisa/img/1024/bg_power_MRS.png"
private const val ENERGY_ORB_CC_PORTRAIT = "marisa/img/1024/cardOrb.png"
val STARLIGHT: Color = CardHelper.getColor(0, 10, 125)
val STARLIGHT: Color = CardHelper.getColor(20, 84, 181)
const val CARD_ENERGY_ORB = "marisa/img/UI/energyOrb.png"
private const val MY_CHARACTER_BUTTON = "marisa/img/charSelect/MarisaButton.png"
private const val MARISA_PORTRAIT = "marisa/img/charSelect/marisaPortrait.jpg"
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/marisa/characters/Marisa.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class Marisa(name: String) :
else -> "The Ordinary Magician"
}

override fun getCardTrailColor(): Color = MarisaContinued.STARLIGHT
override fun getCardTrailColor(): Color = MarisaContinued.STARLIGHT.cpy()

override fun getAscensionMaxHPLoss(): Int = ASCENSION_MAX_HP_LOSS

Expand All @@ -165,7 +165,7 @@ class Marisa(name: String) :

override fun getVampireText(): String = Vampires.DESCRIPTIONS[1]

override fun getCardRenderColor(): Color = MarisaContinued.STARLIGHT
override fun getCardRenderColor(): Color = MarisaContinued.STARLIGHT.cpy()

override fun updateOrb(orbCount: Int) {
energyOrb.updateOrb(orbCount)
Expand All @@ -174,7 +174,7 @@ class Marisa(name: String) :
override fun getOrb() =
AtlasRegion(ImageMaster.loadImage(MarisaContinued.CARD_ENERGY_ORB), 0, 0, 24, 24)

override fun getSlashAttackColor(): Color = MarisaContinued.STARLIGHT
override fun getSlashAttackColor(): Color = MarisaContinued.STARLIGHT.cpy()

override fun getSpireHeartSlashEffect(): Array<AttackEffect> {
return arrayOf(
Expand Down