Skip to content
This repository has been archived by the owner on Nov 5, 2022. It is now read-only.

Commit

Permalink
v4.1.0: SANS!!! SANS UNDERTALE!!!
Browse files Browse the repository at this point in the history
  • Loading branch information
ThatOneCalculator committed Dec 19, 2021
1 parent 1078c39 commit 5cee58e
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Among-Us-Dumpy-Gif-Maker
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Based off of: https://daveparrish.net/posts/2019-11-16-Better-AppImage-PKGBUILD-template.html

_pkgname="among-us-dumpy-gif-maker"
_pkgver="4.0.0"
_pkgver="4.1.0"
_jar="Among-Us-Dumpy-Gif-Maker-${_pkgver}-all.jar"

pkgname="${_pkgname}"
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Based off of: https://daveparrish.net/posts/2019-11-16-Better-AppImage-PKGBUILD-template.html

_pkgname="among-us-dumpy-gif-maker"
_pkgver="4.0.0"
_pkgver="4.1.0"
_jar="Among-Us-Dumpy-Gif-Maker-${_pkgver}-all.jar"

pkgname="${_pkgname}"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<p align="center">
<a href="https://voring.me/@thatonecalculator" target="blank"><img src="https://shields.io/badge/follow-@thatonecalculator-3088D4?logo=mastodon&style=for-the-badge" alt="voring.me (mastodon)"/></a>
<a href="https://twitter.com/pixer415" target="blank"><img src="https://shields.io/badge/follow-@pixer415-1DA1F2?logo=twitter&style=for-the-badge" alt="twitter"/></a>
<h6 align="center"> With help from <a href="https://twitter.com/twistCMYK">twistCMYK</a>, karl-police, and auguwu!</h6>
<h6 align="center"> With help from <a href="https://twitter.com/twistCMYK">twistCMYK</a>, <a href="https://twitter.com/CocotheMunchkin">Coco</a>, karl-police, and auguwu!</h6>
<div align="center"> <img src="https://cdn.discordapp.com/icons/849516341933506561/a_d4c89d8bd30a116e8ea3808478f73387.gif" height=100></div>
</p>

### Please credit this repository when you use this program!
##### Current version: 4.0.0
##### Current version: 4.1.0

### Testimonials

Expand Down Expand Up @@ -53,13 +53,13 @@

To everyone else:

### Make sure to [download the jar](https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker/releases/download/v4.0.0/Among-Us-Dumpy-Gif-Maker-4.0.0-all.jar)!
### Make sure to [download the jar](https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker/releases/download/v4.1.0/Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar)!

### Basic usage:
Click and open the jar, select the file, and a file called "dumpy.gif" will be made in the same folder as the jar.

### CLI usage:
- `java -jar Among-Us-Dumpy-Gif-Maker-4.0.0-all.jar <flags>`
- `java -jar Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar <flags>`
All flags are optional.
Flags:
```
Expand All @@ -68,7 +68,7 @@ Flags:
--file <arg> Path to file, hides file picker
--help Shows this message
--lines <arg> Changes the number of lines (defaults to 10)
--mode <arg> Crewmate mode, currently supports default, furry, isaac, and bounce
--mode <arg> Crewmate mode, currently supports default, furry, sans, isaac, and bounce
```

### From source:
Expand All @@ -79,7 +79,7 @@ git clone https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker
cd Among-Us-Dumpy-Gif-Maker
gradle wrapper
./gradlew shadowJar # .\gradelw.bat shadowJar if you're on Windows
java -jar ./build/libs/Among-Us-Dumpy-Gif-Maker-4.0.0-all.jar
java -jar ./build/libs/Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar
```

Please note that the Discord/Revolt bots are not designed to be self-hosted, and I will not be providing support for self-hosting them.
2 changes: 1 addition & 1 deletion among-us-dumpy-gif-maker
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

/usr/bin/java -jar /usr/lib/Among-Us-Dumpy-Gif-Maker-4.0.0-all.jar $@
/usr/bin/java -jar /usr/lib/Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar $@
Binary file added bin/main/dumpy/0_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/dumpy/1_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/dumpy/2_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/dumpy/3_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/dumpy/4_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/dumpy/5_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 10 additions & 3 deletions bots/discord_bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
statcordkey = lines[0].strip()

upsince = datetime.datetime.now()
version = "4.0.0"
version = "4.1.0"

intents = discord.Intents.default()
bot = commands.AutoShardedBot(command_prefix=commands.when_mentioned_or(
Expand Down Expand Up @@ -152,7 +152,7 @@ class HelpCommand(commands.Cog):
async def help_(self, ctx):
embed = discord.Embed(
title="My commands!",
description="Made by ThatOneCalculator#0001 and Dsim64#8145! `()` = optional, `<>` = mandatory.",
description="Made by ThatOneCalculator#0001 and pixer415#8145! `()` = optional, `<>` = mandatory.",
color=0x976BE1
)
embed.add_field(
Expand All @@ -165,6 +165,11 @@ async def help_(self, ctx):
value="The same as `!!dumpy`, but uses the furry template, UwU~ (Template by [twistCMYK](https://twitter.com/twistCMYK)).",
inline=False
)
embed.add_field(
name="`!!sans (height) (@person)`",
value="The same as `!!dumpy`, but uses the Sans template (Template by [Coco](https://twitter.com/CocotheMunchkin)).",
inline=False
)
embed.add_field(
name="`!!isaac (height) (@person)`",
value="The same as `!!dumpy`, but uses the Binding of Isaac template.",
Expand Down Expand Up @@ -330,7 +335,7 @@ async def background(self, ctx, *, ar: str = None):
return await ctx.send("You NEED to attach a file in your message to set your background. Try again in 30 seconds.\nTo delete your background, run `!!background delete`.")

@commands.cooldown(1, 5, commands.BucketType.user)
@commands.command(aliases=["twerk", "amogus", "furry", "twist", "isaac", "bounce"])
@commands.command(aliases=["twerk", "amogus", "furry", "twist", "isaac", "bounce", "sans"])
async def dumpy(self, ctx, number: typing.Union[int, str] = 10, victim: typing.Union[discord.Member, str] = None):
await bot.wait_until_ready()
# await ctx.send("The `!!background` command has been updated! Run `!!background delete` to remove your current background, run `!!background color` for a solid color, `!!background #AAAAAA` for a custom color background, `!!background flag` for pride flags (gay, lesbian, trans, etc) and run `!!background` and attach an image for a custom image as a background.")
Expand Down Expand Up @@ -383,6 +388,8 @@ async def dumpy(self, ctx, number: typing.Union[int, str] = 10, victim: typing.U
mode = "isaac"
elif "bounce" in ctx.message.content:
mode = "bounce"
elif "sans" in ctx.message.content or "undertale" in ctx.message.content:
mode = "sans"
background = f"--background custom_bgs/background_{ctx.author.id}.png" if exists(f"custom_bgs/background_{ctx.author.id}.png") else ""
await loop.run_in_executor(None, blocking, messageid, mode, number, background)
filename = f"dumpy{messageid}.gif"
Expand Down
2 changes: 2 additions & 0 deletions bots/revolt_bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ async def help(self, ctx: commands.Context):
Makes a dumpy gif from whatever image you post or from a person's avatar. Height can be a number between 2 and 35, the default is 10. If you tag a person after the height, it will use their avatar instead of the last image in chat.
### $\color{#FF76AB}\blacksquare$ `!!furry`:
The same as `!!dumpy`, but uses the furry template, UwU~ (Template by [twistCMYK](https://twitter.com/twistCMYK)).
### $\color{#FF76AB}\blacksquare$ `!!sans`:
The same as `!!dumpy`, but uses the Sans template (Template by [Coco](https://twitter.com/CocotheMunchkin)).
### $\color{#FF76AB}\blacksquare$ `!!isaac`:
The same as `!!dumpy`, but uses the Binding of Isaac template.
### $\color{#FF76AB}\blacksquare$ `!!bounce`:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group = "dev.t1c.amogus"
version = "4.0.0"
version = "4.1.0"

repositories {
mavenCentral()
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/dev/t1c/dumpy/sus.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static void main(String[] args) throws Exception {
Option fl = Option.builder().longOpt("file").hasArg().desc("Path to file, hides file picker").build();
Option bk = Option.builder().longOpt("background").hasArg().desc("Path to custom background").build();
Option md = Option.builder().longOpt("mode").hasArg()
.desc("Crewmate mode, currently supports default, furry, isaac, and bounce").build();
.desc("Crewmate mode, currently supports default, furry, sans, isaac, and bounce").build();
Option eo = Option.builder().longOpt("extraoutput").hasArg().desc("Appends text to output files").build();
Option hp = Option.builder().longOpt("help").desc("Shows this message").build();
options.addOption(li);
Expand Down Expand Up @@ -111,9 +111,9 @@ public static void main(String[] args) throws Exception {

if (cmd.hasOption("mode")) {
mode = cmd.getOptionValue("mode");
String[] validModes = { "default", "furry", "isaac", "bounce" };
String[] validModes = { "default", "furry", "sans", "isaac", "bounce" };
if (!Arrays.asList(validModes).contains(mode)) {
System.out.println("Mode has to be default, furry, isaac, or bounce!");
System.out.println("Mode has to be default, furry, sans, isaac, or bounce!");
System.exit(1);
}
}
Expand Down Expand Up @@ -160,6 +160,10 @@ else if (mode.equals("isaac")) {
modestring = "_isaac";
}

else if (mode.equals("sans")) {
modestring = "_sans";
}

else if (mode.equals("bounce")) {
bufferedImageArraySize -= 2;
count1Check -= 2;
Expand Down
Binary file added src/main/resources/dumpy/0_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/dumpy/1_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/dumpy/2_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/dumpy/3_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/dumpy/4_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/dumpy/5_sans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5cee58e

Please sign in to comment.