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
66 changes: 35 additions & 31 deletions src/main/java/ChronoMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -509,9 +509,9 @@ public void receiveEditKeywords() {
// case KOR:
// language = "kor";
// break;
// case ZHS:
// language = "zhs";
// break;
case ZHS:
language = "zhs";
break;
// case ZHT:
// language = "zht";
// break;
Expand Down Expand Up @@ -547,9 +547,9 @@ public void receiveEditStrings() {
// case KOR:
// language = "kor";
// break;
// case ZHS:
// language = "zhs";
// break;
case ZHS:
language = "zhs";
break;
// case ZHT:
// language = "zht";
// break;
Expand Down Expand Up @@ -615,31 +615,35 @@ public void receivePostDraw(AbstractCard c) {

public boolean receivePreMonsterTurn(AbstractMonster m) {
if (m.id == "TimeEater" && AbstractDungeon.player.chosenClass == Enum.CHRONO_CLASS) {
switch (AbstractDungeon.actionManager.turn) {
case 2:
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,"Whale brought you back did they?",3.5F,3.5F));
break;
case 3:
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,"Will you put that clock away for one minute?",3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,"Time is very complicated I wouldn't expect you to understand.",3.5F,3.5F));
break;
case 4:
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,"This throne is mine in due time.",3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,"Only temporarily, at best.",3.5F,3.5F));
break;
case 5:
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,"I'm going to enjoy tossing you over the railing again.",3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,"Oh, I forgot about that! Champ said I made a big neeeowww on the way down..",3.5F,3.5F));
break;
case 6:
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,"Your TIME... is up.",3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,"You used to hate my puns.",3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,"It's been a long time since then.",3.5F,3.5F));
break;
case 7:
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,"Care to step aside peacefully this time?",3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,"You don't deserve an easy victory.",3.5F,3.5F));
break;
EventStrings talkStrings = CardCrawlGame.languagePack.getEventString("TalkwithTimeEater");
if (talkStrings != null && talkStrings.DESCRIPTIONS != null && talkStrings.DESCRIPTIONS.length == 12) {
String[] desc = talkStrings.DESCRIPTIONS;
switch (AbstractDungeon.actionManager.turn) {
case 2:
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,desc[0],3.5F,3.5F));
break;
case 3:
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,desc[1],3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,desc[2],3.5F,3.5F));
break;
case 4:
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,desc[3],3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,desc[4],3.5F,3.5F));
break;
case 5:
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,desc[5],3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,desc[6],3.5F,3.5F));
break;
case 6:
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,desc[7],3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,desc[8],3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,desc[9],3.5F,3.5F));
break;
case 7:
AbstractDungeon.actionManager.addToBottom(new TalkAction(true,desc[10],3.5F,3.5F));
AbstractDungeon.actionManager.addToBottom(new TalkAction(m,desc[11],3.5F,3.5F));
break;
}
}
}
return true;
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/cards/Pendulum.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,14 @@ public List<TooltipInfo> getCustomTooltips() {

if (AbstractDungeon.getCurrMapNode() == null) { return this.tips; }
if (AbstractDungeon.getCurrRoom().phase != AbstractRoom.RoomPhase.COMBAT) { return this.tips; }
for (AbstractMonster mo : AbstractDungeon.getCurrRoom().monsters.monsters) {

o : for (AbstractMonster mo : AbstractDungeon.getCurrRoom().monsters.monsters) {
if (!mo.isDead && !mo.escaped) {
if (mo.hasPower("DelayedAttack")) {
this.tips.add(new TooltipInfo(EXTENDED_DESCRIPTION[0], EXTENDED_DESCRIPTION[2]));
for (AbstractPower power : mo.powers) {
if (power.ID.contains("DelayedAttack")) {
this.tips.add(new TooltipInfo(EXTENDED_DESCRIPTION[0], EXTENDED_DESCRIPTION[1]));
break o;
}
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/cards/Recurrance.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,13 @@ public List<TooltipInfo> getCustomTooltips() {
if (AbstractDungeon.getCurrMapNode() == null) { return this.tips; }
if (AbstractDungeon.getCurrRoom().phase != AbstractRoom.RoomPhase.COMBAT) { return this.tips; }

for (AbstractMonster mo : AbstractDungeon.getCurrRoom().monsters.monsters) {
o : for (AbstractMonster mo : AbstractDungeon.getCurrRoom().monsters.monsters) {
if (!mo.isDead && !mo.escaped) {
if (mo.hasPower("DelayedAttack")) {
this.tips.add(new TooltipInfo(EXTENDED_DESCRIPTION[0], EXTENDED_DESCRIPTION[1]));
for (AbstractPower power : mo.powers) {
if (power.ID.contains("DelayedAttack")) {
this.tips.add(new TooltipInfo(EXTENDED_DESCRIPTION[0], EXTENDED_DESCRIPTION[1]));
break o;
}
}
}
}
Expand Down
66 changes: 0 additions & 66 deletions src/main/java/cards/depreciated/OldCrunchTime.java

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/relics/SpringShield.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class SpringShield extends CustomRelic {
public SpringShield() {
super(ID, new Texture("chrono_images/relics/SpringShield.png"), new Texture("chrono_images/relics/outline/SpringShield.png"), RelicTier.COMMON, LandingSound.CLINK);

this.tips.add(new PowerTip("Delayed Effects", "Delayed Effects include Bite Command, Rage Command, Hands Up, Wake Up Call, and The Bomb."));
this.tips.add(new PowerTip(this.DESCRIPTIONS[1], this.DESCRIPTIONS[2]));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/localization/eng/chronoCards.json
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@
"UPGRADE_DESCRIPTION": " NL Self-Retaining.",
"EXTENDED_DESCRIPTION": [
"Mimics ",
".",
"."
]
},
"OldClockandLoad": {
Expand Down
19 changes: 18 additions & 1 deletion src/main/resources/localization/eng/chronoEvents.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,22 @@
"[Craft] Turn #yLocked #yTwirtle into a #grelic. #rGain #ra #rGremlin #rMask.",
"[Craft] Turn #yLocked #yScales into a #grelic. #rBecome #rCursed #r- #rPain."
]
}
},
"TalkwithTimeEater": {
"NAME": "TalkStrings",
"DESCRIPTIONS": [
"Whale brought you back did they?",
"Will you put that clock away for one minute?",
"Time is very complicated I wouldn't expect you to understand.",
"This throne is mine in due time.",
"Only temporarily, at best.",
"I'm going to enjoy tossing you over the railing again.",
"Oh, I forgot about that! Champ said I made a big neeeowww on the way down..",
"Your TIME... is up.",
"You used to hate my puns.",
"It's been a long time since then.",
"Care to step aside peacefully this time?",
"You don't deserve an easy victory."
]
}
}
4 changes: 3 additions & 1 deletion src/main/resources/localization/eng/chronoRelics.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@
"NAME": "Spring Shield",
"FLAVOR": "The further back you pull, the more satisfying the thunk.",
"DESCRIPTIONS": [
"Delayed attacks gain 2 #yBlock each turn before they activate."
"Delayed attacks gain 2 #yBlock each turn before they activate.",
"Delayed Effects",
"Delayed Effects include Bite Command, Rage Command, Hands Up, Wake Up Call, and The Bomb."
]
},
"HeavySwitch": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/localization/eng/chronoUI.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"TEXT": [
"It seems like your time has run out... once again.",
"The Disciple",
"This character is finally ready to play. It's about time."
"The disciple of Time Eater. She want to take the place of her teacher by conquer the spire."
]
},
"UpgradeCardsInHandAction": {
Expand Down
Loading