thepaperpilot/Super-Auto-Coots
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Super-Auto-Coots.git synced 2024-11-22 00:21:33 +00:00
Code Issues Releases Activity Actions

Implement abilities

Browse source
This commit is contained in:
thepaperpilot 2023-02-19 22:18:58 -06:00
parent 9fea4bed08
commit 070891ae72
5 changed files with 113 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/data/CharacterSlot.vue
View file

@ -1,10 +1,6 @@
<template>
<Tooltip
:display="
character && selected == null && dragging === false
? characters[character.type].nickname
: ''
"
:display="comp"
:direction="Direction.Up"
>
<div
@ -87,10 +83,12 @@
</Tooltip>
</template>
<script setup lang="ts">
<script setup lang="tsx">
import { jsx, JSXFunction } from "features/feature";
import Tooltip from "features/tooltips/Tooltip.vue";
import { Direction } from "util/common";
import { ref, watch } from "vue";
import { coerceComponent } from "util/vue";
import { ref, shallowRef, watch, watchEffect } from "vue";
import heart from "../../public/Heart.png";
import level1_0 from "../../public/Lvl 1_0.png";
import level1_1 from "../../public/Lvl 1_1.png";
@ -99,8 +97,9 @@ import level2_1 from "../../public/Lvl 2_1.png";
import level2_2 from "../../public/Lvl 2_2.png";
import level3 from "../../public/Lvl 3.png";
import { characters } from "./projEntry";
import { Character } from "./types";
defineProps<{
const props = defineProps<{
character?: Character | null;
isSelected?: boolean;
isShop?: boolean;
@ -124,6 +123,16 @@ watch(dragging, dragging => {
emits("dragend");
}
});
const comp = shallowRef<JSXFunction | "">("");
watchEffect(() => {
if (props.character == null || props.selected != null || dragging.value) {
comp.value = "";
return;
}
const Ability = coerceComponent(characters[props.character.type].abilityDescription);
comp.value = jsx(() => (<><b>{characters[props.character!.type].nickname}</b><br /><Ability /></>));
})
</script>
<style scoped>

100
src/data/projEntry.tsx
View file

@ -4,7 +4,7 @@ import { jsx } from "features/feature";
import type { BaseLayer, GenericLayer } from "game/layers";
import { createLayer } from "game/layers";
import type { Player } from "game/player";
import { computed, ref, Transition, TransitionGroup } from "vue";
import { computed, ref, TransitionGroup } from "vue";
import CharacterSlot from "./CharacterSlot.vue";
import "./socket";
import "./common.css";
@ -21,55 +21,88 @@ import heart from "../../public/Heart.png";
import startStream from "../../public/start stream.png";
import { createReset } from "features/reset";
import settings from "game/settings";
import type { AbilityTypes, CharacterInfo, Character, BattleOutcome } from "./types";
import { formatWhole } from "util/bignum";
export const characters: Record<string, CharacterInfo> = {
coots: {
nickname: "Coots",
initialRelevancy: 1,
initialPresence: 1,
display: coots
display: coots,
abilityType: "LivestreamJoined",
abilityDescription: "Do nothing",
performAbility() {}
},
ludwig: {
nickname: "Ludwig Coots",
initialRelevancy: 1,
initialPresence: 1,
display: ludwig
display: ludwig,
abilityType: "LivestreamJoined",
abilityDescription: "Do nothing",
performAbility() {}
},
qt: {
nickname: "Qt Coots",
initialRelevancy: 1,
initialPresence: 1,
display: qt
display: qt,
abilityType: "LivestreamJoined",
abilityDescription: jsx(() => (
<>
<i>Livestream joined</i>: Set both stats to 100
</>
)),
performAbility(char) {
char.presence = 100;
char.relevancy = 100;
}
},
maid: {
nickname: "Maid Coots",
initialRelevancy: 1,
initialPresence: 1,
display: maid
display: maid,
abilityType: "LivestreamJoined",
abilityDescription: "Do nothing",
performAbility() {}
},
mail: {
nickname: "Mogul Mail Coots",
initialRelevancy: 1,
initialPresence: 1,
display: mail
display: mail,
abilityType: "LivestreamJoined",
abilityDescription: "Do nothing",
performAbility() {}
},
stanz: {
nickname: "Stanz Coots",
initialRelevancy: 1,
initialPresence: 1,
display: stanz
display: stanz,
abilityType: "LivestreamJoined",
abilityDescription: "Do nothing",
performAbility() {}
},
money: {
nickname: "Mogul Money Coots",
initialRelevancy: 1,
initialPresence: 1,
display: money
display: money,
abilityType: "LivestreamJoined",
abilityDescription: "Do nothing",
performAbility() {}
},
vespa: {
nickname: "Vespa Coots",
initialRelevancy: 1,
initialPresence: 1,
display: vespa
display: vespa,
abilityType: "LivestreamJoined",
abilityDescription: "Do nothing",
performAbility() {}
}
};
@ -92,7 +125,8 @@ export const main = createLayer("main", function (this: BaseLayer) {
const playClicked = ref<boolean>(false);
const queue = ref<
{
action: "join";
action: AbilityTypes | "join";
target?: Character;
}[]
>([]);
@ -172,6 +206,16 @@ export const main = createLayer("main", function (this: BaseLayer) {
queue.value.push({
action: "join"
});
} else if (queue.value.length > 1) {
queue.value = queue.value.sort((a, b) => {
if (a.action !== b.action) {
return 1;
}
if (a.target != null && b.target != null) {
return b.target.relevancy - a.target.relevancy;
}
return 0;
});
}
if (settings.autoplay === false && playClicked.value === false) {
previewing.value = true;
@ -181,12 +225,27 @@ export const main = createLayer("main", function (this: BaseLayer) {
switch (action.action) {
case "join":
if ((battle.value.team.length ?? 0) > 0) {
battle.value.streamers.push(battle.value.team.pop()!);
const char = battle.value.team.pop()!;
battle.value.streamers.push(char);
if (characters[char.type].abilityType === "LivestreamJoined") {
queue.value.unshift({ action: "LivestreamJoined", target: char });
}
}
if ((battle.value.enemyTeam.length ?? 0) > 0) {
battle.value.enemyStreamers.push(battle.value.enemyTeam.pop()!);
const char = battle.value.enemyTeam.pop()!;
battle.value.enemyStreamers.push(char);
if (characters[char.type].abilityType === "LivestreamJoined") {
queue.value.unshift({ action: "LivestreamJoined", target: char });
}
}
break;
default:
if (action.target == null) {
console.error("Invalid action", action);
break;
}
characters[action.target.type].performAbility(action.target);
break;
}
playClicked.value = false;
setTimeout(prepareMove, settings.fast ? 750 : 1250);
@ -251,7 +310,7 @@ export const main = createLayer("main", function (this: BaseLayer) {
</div>
</div>
<div class="view-counter" style="right: 1vmin">
{views.value} Views
{formatWhole(views.value)} Views
</div>
<Row class="streamers-container">
<TransitionGroup name="character-transition">
@ -262,6 +321,10 @@ export const main = createLayer("main", function (this: BaseLayer) {
<CharacterSlot
key={battle.value!.streamers.length - i}
character={streamer}
shake={
previewing.value &&
queue.value[0]?.target === streamer
}
/>
))}
</TransitionGroup>
@ -304,12 +367,19 @@ export const main = createLayer("main", function (this: BaseLayer) {
</div>
</div>
<div class="view-counter" style="left: 1vmin">
{enemyViews.value} Views
{formatWhole(enemyViews.value)} Views
</div>
<Row class="streamers-container">
<TransitionGroup name="character-transition">
{battle.value.enemyStreamers.map((streamer, i) => (
<CharacterSlot key={i} character={streamer} />
<CharacterSlot
key={i}
character={streamer}
shake={
previewing.value &&
queue.value[0]?.target === streamer
}
/>
))}
</TransitionGroup>
</Row>

3
src/data/socket.tsx
View file

@ -8,6 +8,7 @@ import { io, Socket } from "socket.io-client";
import { ref, watch } from "vue";
import { useToast } from "vue-toastification";
import { characters, main } from "./projEntry";
import { ServerToClientEvents, ClientToServerEvents, Character } from "./types";
export const connected = ref<boolean>(false);
export const nickname = ref<string>("");
@ -141,7 +142,7 @@ function setupSocket(socket: Socket<ServerToClientEvents, ClientToServerEvents>)
main.battle.value = {
team: JSON.parse(JSON.stringify(main.team.value.filter(m => m != null))),
streamers: [],
enemyTeam: enemy.team.filter(m => m != null) as Character[],
enemyTeam: enemy.team,
enemyStreamers: [],
enemyNickname: enemy.nickname,
enemyLives: enemy.lives,

9
src/data/types.d.ts vendored
View file

@ -1,8 +1,15 @@
import { CoercableComponent } from "features/feature";
type AbilityTypes = "LivestreamJoined";
interface CharacterInfo {
nickname: string;
initialRelevancy: number;
initialPresence: number;
display: string;
abilityType: AbilityTypes;
abilityDescription: CoercableComponent;
performAbility: (char: Character) => void;
}
interface Character {
@ -25,7 +32,7 @@ interface ServerToClientEvents {
merge: (shopIndex: number, teamIndex: number, char: Character) => void;
stream: (
enemy: {
team: (Character | null)[];
team: Character[];
nickname: string;
lives: number;
wins: number;

2
src/features/tooltips/Tooltip.vue
View file

@ -123,7 +123,7 @@ export default defineComponent({
.tooltip {
text-align: center;
width: 150px;
width: 250px;
font-size: 14px;
line-height: 1.2;
bottom: calc(100% + var(--yoffset));