Skip to content

Commit

Permalink
Merge pull request #34 from ImCodist/master
Browse files Browse the repository at this point in the history
Basic Dialogue Support (Semi-Unfinished)
  • Loading branch information
Yoshubs authored Sep 26, 2021
2 parents fca5d98 + 830337e commit 8b43051
Show file tree
Hide file tree
Showing 32 changed files with 1,106 additions and 50 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
}

},
"haxe.enableExtendedIndentation": true
"haxe.enableExtendedIndentation": true,
"restructuredtext.confPath": "${workspaceFolder}\\docs"
}
15 changes: 14 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,23 @@
{
"type": "lime",
"command": "test",
"targetConfiguration": "Windows",
"group": {
"kind": "build",
"kind": "test",
"isDefault": true
}
},
{
"type": "lime",
"command": "test",
"targetConfiguration": "Windows",
"problemMatcher": [
"$haxe-absolute",
"$haxe",
"$haxe-error",
"$haxe-trace"
],
"label": "lime: test windows"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"position": [515, 370],
"textPos": [200, 480],
"scale": 5.4,
"antialiasing": false,
"singleFrame": true,
"doFlip": false,
"bgColor": [255, 255, 255],
"states": {
"normal": {
"open": ["Text Box Appear instance 1"],
"default": ["Text Box Appear instance 1"]
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="dialogueBox-pixel.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Text Box Appear instance 10000" x="0" y="0" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10001" x="259" y="0" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10002" x="0" y="154" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10003" x="259" y="154" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10004" x="259" y="154" width="249" height="144"/>
</TextureAtlas>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"position": [20, 370],
"states": {
"normal": {
"open": ["Speech Bubble Normal Open"],
"default": ["speech bubble normal", [-30, 0]]
},
"yell": {
"open": ["speech bubble loud open", [80, 140]],
"default": ["AHH speech bubble", [0, 80]]
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="speech_bubble_talking.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="AHH speech bubble0000" x="0" y="0" width="1231" height="408" frameX="-9" frameY="-5" frameWidth="1241" frameHeight="421"/>
<SubTexture name="AHH speech bubble0001" x="1241" y="0" width="1228" height="421" frameX="-9" frameY="0" frameWidth="1241" frameHeight="421"/>
<SubTexture name="AHH speech bubble0002" x="2479" y="0" width="1241" height="393" frameX="0" frameY="-15" frameWidth="1241" frameHeight="421"/>
<SubTexture name="Speech Bubble Normal Open0000" x="3730" y="0" width="40" height="118" frameX="-1005" frameY="0" frameWidth="1263" frameHeight="330"/>
<SubTexture name="Speech Bubble Normal Open0001" x="0" y="431" width="318" height="201" frameX="-822" frameY="-5" frameWidth="1263" frameHeight="330"/>
<SubTexture name="Speech Bubble Normal Open0002" x="328" y="431" width="835" height="283" frameX="-374" frameY="-4" frameWidth="1263" frameHeight="330"/>
<SubTexture name="Speech Bubble Normal Open0003" x="1173" y="431" width="1263" height="315" frameX="0" frameY="-15" frameWidth="1263" frameHeight="330"/>
<SubTexture name="Speech Bubble Normal Open0004" x="1173" y="431" width="1263" height="315" frameX="0" frameY="-15" frameWidth="1263" frameHeight="330"/>
<SubTexture name="speech bubble loud open0000" x="2446" y="431" width="335" height="295" frameX="-751" frameY="-105" frameWidth="1367" frameHeight="507"/>
<SubTexture name="speech bubble loud open0001" x="0" y="756" width="1367" height="507"/>
<SubTexture name="speech bubble loud open0002" x="0" y="756" width="1367" height="507"/>
<SubTexture name="speech bubble normal0000" x="1377" y="756" width="1162" height="328" frameX="0" frameY="0" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0001" x="1377" y="756" width="1162" height="328" frameX="0" frameY="0" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0002" x="1377" y="756" width="1162" height="328" frameX="0" frameY="0" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0003" x="1377" y="756" width="1162" height="328" frameX="0" frameY="0" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0004" x="1377" y="756" width="1162" height="328" frameX="0" frameY="0" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0005" x="2549" y="756" width="1160" height="318" frameX="-4" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0006" x="2549" y="756" width="1160" height="318" frameX="-4" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0007" x="2549" y="756" width="1160" height="318" frameX="-4" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0008" x="2549" y="756" width="1160" height="318" frameX="-4" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0009" x="2549" y="756" width="1160" height="318" frameX="-4" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0010" x="0" y="1273" width="1161" height="315" frameX="-6" frameY="-1" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0011" x="0" y="1273" width="1161" height="315" frameX="-6" frameY="-1" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0012" x="0" y="1273" width="1161" height="315" frameX="-6" frameY="-1" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0013" x="0" y="1273" width="1161" height="315" frameX="-6" frameY="-1" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0014" x="0" y="1273" width="1161" height="315" frameX="-6" frameY="-1" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0015" x="1171" y="1273" width="1156" height="311" frameX="-9" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0016" x="1171" y="1273" width="1156" height="311" frameX="-9" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0017" x="1171" y="1273" width="1156" height="311" frameX="-9" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0018" x="1171" y="1273" width="1156" height="311" frameX="-9" frameY="-5" frameWidth="1167" frameHeight="328"/>
<SubTexture name="speech bubble normal0019" x="1171" y="1273" width="1156" height="311" frameX="-9" frameY="-5" frameWidth="1167" frameHeight="328"/>
</TextureAtlas>
14 changes: 14 additions & 0 deletions assets/images/dialogue/portraits/bf-pixel/bf-pixel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "bf-pixel",
"expressions": {
"normal": "Boyfriend portrait enter"
},
"position": [630, 370],
"scale": 5.4,
"antialiasing": false,
"loop": false,

"sounds": ["pixelText"],
"soundChance": 100,
"soundPath": "sounds/"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/images/dialogue/portraits/bf-pixel/bf-pixel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="bf-pixel.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Boyfriend portrait enter0000" x="0" y="0" width="248" height="145" pivotX="2.9" pivotY="-201.75"/>
</TextureAtlas>
Binary file added assets/images/dialogue/portraits/bf/BF_1.ogg
Binary file not shown.
Binary file added assets/images/dialogue/portraits/bf/BF_2.ogg
Binary file not shown.
Binary file added assets/images/dialogue/portraits/bf/BF_3.ogg
Binary file not shown.
11 changes: 11 additions & 0 deletions assets/images/dialogue/portraits/bf/bf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "bf",
"expressions": {
"normal": "Normal Talk",
"mad": "Angry Talk",
"smug": "Smug Talk"
},
"position": "right",

"sounds": ["BF_1", "BF_2", "BF_3"]
}
Binary file added assets/images/dialogue/portraits/bf/bf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions assets/images/dialogue/portraits/bf/bf.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="bf.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Angry Talk0000" x="0" y="0" width="410" height="424" pivotX="206.15" pivotY="217.35"/>
<SubTexture name="Angry Talk0001" x="430" y="0" width="410" height="424"/>
<SubTexture name="Angry Talk0002" x="860" y="0" width="410" height="424"/>
<SubTexture name="Angry Talk0003" x="860" y="0" width="410" height="424"/>
<SubTexture name="Angry Talk0004" x="1290" y="0" width="410" height="424"/>
<SubTexture name="Angry Talk0005" x="1290" y="0" width="410" height="424"/>
<SubTexture name="Angry Talk0006" x="0" y="444" width="410" height="424"/>
<SubTexture name="Angry Talk0007" x="0" y="444" width="410" height="424"/>
<SubTexture name="Normal Talk0000" x="430" y="444" width="410" height="423" pivotX="206.25" pivotY="216.15"/>
<SubTexture name="Normal Talk0001" x="860" y="444" width="410" height="423"/>
<SubTexture name="Normal Talk0002" x="1290" y="444" width="410" height="423"/>
<SubTexture name="Normal Talk0003" x="1290" y="444" width="410" height="423"/>
<SubTexture name="Normal Talk0004" x="0" y="888" width="410" height="423"/>
<SubTexture name="Normal Talk0005" x="0" y="888" width="410" height="423"/>
<SubTexture name="Normal Talk0006" x="430" y="888" width="410" height="423"/>
<SubTexture name="Normal Talk0007" x="430" y="888" width="410" height="423"/>
<SubTexture name="Smug Talk0000" x="860" y="888" width="409" height="421" pivotX="205.45" pivotY="214.6"/>
<SubTexture name="Smug Talk0001" x="1289" y="888" width="409" height="421"/>
<SubTexture name="Smug Talk0002" x="0" y="1331" width="409" height="421"/>
<SubTexture name="Smug Talk0003" x="0" y="1331" width="409" height="421"/>
<SubTexture name="Smug Talk0004" x="429" y="1331" width="409" height="421"/>
<SubTexture name="Smug Talk0005" x="429" y="1331" width="409" height="421"/>
<SubTexture name="Smug Talk0006" x="858" y="1331" width="409" height="421"/>
<SubTexture name="Smug Talk0007" x="858" y="1331" width="409" height="421"/>
</TextureAtlas>
16 changes: 16 additions & 0 deletions assets/images/dialogue/portraits/senpai/senpai.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "senpai",
"expressions": {
"normal": "Senpai Portrait Enter",
"mad": "SENPAI ANGRY IMPACT SPEECH"
},
"position": [420, 370],
"scale": 5.4,
"flipX": true,
"antialiasing": false,
"loop": false,

"sounds": ["pixelText"],
"soundChance": 100,
"soundPath": "sounds/"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/images/dialogue/portraits/senpai/senpai.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="senpai.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="SENPAI ANGRY IMPACT SPEECH0000" x="0" y="0" width="248" height="144" pivotX="257" pivotY="179"/>
<SubTexture name="Senpai Portrait Enter0000" x="0" y="164" width="248" height="144" pivotX="244" pivotY="-301"/>
</TextureAtlas>
58 changes: 58 additions & 0 deletions assets/songs/dadbattle/dialogue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"box": "speech_bubble_talking",
"boxState": "normal",
"dialogue": [
{
"portrait": "kade",
"expression": "normal",
"text": "I have no idea what Psych engine is."
},
{
"portrait": "bf2",
"text": "vine boom"
},
{
"portrait": "kade",
"text": "I really wish I didn't make engines.\nBecause I made fucking the worse\ndecision of my life."
},
{
"text": "Because all these engines either\nfucking suck."
},
{
"portrait": "bf2",
"text": "vine boom"
},
{
"portrait": "kade",
"text": "They copy me."
},
{
"portrait": "bf2",
"text": "vine boom"
},
{
"portrait": "kade",
"text": "Or they copy somebody else."
},
{
"portrait": "bf2",
"text": "vine boom"
},
{
"portrait": "kade",
"text": "Nobodys original."
},
{
"portrait": "bf2",
"text": "vine boom"
},
{
"portrait": "kade",
"text": "Its fucking really stupid."
},
{
"portrait": "bf2",
"text": "kade\nwtf dude"
}
]
}
18 changes: 18 additions & 0 deletions assets/songs/senpai/dialogue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"box": "dialogueBox-pixel",
"boxState": "normal",
"dialogue": [
{
"portrait": "senpai",
"expression": "normal",
"text": "Ah, a new fair maiden has come in search of true love!"
},
{
"text": "A serenade between gentlemen shall decide where her beautiful heart shall reside."
},
{
"portrait": "bf-pixel",
"text": "Beep bo bop"
}
]
}
68 changes: 68 additions & 0 deletions assets/songs/test/dialogue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"box": "speech_bubble_talking",
"boxState": "normal",
"dialogue": [
{
"portrait": "bf",
"expression": "normal",
"text": "hey"
},
{
"portrait": "bf",
"expression": "normal",
"text": "do you know sawcon"
},
{
"portrait": "bf",
"expression": "normal",
"text": "whats sawcon lmao"
},
{
"portrait": "bf",
"expression": "smug",
"text": "sawcon deez nuts"
},
{
"portrait": "bf",
"expression": "smug",
"text": "idiot"
},
{
"portrait": "bf",
"expression": "mad",
"text": "I fucking hate you."
},
{
"portrait": "bf-pixel",
"expression": "normal",
"text": "I am going to kick your ass.",
"boxState": "yell",
"scale": 1.4
},
{
"portrait": "bf",
"expression": "mad",
"text": "Bet.",
"boxState": "normal",
"scale": 0.8
},
{
"portrait": "bf",
"expression": "smug",
"text": "'lololololololol' .'`?!\nline break test.`?!\ncool",
"speed": 10
},
{
"portrait": "bf",
"expression": "mad",
"text": "Shut the fuck up...\nShut the fuck up...... !!'? .''?!",
"boxState": "yell",
"speed": 0.5
},
{
"portrait": "bf",
"expression": "mad",
"text": "Seriously!\nI cant believe I hate you!"
}
]
}
1 change: 1 addition & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ We hope you learn something new!
:caption: Tutorials

tutorials/1-getting-started
tutorials/dialogue


.. Indices and tables
Expand Down
Loading

0 comments on commit 8b43051

Please sign in to comment.