Couple updates to proedge dungeon and new 99 dungeon song

This commit is contained in:
Brian Fertig 2025-08-04 07:10:49 -06:00
parent 85e6ccee0b
commit 238df24684
8 changed files with 52 additions and 72 deletions

View File

@ -1,55 +1,35 @@
[chorus]
oooooh that ninety nine, oooooh that ninety nine,
oooooh that ninety nine, oooooh that ninety nine,
banana on my mind, banana on my mind,
I love that ninety nine I love that ninety nine
[verse]
ninety nine grape or pina colada ninety nine grape or pina colada
I want to drink a whole lotta I want to drink a whole lotta
pineapple is oh so fine pineapple is oh so fine
Just give me more ninety nine Just give me more ninety nine
[chorus]
oooooh that ninety nine, oooooh that ninety nine,
oooooh that ninety nine, oooooh that ninety nine,
banana on my mind, banana on my mind,
I love that ninety nine I love that ninety nine
[verse]
No need to for a mixer No need to for a mixer
I just need a good fixer I just need a good fixer
It tastes like turpentine It tastes like turpentine
But I love that ninety nine But I love that ninety nine
[bridge]
oooooh that ninety nine, oooooh that ninety nine,
oooooh that ninety nine, oooooh that ninety nine,
banana on my mind, banana on my mind,
I love that ninety nine I love that ninety nine
[chorus]
oooooh that ninety nine, oooooh that ninety nine,
oooooh that ninety nine, oooooh that ninety nine,
banana on my mind, banana on my mind,
I love that ninety nine I love that ninety nine

Binary file not shown.

BIN
assets/music/99Dungeon4.mp3 Normal file

Binary file not shown.

BIN
assets/music/cutscene-1.mp3 Normal file

Binary file not shown.

BIN
assets/music/that-99.mp3 Normal file

Binary file not shown.

View File

@ -330,13 +330,13 @@
"data":[0, 2147483678, 2147483677, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354584, "data":[0, 2147483678, 2147483677, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2684354584,
0, 0, 0, 0, 1073741828, 1073741829, 0, 0, 0, 0, 1073741828, 1073741829, 0, 0, 0, 0, 0, 0, 0, 0, 1073741828, 1073741829, 0, 0, 0, 0, 1073741828, 1073741829, 0, 0, 0, 0,
0, 0, 4, 5, 0, 0, 0, 14, 15, 0, 0, 0, 4, 5, 0, 0, 0, 0, 4, 5, 0, 0, 0, 14, 15, 0, 0, 0, 4, 5, 0, 0,
0, 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 40, 28, 28, 40, 0, 0, 0, 9, 10, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 20, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0,
0, 0, 3221225477, 3221225476, 0, 0, 0, 3221225487, 3221225486, 0, 0, 0, 3221225477, 3221225476, 0, 0, 0, 0, 3221225477, 3221225476, 0, 0, 0, 3221225487, 3221225486, 0, 0, 0, 3221225477, 3221225476, 0, 0,
0, 0, 56, 37, 38, 39, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 37, 38, 39, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 66, 47, 48, 49, 66, 0, 0, 0, 57, 58, 59, 0, 0, 0, 0, 0, 66, 47, 48, 49, 66, 0, 0, 0, 57, 58, 59, 0, 0, 0,
@ -876,29 +876,6 @@
"x":4400, "x":4400,
"y":1200 "y":1200
}, },
{
"gid":111,
"height":100,
"id":8,
"name":"",
"properties":[
{
"name":"follow",
"type":"bool",
"value":true
},
{
"name":"speed",
"type":"int",
"value":300
}],
"rotation":0,
"type":"",
"visible":true,
"width":100,
"x":2774,
"y":2070
},
{ {
"gid":111, "gid":111,
"height":100, "height":100,
@ -1110,8 +1087,7 @@
"width":100, "width":100,
"x":300, "x":300,
"y":2500 "y":2500
}, },
{ {
"gid":109, "gid":109,
"height":100, "height":100,
@ -1139,7 +1115,8 @@
"width":100, "width":100,
"x":1300, "x":1300,
"y":3000 "y":3000
}, },
{ {
"gid":105, "gid":105,
"height":100, "height":100,
@ -1335,6 +1312,29 @@
"width":200, "width":200,
"x":4400, "x":4400,
"y":5250 "y":5250
},
{
"gid":111,
"height":100,
"id":36,
"name":"",
"properties":[
{
"name":"follow",
"type":"bool",
"value":true
},
{
"name":"speed",
"type":"int",
"value":300
}],
"rotation":0,
"type":"",
"visible":true,
"width":100,
"x":1782,
"y":2470
}], }],
"opacity":1, "opacity":1,
"type":"objectgroup", "type":"objectgroup",
@ -1343,7 +1343,7 @@
"y":0 "y":0
}], }],
"nextlayerid":6, "nextlayerid":6,
"nextobjectid":36, "nextobjectid":37,
"orientation":"orthogonal", "orientation":"orthogonal",
"renderorder":"right-down", "renderorder":"right-down",
"tiledversion":"1.11.2", "tiledversion":"1.11.2",

View File

@ -69,11 +69,11 @@
5, 5,
3 3
], ],
"scale": 0.5, "scale": 0.25,
"selectedLayer": 4, "selectedLayer": 1,
"viewCenter": { "viewCenter": {
"x": 2421, "x": 2102,
"y": 3199 "y": 1600
} }
}, },
"proedge.tmx#boss-tiles": { "proedge.tmx#boss-tiles": {

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="16" height="9" tilewidth="100" tileheight="100" infinite="1" nextlayerid="6" nextobjectid="36"> <map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="16" height="9" tilewidth="100" tileheight="100" infinite="1" nextlayerid="6" nextobjectid="37">
<editorsettings> <editorsettings>
<export target="../assets/proedge.json" format="json"/> <export target="../assets/proedge.json" format="json"/>
</editorsettings> </editorsettings>
@ -484,13 +484,13 @@
0,2147483678,2147483677,0,0,0,0,0,0,0,0,0,0,0,0,2684354584, 0,2147483678,2147483677,0,0,0,0,0,0,0,0,0,0,0,0,2684354584,
0,0,0,0,1073741828,1073741829,0,0,0,0,1073741828,1073741829,0,0,0,0, 0,0,0,0,1073741828,1073741829,0,0,0,0,1073741828,1073741829,0,0,0,0,
0,0,4,5,0,0,0,14,15,0,0,0,4,5,0,0, 0,0,4,5,0,0,0,14,15,0,0,0,4,5,0,0,
0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,27,0,40,28,28,40,0,0,0,9,10,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,19,20,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,29,30,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,40,0,0,0,0,0,27,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,
0,0,3221225477,3221225476,0,0,0,3221225487,3221225486,0,0,0,3221225477,3221225476,0,0, 0,0,3221225477,3221225476,0,0,0,3221225487,3221225486,0,0,0,3221225477,3221225476,0,0,
0,0,56,37,38,39,56,0,0,0,0,0,0,0,0,0, 0,0,56,37,38,39,56,0,0,0,0,0,0,0,0,0,
0,0,66,47,48,49,66,0,0,0,57,58,59,0,0,0, 0,0,66,47,48,49,66,0,0,0,57,58,59,0,0,0,
@ -813,12 +813,6 @@
<property name="patrolY" type="int" value="500"/> <property name="patrolY" type="int" value="500"/>
</properties> </properties>
</object> </object>
<object id="8" gid="111" x="2774" y="2070" width="100" height="100">
<properties>
<property name="follow" type="bool" value="true"/>
<property name="speed" type="int" value="300"/>
</properties>
</object>
<object id="9" gid="111" x="2146" y="2142" width="100" height="100"> <object id="9" gid="111" x="2146" y="2142" width="100" height="100">
<properties> <properties>
<property name="follow" type="bool" value="true"/> <property name="follow" type="bool" value="true"/>
@ -930,5 +924,11 @@
<property name="patrolX" type="int" value="-1000"/> <property name="patrolX" type="int" value="-1000"/>
</properties> </properties>
</object> </object>
<object id="36" gid="111" x="1782" y="2470" width="100" height="100">
<properties>
<property name="follow" type="bool" value="true"/>
<property name="speed" type="int" value="300"/>
</properties>
</object>
</objectgroup> </objectgroup>
</map> </map>