Skip to content

Commit

Permalink
Merge pull request #1 from Sorwest/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Sorwest committed Feb 12, 2024
2 parents 1cab4cb + f0729a6 commit ab281ba
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 26 deletions.
6 changes: 3 additions & 3 deletions Artifacts/LenArtifactBananaStash.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static void Register(IModHelper helper)
}
public override string Name() => "BANANA STASH";
public int counter;
public bool stillHasBananas;
public bool stillHasBananas = true;
public int enemyDamage;
public int shieldNumber;
public override int? GetDisplayNumber(State s)
Expand All @@ -33,7 +33,7 @@ public static void Register(IModHelper helper)
}
public override Spr GetSprite()
{
if (counter > 0 || stillHasBananas == true)
if (counter > 0 || stillHasBananas)
return ModEntry.Instance.Sprites["BananaStash"].Sprite;
else
{
Expand Down Expand Up @@ -86,7 +86,7 @@ public override void OnCombatEnd(State state)
CustomTTGlossary.GlossaryType.action,
() => ModEntry.Instance.Sprites["EatBanana"].Sprite,
() => ModEntry.Instance.Localizations.Localize(["action", "EatBanana", "name"]),
() => ModEntry.Instance.Localizations.Localize(["action", "EatBanana", "description"], new { Damage = enemyDamage, MaidDress = str }),
() => ModEntry.Instance.Localizations.Localize(["action", "EatBanana", "description"], new { Damage = enemyDamage > 0 ? enemyDamage : 1, MaidDress = str }),
key: $"{ModEntry.Instance.Package.Manifest.UniqueName}::EatBanana"
));
return tooltips;
Expand Down
12 changes: 10 additions & 2 deletions Cards/LenCardNiccoriTeamSurvey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public override CardData GetData(State state)
{
cost = upgrade == Upgrade.A ? 2 : 3,
exhaust = upgrade == Upgrade.B ? false : true,
description = ModEntry.Instance.Localizations.Localize(["card", "NiccoriTeamSurvey", "description"])
description = ModEntry.Instance.Localizations.Localize(["card", "NiccoriTeamSurvey", "description", upgrade.ToString()], new { Amount = upgrade == Upgrade.A ? 1 : 2 })
};
}
public override List<CardAction> GetActions(State s, Combat c)
Expand All @@ -50,12 +50,20 @@ public override List<CardAction> GetActions(State s, Combat c)
{
type = BananaType.AAttack,
dmg = GetDmg(s, 0),
targetPlayer = false
targetPlayer = false,
fast = true
});
internalCounter--;
}
while (internalCounter > 0);
}
if (upgrade != Upgrade.None)
{
result.Add(new AGainBanana()
{
amount = upgrade == Upgrade.A ? 1 : 2
});
}
return result;
}
}
2 changes: 1 addition & 1 deletion Cards/LenCardParadichlorobenzene.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public override CardData GetData(State state)
{
return new()
{
cost = upgrade == Upgrade.None ? 2 : (upgrade == Upgrade.A ? 1 : 3),
cost = upgrade == Upgrade.A ? 0 : 2,
buoyant = upgrade == Upgrade.B ? true : false,
exhaust = true,
description = ModEntry.Instance.Localizations.Localize(["card", "Paradichlorobenzene", "description"])
Expand Down
6 changes: 3 additions & 3 deletions Cards/LenCardToluthinAntenna.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public override CardData GetData(State state)
{
exhaust = true,
cost = upgrade == Upgrade.A ? 1 : 2,
description = ModEntry.Instance.Localizations.Localize(["card", "ToluthinAntenna", "description"], new { Amount = upgrade == Upgrade.B ? 5 : 2 })
description = ModEntry.Instance.Localizations.Localize(["card", "ToluthinAntenna", "description"], new { Amount = upgrade == Upgrade.B ? 4 : 2 })
};
}
public override List<CardAction> GetActions(State s, Combat c)
Expand All @@ -37,7 +37,7 @@ public override List<CardAction> GetActions(State s, Combat c)
{
new ACardOffering()
{
amount = upgrade == Upgrade.B ? 5 : 2,
amount = upgrade == Upgrade.B ? 4 : 2,
limitDeck = Deck.hacker,
makeAllCardsTemporary = true,
canSkip = false,
Expand All @@ -46,7 +46,7 @@ public override List<CardAction> GetActions(State s, Combat c)
},
new ACardOffering()
{
amount = upgrade == Upgrade.B ? 5 : 2,
amount = upgrade == Upgrade.B ? 4 : 2,
limitDeck = Deck.peri,
makeAllCardsTemporary = true,
canSkip = false,
Expand Down
12 changes: 6 additions & 6 deletions Cards/LenCardVampiresPathos.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public override CardData GetData(State state)
return new()
{
cost = upgrade == Upgrade.A ? 1 : 2,
description = ModEntry.Instance.Localizations.Localize(["card", "VampiresPathoS", "description", upgrade.ToString()])
description = ModEntry.Instance.Localizations.Localize(["card", "VampiresPathoS", "description"], new { Amount = upgrade == Upgrade.B ? 2 : 1 })
};
}
public override List<CardAction> GetActions(State s, Combat c)
Expand All @@ -44,15 +44,15 @@ public override List<CardAction> GetActions(State s, Combat c)
if (s.ship.Get(ModEntry.Instance.BananaStatus.Status) > 0 || s.route is not Combat)
{
int internalCounter = s.ship.Get(ModEntry.Instance.BananaStatus.Status) == 1 ? 1 : 2;
result.Insert(0, new AThrowBanana()
{
amount = -1
});
do
{
if (internalCounter <= 0)
break;
result.Insert(result.Count - 2, new ABananaDamage()
result.Add(new AThrowBanana()
{
amount = -1
});
result.Add(new ABananaDamage()
{
type = BananaType.AAttack,
dmg = GetDmg(s, 0),
Expand Down
4 changes: 3 additions & 1 deletion Features/Banana.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class ABananaDamage : CardAction
{
public BananaType type;
public int? dmg;
public bool fast;
public bool targetPlayer;
public override void Begin(G g, State s, Combat c)
{
Expand All @@ -74,7 +75,8 @@ public override void Begin(G g, State s, Combat c)
c.Queue(new AAttack()
{
damage = damage,
piercing = targetPlayer
piercing = targetPlayer,
fast = fast
});
}
else
Expand Down
3 changes: 3 additions & 0 deletions LenMod.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@
<PackageReference Include="MakeTypesPublic" Version="1.0.3" PrivateAssets="All" ExcludeAssets="runtime" />
<PackageReference Include="EnumByNameSourceGenerator" Version="1.1.1" PrivateAssets="All" ExcludeAssets="runtime" />
</ItemGroup>
<ItemGroup>
<Folder Include="assets\misc\" />
</ItemGroup>
</Project>
37 changes: 36 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,36 @@
# LenMod

<div align="center">
<h1>Kagamine Len</h1>
<img src="assets/character/neutral/len_neutral_0.png" alt="logo" width="auto" height="auto" />
<img src="assets/character/squint/len_squint_0.png" alt="logo" width="auto" height="auto" />
<p>What is banana boy doing here?</p>
</div>

<div align="center">
<img src="assets/misc/AllCardsNone.png" alt="screenshot" width="auto" height="auto" />
<p>Base cards</p>
<img src="assets/misc/AllCardsA.png" alt="screenshot" width="auto" height="auto" />
<p>Upgrade A cards</p>
<img src="assets/misc/AllCardsB.png" alt="screenshot" width="auto" height="auto" />
<p>Upgrade B cards</p>
</div>

## Dialogue?
I do not plan on making Len dialogue.

## Animations?
I do not plan on making detailed talking animations.

## Other Vocaloid mods?
I do not plan on making other voice bank characters into mods.

## Gameplay Balance
If you find that a card, artifact, concept, etc, could use a tweak, leave a comment in the proper communication channels
- Leave a comment in the NexusMod mod page
- Ping me in the cc-mod-showcase Len Mod thread in the official Rocket Rat Games Discord server
- Open an issue in the GitHub repository

DO NOT:
- Do not ping me in the NexusMods discord server
- Do not ping me in the Thunderstore discord server
- Do not DM me
Binary file modified assets/icons/GainBananaLoseAll.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/misc/AllCardsA.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/misc/AllCardsB.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/misc/AllCardsNone.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"status": {
"MusicNote": {
"name": "Music Note",
"description": "At start of turn, <c=action>eat</c> <=boldPink>{0}</c> <c=status>bananas</c> for free. <c=downside>Normal bananas are disabled</c>."
"description": "At start of turn, <c=action>eat</c> <=boldPink>{0}</c> <c=status>bananas</c> for free. <c=downside>Banana Stash passive eating is disabled</c>."
},
"Banana": {
"name": "Banana",
Expand Down Expand Up @@ -117,11 +117,15 @@
},
"NiccoriTeamSurvey": {
"name": "Niccori Team Survey",
"description": "<c=action>Throw</c> all <c=status>bananas</c>."
"description": {
"None": "<c=action>Throw</c> all <c=status>bananas</c>.",
"A": "<c=action>Throw</c> all <c=status>bananas</c>. Gain <c=boldPink>{{Amount}}</c> <c=status>bananas</c>.",
"B": "<c=action>Throw</c> all <c=status>bananas</c>. Gain <c=boldPink>{{Amount}}</c> <c=status>bananas</c>."
}
},
"Paradichlorobenzene": {
"name": "Paradichlorobenzene",
"description": "If you have <c=status>bananas</c>, enemy loses all <c=status>shield</c>. <c=healing>Gain</c> a <c=status>banana</c>."
"description": "If you have <c=status>bananas</c>, enemy loses all <c=status>shield</c>. Gain a <c=status>banana</c>."
},
"PlusBoy": {
"name": "Plus Boy",
Expand All @@ -138,15 +142,11 @@
},
"ToluthinAntenna": {
"name": "Toluthin Antenna",
"description": "Add 1 of {{Amount}} <c=cardtrait>discount, temp</c> <c=hacker>Max</c> & <c=peri>Peri</c> cards to your hand."
"description": "Add 1 of <c=boldPink>{{Amount}}</c> <c=cardtrait>discount, temp</c> <c=hacker>Max</c> & <c=peri>Peri</c> cards to your hand."
},
"VampiresPathoS": {
"name": "Vampire's PathoS",
"description": {
"None": "<c=action>Throw</c> <c=boldPink>a</c> <c=status>banana</c>. <c=healing>Heal 1</c>.",
"A": "<c=action>Throw</c> <c=boldPink>a</c> <c=status>banana</c>. <c=healing>Heal 1</c>.",
"B": "<c=action>Throw</c> <c=boldPink>2</c> <c=status>bananas</c>. <c=healing>Heal 1</c>."
}
"description": "<c=action>Throw</c> <c=boldPink>{{Amount}}</c> <c=status>bananas</c>. <c=healing>Heal 1</c>."
}
}
}

0 comments on commit ab281ba

Please sign in to comment.