Skip to content

Commit

Permalink
Alpha Build
Browse files Browse the repository at this point in the history 
- renamed several refrences in assets.json due to .PNG ending being significant in reading the image files
- rebuilt jar
  • Loading branch information
@JacobSeto
JacobSeto committed Apr 14, 2024
1 parent 151dbc8 commit 9611c66
Show file tree
Hide file tree
Showing 81 changed files with 3,186 additions and 41 deletions.
28 changes: 14 additions & 14 deletions assets/assets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
"wrapU": "repeated",
"wrapV": "repeated"
},
"world:platforms:weightedSynth" : "world/platforms/synthPlat.png",
"world:platforms:weightedSynth" : "world/platforms/synthPlat.PNG",

"world:platforms:weightedJazz" : "world/platforms/jazzPlat.png",
"world:platforms:weightedJazz" : "world/platforms/jazzPlat.PNG",

"world:platforms:movingSynth" : "world/platforms/synthPlat.png",
"world:platforms:movingSynth" : "world/platforms/synthPlat.PNG",

"world:platforms:movingJazz" : "world/platforms/jazzPlat.png",
"world:platforms:movingJazz" : "world/platforms/jazzPlat.PNG",

"world:platforms:platform" : "world/platforms/platform.png",
"world:platforms:platform" : "world/platforms/platform.PNG",

"world:platforms:platformArt" : "world/platforms/purplePlatArt.png",

"world:platforms:longPlatform:left" : "world/platforms/longPlatform/left.png",
"world:platforms:longPlatform:left" : "world/platforms/longPlatform/left.PNG",

"world:platforms:longPlatform:mid" : "world/platforms/longPlatform/mid.png",
"world:platforms:longPlatform:mid" : "world/platforms/longPlatform/mid.PNG",

"world:platforms:longPlatform:right" : "world/platforms/longPlatform/right.png",
"world:platforms:longPlatform:right" : "world/platforms/longPlatform/right.PNG",

"world:platforms:endPlatform" : "world/platforms/endPlatform.png",

Expand Down Expand Up @@ -98,19 +98,19 @@

"world:pipes:bigpipetv" : "world/pipes/bigpipetv.png",

"world:pipes:pipeleftskinny" : "world/pipes/pipeleftskinny.png",
"world:pipes:pipeleftskinny" : "world/pipes/pipeleftskinny.PNG",

"world:pipes:pipeposter" : "world/pipes/pipeposter.png",
"world:pipes:pipeposter" : "world/pipes/pipeposter.PNG",

"world:pipes:piperight" : "world/pipes/piperight.png",
"world:pipes:piperight" : "world/pipes/piperight.PNG",

"world:pipes:piperightskinny" : "world/pipes/piperightskinny.png",
"world:pipes:piperightskinny" : "world/pipes/piperightskinny.PNG",

"world:pipes:pipestraight" : "world/pipes/pipestraight.png",
"world:pipes:pipestraight" : "world/pipes/pipestraight.PNG",

"world:pipes:pipestraightskinny" : "world/pipes/pipestraightskinny.png",

"world:pipes:bgpipe" : "world/pipes/bgpipe.png",
"world:pipes:bgpipe" : "world/pipes/bigpipe.png",

"world:wires:bigwire" : "world/wires/bigwire.png",

Expand Down
Binary file modified assets/world/platforms/synthPlat.PNG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
124 changes: 124 additions & 0 deletions desktop/out/production/resources/Tiled/Images.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="Images" tilewidth="6464" tileheight="1088" tilecount="40" columns="0">
<grid orientation="orthogonal" width="1" height="1"/>
<tile id="2">
<image width="64" height="123" source="playerTile.png"/>
</tile>
<tile id="6">
<image width="120" height="120" source="../world/platforms/blackTile.png"/>
</tile>
<tile id="7">
<image width="128" height="130" source="../world/checkpoints/checkActive.png"/>
</tile>
<tile id="8">
<image width="256" height="181" source="bearTile.png"/>
</tile>
<tile id="12">
<image width="128" height="130" source="../world/goal.png"/>
</tile>
<tile id="13">
<image width="224" height="224" source="../enemies/beehive.png"/>
</tile>
<tile id="14">
<image width="256" height="256" source="../world/pods/bearpod1.png"/>
</tile>
<tile id="15">
<image width="256" height="256" source="../world/pods/bearpod2.png"/>
</tile>
<tile id="16">
<image width="224" height="224" source="../enemies/beehive.png"/>
</tile>
<tile id="17">
<image width="256" height="256" source="../world/pods/bgpod1.png"/>
</tile>
<tile id="18">
<image width="256" height="256" source="../world/pods/bgpod2.png"/>
</tile>
<tile id="19">
<image width="256" height="256" source="../world/pods/dolpod1.png"/>
</tile>
<tile id="20">
<image width="256" height="256" source="../world/pods/dolpod2.png"/>
</tile>
<tile id="21">
<image width="256" height="256" source="../world/pods/emptypod1.png"/>
</tile>
<tile id="22">
<image width="256" height="256" source="../world/pods/emptypod2.png"/>
</tile>
<tile id="23">
<image width="256" height="256" source="../world/pods/emptypod3.png"/>
</tile>
<tile id="24">
<image width="256" height="256" source="../world/pods/emptypod4.png"/>
</tile>
<tile id="25">
<image width="256" height="256" source="../world/pods/emptypod5.png"/>
</tile>
<tile id="26">
<image width="192" height="192" source="../world/other/light.png"/>
</tile>
<tile id="27">
<image width="256" height="256" source="../world/pods/octpod1.png"/>
</tile>
<tile id="28">
<image width="256" height="256" source="../world/shelves/shelf1.png"/>
</tile>
<tile id="29">
<image width="256" height="256" source="../world/shelves/shelf2.png"/>
</tile>
<tile id="30">
<image width="256" height="256" source="../world/shelves/shelf3.png"/>
</tile>
<tile id="31">
<image width="256" height="256" source="../world/shelves/shelf4.png"/>
</tile>
<tile id="32">
<image width="256" height="256" source="../world/shelves/shelf5.png"/>
</tile>
<tile id="33">
<image width="256" height="256" source="../world/pods/wolfpod1.png"/>
</tile>
<tile id="34">
<image width="256" height="256" source="../world/pods/wolfpod2.png"/>
</tile>
<tile id="37">
<image width="320" height="320" source="../world/pipes/bgpipe.PNG"/>
</tile>
<tile id="38">
<image width="1024" height="1024" source="../world/pipes/bigpipe.png"/>
</tile>
<tile id="39">
<image width="1024" height="1024" source="../world/pipes/bigpipetv.png"/>
</tile>
<tile id="41">
<image width="320" height="320" source="../world/pipes/pipeleftskinny.PNG"/>
</tile>
<tile id="42">
<image width="320" height="320" source="../world/pipes/pipeposter.PNG"/>
</tile>
<tile id="43">
<image width="320" height="320" source="../world/pipes/piperight.PNG"/>
</tile>
<tile id="44">
<image width="320" height="320" source="../world/pipes/piperightskinny.PNG"/>
</tile>
<tile id="45">
<image width="320" height="320" source="../world/pipes/pipestraight.PNG"/>
</tile>
<tile id="46">
<image width="320" height="320" source="../world/pipes/pipestraightskinny.png"/>
</tile>
<tile id="47">
<image width="6464" height="1088" source="../backgrounds/background.png"/>
</tile>
<tile id="50">
<image width="875" height="128" source="../world/wires/wires1.PNG"/>
</tile>
<tile id="54">
<image width="875" height="128" source="../world/wires/wires2.PNG"/>
</tile>
<tile id="55">
<image width="895" height="256" source="../world/wires/bigwire.png"/>
</tile>
</tileset>
Binary file added desktop/out/production/resources/Tiled/bearTile.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions desktop/out/production/resources/Tiled/platforms.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="platforms" tilewidth="192" tileheight="64" tilecount="12" columns="0">
<grid orientation="orthogonal" width="1" height="1"/>
<tile id="9">
<image width="128" height="64" source="../world/platforms/jazzLongPlatform/jazzleft.PNG"/>
</tile>
<tile id="10">
<image width="128" height="64" source="../world/platforms/jazzLongPlatform/jazzmid.PNG"/>
</tile>
<tile id="11">
<image width="128" height="64" source="../world/platforms/jazzLongPlatform/jazzright.PNG"/>
</tile>
<tile id="12">
<image width="192" height="64" source="../world/platforms/jazzPlat.PNG"/>
</tile>
<tile id="13">
<image width="192" height="64" source="../world/platforms/platform.PNG"/>
</tile>
<tile id="14">
<image width="128" height="64" source="../world/platforms/synthLongPlatform/synthleft.PNG"/>
</tile>
<tile id="15">
<image width="128" height="64" source="../world/platforms/synthLongPlatform/synthmid.PNG"/>
</tile>
<tile id="16">
<image width="128" height="64" source="../world/platforms/synthLongPlatform/synthright.PNG"/>
</tile>
<tile id="17">
<image width="192" height="64" source="../world/platforms/synthPlat.PNG"/>
</tile>
<tile id="20">
<image width="128" height="64" source="../world/platforms/longPlatform/left.PNG"/>
</tile>
<tile id="21">
<image width="128" height="64" source="../world/platforms/longPlatform/mid.PNG"/>
</tile>
<tile id="22">
<image width="128" height="64" source="../world/platforms/longPlatform/right.PNG"/>
</tile>
</tileset>
Binary file added desktop/out/production/resources/Tiled/playerTile.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9611c66

Please sign in to comment.