Skip to content

Commit

Permalink
Merge pull request #7 from lf201014/master
Browse files Browse the repository at this point in the history
resync
  • Loading branch information
Katinor authored Feb 1, 2019
2 parents bf7b02d + f2f7162 commit 5488898
Show file tree
Hide file tree
Showing 61 changed files with 1,503 additions and 158 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ src/main/main.iml
.idea/codeStyles/codeStyleConfig.xml
.idea/codeStyles/Project.xml
ThMod.iml
/.idea/codeStyles/
/.idea/codeStyles/
MvnPackage.cmd
1 change: 1 addition & 0 deletions MvnPackage.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
rmdir /s /q target
rmdir /s /q bin
mvn package
19 changes: 18 additions & 1 deletion Version_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -267,4 +267,21 @@ v0.14.18 1/14/2019
*Fix the bug that upgraded Orbital would make the player draw one more card than it should when drawn
*Refract out-dated codes
*Update Korean texts(Github user : Katinor)
*Update Traditional Chinese texts(GitHub user : rainfoxest)
*Update Traditional Chinese texts(GitHub user : rainfoxest)

v0.14.19 1/15/2019
*Update descritptions of cards
*Add a customized Mushroom event for Marisa
*Refract out-dated codes
*No longer unlock all cards for card list in compedium(for better loading speed)
*Update Traditional Chinese texts(GitHub user : rainfoxest)

v0.14.20 1/27/2019
*6A : cost:0 -> 1( 0 ) ;base damage : 3 ( 4 ) -> 4;
*Shooting Echo:base damage : 9 -> 9 ( 11 );
*Guiding Star : Rework : derivation ; cost : 1 ( 0 ) ; effect :Shuffle a copy of this card into draw pile.Shuffle discard pile into draw pile. Exhuast.
*Simple Launcher : base price:200 -> 300;

v0.14.21 1/31/2019
*Trying to fix the random target multi-segment attack damages calculation errors
*Add support for Googly Eye(thanks to github user:KAMAQUEEN)
21 changes: 19 additions & 2 deletions Version_log_zhs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ v0.14.17 1/13/2019
*��д�� �� �ؼ������Ч����ʵ�ַ���
*�����˷������ĵ��ı���GitHub �û� : rainfoxest��

v0.14.17 1/14/2019
v0.14.18 1/14/2019
*������һЩ���Ƶ�����
*�������壺ϡ�ж� ��Ϊ ����
*�����ǣ�������Ч����Ϊ ���ü���Ϊ2������֮ǰ�� ʹ���� ���� �� ״̬ ������ ����
Expand All @@ -668,4 +668,21 @@ v0.14.17 1/14/2019
*�޸��� �ǹ� �����������һ�ſ���bug
*�ع��˲��ֹ�ʱ�Ĵ���
*�����˺�����ı���GitHub�û� : Katinor��
*�����˷������ĵ��ı���GitHub �û� : rainfoxest��
*�����˷������ĵ��ı���GitHub �û� : rainfoxest��

v0.14.19 1/15/2019
*������һЩ���Ƶ�����
*������һ���Զ����Ģ���¼�
*�ع��˲��ֹ�ʱ�Ĵ���
*����������ʱ����ȫ����Ƭ�Ŀ����б���ʾ���Ի�ȡ����������ٶȣ�
*�����˷������ĵ��ı���GitHub �û� : rainfoxest��

v0.14.20 1/27/2019
*��������ã�0 -> 1(0);�����˺���3(4)->4;
*���ǹ����������˺���9->9(11);
*�����ǣ�������������1��0���ѣ����˿���һ�Ÿ��Ƽ�����ƶѡ������ƶѵĿ�ϴ����ƶѡ����ģ�
*���׷������������۸�:200 -> 300��

v0.14.21 1/31/2019
*�޸� �����������˺�������������
*�����˶�Googly Eye��֧��(��лgithub�û�:KAMAQUEEN)
39 changes: 34 additions & 5 deletions src/main/java/ThMod/ThMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,20 @@
import ThMod.cards.Marisa.OneTimeOff;
import ThMod.cards.Marisa.SprinkleStarSeal;
import ThMod.cards.derivations.Exhaustion_MRS;
import ThMod.monsters.Orin;
import ThMod.monsters.ZombieFairy;
import ThMod.potions.ShroomBrew;
import ThMod.relics.BewitchedHakkero;
import ThMod.relics.BigShroomBag;
import ThMod.relics.CatCart;
import basemod.helpers.RelicType;
import com.badlogic.gdx.graphics.Texture;
import com.google.gson.Gson;
import com.megacrit.cardcrawl.helpers.ImageMaster;
import com.megacrit.cardcrawl.localization.EventStrings;
import com.megacrit.cardcrawl.localization.Keyword;
import com.megacrit.cardcrawl.localization.PotionStrings;
//import com.megacrit.cardcrawl.relics.AbstractRelic;
import com.megacrit.cardcrawl.relics.AbstractRelic;
import java.nio.charset.StandardCharsets;

import java.util.ArrayList;
Expand All @@ -40,7 +45,6 @@
import com.megacrit.cardcrawl.localization.RelicStrings;
import com.megacrit.cardcrawl.rooms.AbstractRoom;
import com.megacrit.cardcrawl.ui.panels.EnergyPanel;
import com.megacrit.cardcrawl.unlock.UnlockTracker;

import ThMod.cards.Marisa.AbsoluteMagnitude;
import ThMod.cards.Marisa.AsteroidBelt;
Expand Down Expand Up @@ -159,6 +163,10 @@ public class ThMod implements PostExhaustSubscriber,

public static final Logger logger = LogManager.getLogger(ThMod.class.getName());

private static final String ORIN_ENCOUNTER = "Orin";
private static final String ORIN_ENCOUNTER_ZHS = "\u963f\u71d0";
private static final String ZOMBIE_FAIRY_ENC = "ZombieFairy";
private static final String ZOMBIE_FAIRY_ENC_ZHS = "\u50f5\u5c38\u5996\u7cbe";
private static final String MOD_BADGE = "img/UI/badge.png";

//card backgrounds
Expand Down Expand Up @@ -289,8 +297,8 @@ public static boolean Amplified(AbstractCard card, int AMP) {
p.getPower("EventHorizonPower").onSpecificTrigger();
}
if (p.hasRelic("AmplifyWand")) {
AmplifyWand r = (AmplifyWand) p.getRelic("AmplifyWand");
r.onSpecificTrigger();
AbstractRelic r = p.getRelic("AmplifyWand");
r.onTrigger();
}
}
logger.info(
Expand Down Expand Up @@ -402,9 +410,17 @@ public void receiveEditRelics() {
new SproutingBranch(),
MARISA_COLOR
);
BaseMod.addRelicToCustomPool(
new BigShroomBag(),
MARISA_COLOR
);
BaseMod.addRelic(
new CatCart(),
RelicType.SHARED
);
//BaseMod.addRelicToCustomPool(new Cape_1(), AbstractCardEnum.MARISA_COLOR);

logger.info("Relics editting finished.");
logger.info("Relics editing finished.");
}

public void receiveEditCards() {
Expand Down Expand Up @@ -607,6 +623,19 @@ public void receivePostInitialize() {
"ShroomBrew",
MARISA
);
String orin, zombieFairy;
switch (Settings.language) {
case ZHS:
orin = ORIN_ENCOUNTER_ZHS;
zombieFairy = ZOMBIE_FAIRY_ENC_ZHS;
break;
default:
orin = ORIN_ENCOUNTER;
zombieFairy = ZOMBIE_FAIRY_ENC;
break;
}
//BaseMod.addMonster(orin, orin, () -> new Orin());
//BaseMod.addMonster(zombieFairy, zombieFairy, () -> new ZombieFairy());
final Texture badge = ImageMaster.loadImage(MOD_BADGE);
BaseMod.registerModBadge(
badge,
Expand Down
35 changes: 35 additions & 0 deletions src/main/java/ThMod/action/FairyWraithAction.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package ThMod.action;

import ThMod.monsters.ZombieFairy;
import ThMod.powers.monsters.LimboContactPower;
import com.megacrit.cardcrawl.actions.AbstractGameAction;
import com.megacrit.cardcrawl.actions.common.ApplyPowerAction;
import com.megacrit.cardcrawl.core.Settings;
import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
import com.megacrit.cardcrawl.monsters.AbstractMonster;
import com.megacrit.cardcrawl.rooms.AbstractRoom.RoomPhase;

public class FairyWraithAction extends AbstractGameAction {
public FairyWraithAction(){
this.duration = Settings.ACTION_DUR_XFAST;
}

@Override
public void update() {
if (AbstractDungeon.getCurrRoom().phase != RoomPhase.COMBAT){
this.isDone=true;
return;
}
this.isDone=false;

for (AbstractMonster m : AbstractDungeon.getMonsters().monsters) {
if ((m instanceof ZombieFairy) && (!m.hasPower("LimboContact"))) {
AbstractDungeon.actionManager.addToTop(
new ApplyPowerAction(m, m, new LimboContactPower(m))
);
}
}

this.isDone = true;
}
}
5 changes: 5 additions & 0 deletions src/main/java/ThMod/action/SpawnFairyAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import ThMod.monsters.ZombieFairy;
import ThMod.powers.monsters.LimboContactPower;
import com.megacrit.cardcrawl.actions.AbstractGameAction;
import com.megacrit.cardcrawl.actions.GameActionManager;
import com.megacrit.cardcrawl.actions.common.ApplyPowerAction;
Expand All @@ -17,6 +18,7 @@
import com.megacrit.cardcrawl.powers.MinionPower;
import com.megacrit.cardcrawl.powers.SlowPower;
import com.megacrit.cardcrawl.powers.StrengthPower;
import com.megacrit.cardcrawl.relics.AbstractRelic;

public class SpawnFairyAction
extends AbstractGameAction {
Expand Down Expand Up @@ -80,6 +82,9 @@ public void update() {
)
);
}
AbstractDungeon.actionManager.addToBottom(
new FairyWraithAction()
);
}
tickDuration();
}
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/ThMod/action/WasteBombAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class WasteBombAction
private int num;
private int stacks;
private AbstractCreature target;
private DamageInfo info;

public WasteBombAction(AbstractCreature target, int dmg, int numTimes, int stacks) {
this.actionType = AbstractGameAction.ActionType.DAMAGE;
Expand All @@ -28,6 +29,7 @@ public WasteBombAction(AbstractCreature target, int dmg, int numTimes, int stack
this.target = target;
this.num = numTimes;
this.stacks = stacks;
this.info = new DamageInfo(AbstractDungeon.player, this.damage, DamageType.NORMAL);
}

public void update() {
Expand Down Expand Up @@ -61,9 +63,9 @@ public void update() {
)
);

this.target.damage(
new DamageInfo(AbstractDungeon.player, this.damage, DamageType.NORMAL)
);
this.info.applyPowers(this.info.owner,target);

this.target.damage(this.info);

if ((!this.target.isDeadOrEscaped()) && (!this.target.isDying)) {
AbstractDungeon.actionManager.addToBottom(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ThMod/cards/Marisa/AsteroidBelt.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public class AsteroidBelt extends CustomCard {

public static final String ID = "AsteroidBelt";
public static final String IMG_PATH = "img/cards/temp/Asteroid.png";
public static final String IMG_PATH = "img/cards/Asteroid.png";
private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
public static final String NAME = cardStrings.NAME;
public static final String DESCRIPTION = cardStrings.DESCRIPTION;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ThMod/cards/Marisa/CollectingQuirk.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ public void use(AbstractPlayer p, AbstractMonster m) {
AbstractDungeon.actionManager.addToBottom(
new UnstableBombAction(
AbstractDungeon.getMonsters().getRandomMonster(true),
this.damage,
this.damage,
this.baseDamage,
this.baseDamage,
this.counter
)
);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ThMod/cards/Marisa/DeepEcologicalBomb.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
AbstractDungeon.actionManager.addToBottom(
new WasteBombAction(
AbstractDungeon.getMonsters().getRandomMonster(true),
this.damage,
this.baseDamage,
num,
this.magicNumber
)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ThMod/cards/Marisa/MeteoricShower.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
}

AbstractDungeon.actionManager.addToBottom(
new MeteoricShowerAction(cnt, this.damage)
new MeteoricShowerAction(cnt, this.baseDamage)
);

if (!this.freeToPlayOnce) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ThMod/cards/Marisa/OortCloud.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public class OortCloud extends CustomCard {
public static final String DESCRIPTION = cardStrings.DESCRIPTION;
public static final String DESCRIPTION_UPG = cardStrings.UPGRADE_DESCRIPTION;
private static final int COST = 1;
private static final int ARMOR_GAIN = 4;
private static final int UPG_ARMOR = 1;
private static final int ARMOR_GAIN = 3;
private static final int UPG_ARMOR = 2;
private static final int AMP_ARMOR = 2;
private static final int UPG_AMP = 1;
private static final int AMP = 1;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ThMod/cards/Marisa/ShootingEcho.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ShootingEcho
public static final String IMG_PATH = "img/cards/temp/Echo.png";
private static final int COST = 1;
private static final int ATTACK_DMG = 9;
//private static final int UPGRADE_PLUS_DMG = 3;
private static final int UPGRADE_PLUS_DMG = 2;

public ShootingEcho() {
super(
Expand Down Expand Up @@ -76,7 +76,7 @@ public AbstractCard makeCopy() {
public void upgrade() {
if (!this.upgraded) {
upgradeName();
//upgradeDamage(UPGRADE_PLUS_DMG);
upgradeDamage(UPGRADE_PLUS_DMG);
this.rawDescription = cardStrings.UPGRADE_DESCRIPTION;
initializeDescription();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ThMod/cards/Marisa/UnstableBomb.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public void use(AbstractPlayer p, AbstractMonster m) {
AbstractDungeon.actionManager.addToBottom(
new UnstableBombAction(
AbstractDungeon.getMonsters().getRandomMonster(true),
this.damage,
this.block,
this.baseDamage,
this.baseBlock,
4
)
);
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/ThMod/cards/Marisa/_6A.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ public class _6A
public static final String NAME = cardStrings.NAME;
public static final String DESCRIPTION = cardStrings.DESCRIPTION;
public static final String IMG_PATH = "img/cards/temp/Butt.png";
private static final int COST = 0;
private static final int ATTACK_DMG = 3;
private static final int UPGRADE_PLUS_DMG = 1;
private static final int COST = 1;
private static final int ATTACK_DMG = 4;
//private static final int UPGRADE_PLUS_DMG = 1;
private static final int UPG_COST = 0;

public _6A() {
super(ID, NAME, IMG_PATH, COST, DESCRIPTION, AbstractCard.CardType.ATTACK,
Expand All @@ -48,7 +49,8 @@ public AbstractCard makeCopy() {
public void upgrade() {
if (!this.upgraded) {
upgradeName();
upgradeDamage(UPGRADE_PLUS_DMG);
//upgradeDamage(UPGRADE_PLUS_DMG);
upgradeBaseCost(UPG_COST);
}
}
}
Loading

0 comments on commit 5488898

Please sign in to comment.