scarf005 / marisa

A continuation mod for Slay The Spire, which adds Marisa from touhou project as a playable character.

Marisa: Continued

a re-continued mod for Slay the Spire, which adds Marisa Kirisame from Touhou Project as a playable character.

Note

Marisa: Continued is a fork of STS_ThMod_MRS mod. Credits goes to the original authors.

Warning

Due to life issues, this project is currently not recieving active maintenance. While I will review PRs as soon as possible, please note that I may not be able to dedicate much time on this project. Consequently, issues may not be addressed in a timely manner. I apologize for the inconvenience.

New features

Better UI for amplifiable cards

amplify.mp4

• cards glow gold for amplifiable cards.
• amplified cost will be shown on the card in green color.

Previews for generated cards

Content and Gameplay

Charge

• when Charged Up, card damage grows up exponentially.

Charges	8	16	24	32
Damage	x2	x4	x8	x16

• charges can be stacked up 1 by playing a card.
• there are also cards that gives more charges.
• charges are depleted on attack.

Amplify

• by using extra energy, cards can be Amplified to become much stronger.
• some cards will let you not cost energy to Amplify them.

Usage

Installation

subscribe ModTheSpire and BaseMod.

Subscribe from Steam Workshop

Compile from source

Warning

development environment is only tested on linux. may not work for other OS

git clone repository https://github.com/scarf005/Marisa.git

setup java, kotlin, and gradle in your intellij. language version must be 8.

# fill in your steam directory ending with '/steamapps'
userSteamDir=/home/scarf/.local/share/Steam/steamapps
# default: "$userSteamDir/workshop/content/$gameSteamId"
workshopDir=

copy gradle.properties.example to gradle.properties and provide path to your steam directory.

gradle changelog # install once
./gradlew -t changelog --warning-mode all # dev mode: recompile on changes

run gradle task to copy jar into your steam mods folder.

Credits

See lf201014/STS_ThMod_MRS#credits for details.

License

• Source code: MIT License
• Resources: CC-BY-NC-SA 4.0.

See LICENSE for details.

marisa's Issues

rename package to lowercase `marisa`

match card class names to equivalent translation name

refactor `actionManager`

• #29
• #30

relics generated from `Portable Prop Bag` does not reset its counter

When

Shuriken / Kunai / Letter Opener / OrnamentalFan is generated

Why

• AbstractRelic constructor does not set counter to 0 on instance creation
• counter is only initialized to 0 on AbstractRelic::atTurnStart.

remove `/deprecated` directory

remove unused subscription

☂️ gameplay releated bugs

From steam discussions

by Zu

Summary

• #71
• #80
• #82
• #85
• #78
• #76

add license

Wrong upgrade description in `Acceleration`

What

description should be "Draw 2 cards. A: Draw 1 more." but is retain

add semver guideline

migrate updated korean translation

• original
• updated

provide link for badges

these two badges needs corresponding hyperlinks:

NPE when `mysterious beam` calls `gravity beat`

How to reproduce

steam discussion

Crash log

java.lang.NullPointerException
at marisa.cards.GravityBeat.applyPowers(GravityBeat.kt:43)
at marisa.cards.MysteriousBeam.use(MysteriousBeam.kt:55)
at com.megacrit.cardcrawl.characters.AbstractPlayer.useCard(AbstractPlayer.java:1698)
at com.megacrit.cardcrawl.actions.GameActionManager.getNextAction(GameActionManager.java:359)
at com.megacrit.cardcrawl.actions.GameActionManager.update(GameActionManager.java:175)
at com.megacrit.cardcrawl.rooms.AbstractRoom.update(AbstractRoom.java:325)
at com.megacrit.cardcrawl.dungeons.AbstractDungeon.update(AbstractDungeon.java:2532)
at com.megacrit.cardcrawl.core.CardCrawlGame.update(CardCrawlGame.java:876)
at com.megacrit.cardcrawl.core.CardCrawlGame.render(CardCrawlGame.java:423)
at com.badlogic.gdx.backends.lwjgl.LwjglApplication.mainLoop(LwjglApplication.java:225)
at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:126)

un-nest marisa.cards.Marisa

power arts

currently it uses in-game art

☂️ deployment automation

• add https://github.com/scarf005/changelog as gradle dependency
• automated release via github cli
• automated publishing to steam
• automated pr generation

remove unused assets

• MyCharacter
• custom_orb

`Portable Prop Bag` does not use game random seed

methods other than `use` can get `null` as parameter

`Orrerys Sun` gives `block` but power text is `attack`

• lf201014/STS_ThMod_MRS#157

`oneTimeOff` gives upgraded power regardless of upgrade state

https://github.com/lf201014/STS_ThMod_MRS/blob/0a455b34fc78b40bb4042d95822249a85693d2c9/src/main/java/ThMod/cards/Marisa/OneTimeOff.java#L77-L84

errors from the original mod

:open_umbrella: setup guidelines for contributing

Summary

• add CONTRIBUTING.md
  • move install guides to CONTRIBUTING.md
  • add commit style guide
• add LOCALIZATION.md
• setup code style
• fix obsolete gradle task description
• #103
• #109
• label new PRs
• add description about steamworks error code
• #155
• guide on how to enable basemod terminal

crashes on mod settings

Original post

Cause:
java.lang.StringIndexOutOfBoundsException: String index out of range: 1
	at java.lang.String.charAt(String.java:658)
	at com.megacrit.cardcrawl.helpers.FontHelper.identifyColor(FontHelper.java:1218)
	at com.megacrit.cardcrawl.helpers.FontHelper.renderSmartText(FontHelper.java:953)
	at com.evacipated.cardcrawl.modthespire.patches.modsscreen.ModsScreen.renderModInfo(ModsScreen.java:354)
	at com.evacipated.cardcrawl.modthespire.patches.modsscreen.ModsScreen.render(ModsScreen.java:221)
	at com.evacipated.cardcrawl.modthespire.patches.modsscreen.ModsScreenUpdateRender$Render.Postfix(ModsScreenUpdateRender.java:32)
	at com.megacrit.cardcrawl.screens.mainMenu.MainMenuScreen.render(MainMenuScreen.java:622)
	at com.megacrit.cardcrawl.core.CardCrawlGame.render(CardCrawlGame.java:435)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication.mainLoop(LwjglApplication.java:225)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:126)

use extension for `isAmplified`

`Blaze Away` OP

소멸 키워드를 뒤로 빼자

Language

Korean

Summary

슬더스 바닐라 카드들 보면 소멸 키워드가 뒤로 빠져있는데 마리사는 유독 앞으로 오게 번역되어 있음

좀 야가다성이 심하겠지만 뒤로 밀어주시면 정말 좋을 거 같음

Are you interested in fixing this issue?

• I am willing to PR a fix for this issue.

properly address license

• contact one of the original devs
• set up appropriate license for whole project (currently only src is licensed properly)

:open_umbrella: use dynamic variables

Summary

due to custom variable and formatting restrictions, block and magicnumber is used everywhere, making refactoring harder.

Tasks

use dynamic variables

• #150
• AmplifiedDamage
• AmplifiedBlock
• Charge

use `autoAdd`

https://github.com/daviscook477/BaseMod/wiki/AutoAdd

issue form

(PR template done? in #79 )

convert remaining patches to kotlin

• CatCartPatch
• MarisaModEventPatch

use expression body

refactor `MarisaMod.kt`

it's over 600 lines

match title font with thumbnail

use same font as thumnail image

Amplified `Shoot The Moon` uses 3 energy instead of 2

when

fighting Lagavulin with Metallicize and Regen

why

calling isAmplified has tons of side effects, and shootTheMoon calls it twice

migrate `ThMod.java` to kotlin

use class property over raw string for getters

from

p.hasPower("ChargeUpPower")

to

p.hasPower(ChargeUpPower.POWER_ID)

remove typhooncounter

Old implementation of starlight typhoon may have used typhooncounter, but it doesn't.

`events-fr` not found

From steam discussions

by Elund

Summary

https://github.com/lf201014/STS_ThMod_MRS/blob/0a455b34fc78b40bb4042d95822249a85693d2c9/src/main/java/ThMod/ThMod.java#L636-L642

Original mod did not have french translation for events, thus used english event text.

https://github.com/scarf005/Marisa/blob/92e5db9e57805cf6be72dac4ed868a5f46bcf699/src/main/kotlin/marisa/MarisaContinued.kt#L179-L184C14

however, current code tries to load events-fr.json, which crashes due to unhandled exception

Solution

• load english translation (en) on fail
• TODO: loading incomplete translation may cause issues

event else branch always evaluates to true

         val abort: Boolean = when (event) {
                is OrinTheCat -> p.hasRelic(CatCart.ID) || (p !is Marisa) && !MarisaMod.isCatEventEnabled
                is Mushrooms_MRS -> floor <= 6
                else -> true
            }

when the game gets an event, it removes it from the pool.
the infinite recursion of all-true branch calling getEvent triggering GetEventPatch calling all-true branch again instantly empties events list and freezes the game.

`MillisecondPulsar` not working

https://github.com/lf201014/STS_ThMod_MRS/blob/0a455b34fc78b40bb4042d95822249a85693d2c9/src/main/java/ThMod/ThMod.java#L293

Marisa/src/main/java/marisa/MarisaMod.kt

Line 569 in 5282137

if (p.hasPower("MilliPulsePower") || p.hasPower("PulseMagicPower")

fixing typo (wrong: MilliPulsePower, right: MilliPulsaPower) causes p.hasPower to always evaluate to false

show card previews

example:

migrate `cards/Marisa` to kotlin

use `run`

`NullPointerException` on card's `use()`

override fun use(p: AbstractPlayer, m: AbstractMonster) is inherited from java, thus m is nullable

solution: mark parameter m unused for methods that doesn't use monster at all , so it looks like
override fun use(p: AbstractPlayer, unused: AbstractMonster?)

publish to steam workshop

• remove stale files
• update modthespire.json
• setup semantic release
• use timestamp for dev
• use semantic version for release

use array extension method on propbag

`NullPointerException` on `canUse`

make actions terser with `addTo`

make `acceleration` shuffle empty deck

according to the code, it's an intentional decision.