Skip to content

Commit

Permalink
rewrite, indicators, choices, and more
Browse files Browse the repository at this point in the history
  • Loading branch information
skuqre committed Dec 18, 2023
1 parent 99b8352 commit 3b48c5d
Show file tree
Hide file tree
Showing 16 changed files with 471 additions and 94 deletions.
Binary file modified public/blabla-example1.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 modified public/dialogue-example1.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 modified public/dialogue-example2.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 public/images/blabla/bot2.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 public/images/blabla/s_systembubble.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 public/images/blabla/systembubble.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 public/images/dialogue/controls/autocancel.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 public/images/dialogue/controls/hidecancel.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 modified public/logo-example1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 39 additions & 3 deletions src/components/BlablaInput.astro
Original file line number Diff line number Diff line change
Expand Up @@ -140,21 +140,22 @@
</td>
</tr>
<tr style="display: none;" id="chats-page-tabs">
<td style="vertical-align: top; padding-top: 4px; padding-bottom: 5px;" colspan="3">
<td style="vertical-align: top; padding-top: 5px; padding-bottom: 5px;" colspan="3">
<button id="mission-page" class="button-bs" style="width: calc(33.33% - 8px); margin-left: 4px; margin-right: 3px; font-weight: normal;">
<img src="/nikke-font-generator/images/blabla/logo_mission.png" class="logo-img" alt=""> Mission
</button>
<button id="nikke-page" class="button-bs" style="width: calc(33.33% - 8px); font-weight: bold;">
<img src="/nikke-font-generator/images/blabla/logo_nikke.png" class="logo-img" alt=""> Nikke
</button>
<button id="group-page" class="button-bs" style="width: calc(33.33% - 8px); font-weight: normal; top: 1px; position: relative;">
<button id="group-page" class="button-bs" style="width: calc(33.33% - 8px); font-weight: normal; position: relative;">
<img src="/nikke-font-generator/images/blabla/logo_group.png" class="logo-img" alt=""> Group
</button>
</td>
</tr>
<tr>
<td colspan="1">
<input type="number" id="ypos" step="10" value="0" style="width: 256px; margin: 0; margin-left: 4px; margin-bottom: 4px;" placeholder="Global Y-Position Offset/Scroll" />
<input type="number" id="ypos" step="10" style="width: 157px; margin: 0; margin-left: 4px; margin-right: 4px; margin-bottom: 4px;" placeholder="Scroll Offset" />
<button id="drag-toggle" class="button-bs" style="width: 90px; display: inline-block;">Drag: OFF</button>
</td>
<td colspan="1">
<!-- <input
Expand Down Expand Up @@ -182,6 +183,41 @@
<button id="set-convo" style="width: calc(50% - 8px); display: inline-block; font-weight: bold;">Conversation screen</button>
</td>
</tr>
<tr>
<td colspan="3" class="wholerow">
<label class="whole-row" id="grid-toggle" style="margin-top: 4px; user-select: none;">
Grid Background: OFF
</label>
</td>
</tr>

<th>
Choices
</th>
<tr>
<td colspan="3" class="wholerow">
<textarea
id="choices"
autocomplete="off"
placeholder='1 line = 1 choice...'
style="min-width: calc(100% - 20px); text-align:center;"
class="whole-row"
/>
</td>
</tr>

<th>Other</th>
<tr>
<td style="vertical-align: top;" colspan="3">
<label id="import" class="button-bs" style="width: calc(50% - 8px); line-height: 40px; display: inline-block; margin-left: 4px; margin-right: 3px;">
Import JSON
<input type="file" id="chat-json-up" accept=".json">
</label>
<label id="export" class="button-bs" style="width: calc(50% - 8px); line-height: 40px; display: inline-block;">
Export JSON
</label>
</td>
</tr>


<th>
Expand Down
2 changes: 2 additions & 0 deletions src/components/DialogueInput.astro
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@ import { eyeOn } from "../scripts/util.js";
<select id="cotype" name="Control Type" style="position: inherit; margin-left: 4px; width: calc(100% - 8px);">
<option value="autoskip">Auto-Log-Skip (Default)</option>
<option value="autofast">Auto-Log-Fast</option>
<option value="autocancel">Auto-Log-Cancel</option>
<option value="hideskip">Hide-Auto-Log-Skip</option>
<option value="hidefast">Hide-Auto-Log-Fast</option>
<option value="hidecancel">Hide-Auto-Log-Cancel</option>
</select>
</td>
<td>
Expand Down
7 changes: 7 additions & 0 deletions src/pages/blabla.astro
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ import Anise from '../components/Anise.astro';
<BlablaDisplay />
<p><i>Generated output you see may be barely accurate to inaccurate to official media.<br>Click the image for a fast download!</i></p>
<BlablaInput />
<p>
<i>
creations in Safari may have the text look offset.<br>
this is unfortunately a <b>browser issue</b>, nothing much I can do about it.<br>
use a different browser, if possible. sorry!
</i>
</p>
<Credits />
<Anise />

Expand Down
3 changes: 2 additions & 1 deletion src/pages/credits.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ embeddesc: The site's credits!
| [**NIKKE-DB**](https://nikke-db.pages.dev) | This site uses some assets from NIKKE-DB.<br>Their work has been really helpful for the dialogue generator!<br>This site also uses their GitHub Database for character profile pictures for the BlaBla generator!!! |
| [**NIKKE.GG**](https://nikke.gg) | This site gets NIKKE data from NIKKE.GG! |
| [**GitHub Pages**](https://pages.github.com) | Site hosting. Where else can I tend to? |
| [**Boxicons**](https://boxicons.com) | Some good web icons for everyone to use. No freemium bullshit. |
| [**Astro**](https://astro.build) | For being dope to work with. |

<br>
Expand All @@ -23,7 +24,7 @@ embeddesc: The site's credits!
| [**Pretendard**](https://cactus.tistory.com/306) | Made by [Kil Hyung-jin (orioncactus)](https://github.com/orioncactus). Used throughout the site and Dialogue Generator. Found through research. |
| [**Docteur Atomic**](https://www.dafont.com/docteur-atomic.font) | Made by Jonathan Paquette. Used on Logo Generator. Found through a lousy "font-surfing" session one night. |
| [**Butch and Sundance**](https://www.dafont.com/butch-sundance.font) | Made by [Dan Zadorozny (Iconian Fonts)](https://www.iconian.com). Used on Logo Generator. Found through research. |
| [**SUIT**](https://sun.fo/suit/) | Made by the folks at [sun.fo](https://sun.fo/suit/). Used on the Blabla Generator. |
| [**SUIT**](https://sun.fo/suit/) | Made by the folks at [sun.fo](https://sun.fo/). Used on the Blabla Generator. |

<br>

Expand Down
37 changes: 37 additions & 0 deletions src/pages/update-log.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,43 @@ embeddesc: the update log
---
<br>

## rewrite, indicators, choices, and more `Dec 18, 2023`

**blabla gen**
- **BREAKING** rewrote how blabla's are drawn
- this may or may not be good
- **BREAKING** added choices
- they will always be on the end of the conversation and will not affect your chat's messages
- they will always be on the side of the Commander
- they will always take the color of the Commander's color
- added in those "end" indicators -- type in "Indicator" as the character's name, and type in anything you want in place of the "END"
- added in system messages -- type in "System" as the character's name, and type in anything you want in place of the "Syuen left the room." kinda text you see.
- added in the Grid Background. it's unnoticeable in fullscreen (all of my refs did not have a grid background), but it subtle in other screens
- made the scroll field more easy to know/use
- added the ability to drag to scroll
- added the ability to export as a json file and import as a json file
- this was meant to be dev only but i do not tend on removing it now
- you can open them on notepad to see what they contain; it's the conversation/chat you've been making.
- added a cheeky warning below about Safari
- Apple, why.
- the name you typed before switching to Commander will now be persistent when you switch back
- fixed inconsistencies
- Commander's font is now always the Bold variant of Pretendard
- removed the weird letter spacing

**dialogue gen**
- added control type `Hide-Auto-Log-Cancel`
- added control type `Auto-Log-Cancel`

i unfortunately could not find a good fix for the Safari issue (text is offset vertically), but if i were to implement a fix, it would include manual user intervention; if yall want that, let me know.

it seems that Reddit has been using this as well! i posted some feature previews in there and it gained some attention. to the folks at the Official Reddit -- thank you. the shitposting has been indeed awesome.

<br>

---
<br>

## banger! `Dec 15, 2023`

**blabla gen**
Expand Down
Loading

0 comments on commit 3b48c5d

Please sign in to comment.