134 core/bin/snow_map2.tmx
View file
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="right-down" width="38" height="24" tilewidth="32" tileheight="32" nextobjectid="14">
<tileset firstgid="1" name="snow_on_stones" tilewidth="32" tileheight="32" tilecount="80" columns="10">
<image source="snow text/snow_on_stones.png" width="320" height="256"/>
<terraintypes>
<terrain name="wall" tile="-1"/>
</terraintypes>
<tile id="2" terrain=",,,0"/>
<tile id="3" terrain=",,0,0"/>
<tile id="4" terrain=",,0,0"/>
<tile id="5" terrain=",,0,0"/>
<tile id="6" terrain=",,0,0"/>
<tile id="7" terrain=",,0,0"/>
<tile id="8" terrain=",,0,0"/>
<tile id="9" terrain=",,0,"/>
<tile id="12" terrain=",0,,0"/>
<tile id="13" terrain="0,0,0,"/>
<tile id="14" terrain="0,0,,"/>
<tile id="15" terrain="0,0,,"/>
<tile id="16" terrain="0,0,,"/>
<tile id="17" terrain="0,0,,"/>
<tile id="18" terrain="0,0,,0"/>
<tile id="19" terrain="0,,0,"/>
<tile id="22" terrain=",0,,0"/>
<tile id="23" terrain="0,,0,"/>
<tile id="28" terrain=",0,,0"/>
<tile id="29" terrain="0,,0,"/>
<tile id="32" terrain=",0,,0"/>
<tile id="33" terrain="0,,0,"/>
<tile id="38" terrain=",0,,0"/>
<tile id="39" terrain="0,,0,"/>
<tile id="42" terrain=",0,,0"/>
<tile id="43" terrain="0,,0,"/>
<tile id="48" terrain=",0,,0"/>
<tile id="49" terrain="0,,0,"/>
<tile id="52" terrain=",0,,0"/>
<tile id="53" terrain="0,,0,"/>
<tile id="58" terrain=",0,,0"/>
<tile id="59" terrain="0,,0,"/>
<tile id="62" terrain=",0,,0"/>
<tile id="63" terrain="0,,0,0"/>
<tile id="64" terrain=",,0,0"/>
<tile id="65" terrain=",,0,0"/>
<tile id="66" terrain=",,0,0"/>
<tile id="67" terrain=",,0,0"/>
<tile id="68" terrain=",0,0,0"/>
<tile id="69" terrain="0,,0,"/>
<tile id="72" terrain=",0,,"/>
<tile id="73" terrain="0,0,,"/>
<tile id="74" terrain="0,0,,"/>
<tile id="75" terrain="0,0,,"/>
<tile id="76" terrain="0,0,,"/>
<tile id="77" terrain="0,0,,"/>
<tile id="78" terrain="0,0,,"/>
<tile id="79" terrain="0,,,"/>
</tileset>
<tileset firstgid="81" name="full_ladder" tilewidth="32" tileheight="32" tilecount="8" columns="2">
<image source="snow text/full_ladder.png" width="64" height="128"/>
</tileset>
<tileset firstgid="89" name="ladder" tilewidth="32" tileheight="32" tilecount="8" columns="2">
<image source="snow text/ladder.png" width="64" height="128"/>
</tileset>
<layer name="foundation and walls" width="38" height="24">
<data encoding="csv">
1,1,1,28,29,30,21,22,21,22,53,54,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,29,30,21,22,23,24,2,1,2,
11,11,11,1,29,30,31,32,31,32,23,24,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,39,40,21,22,33,34,12,11,12,
11,11,12,11,39,40,21,22,21,22,33,34,2,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,29,30,21,22,23,24,2,1,2,
65,65,1,2,49,50,31,32,31,32,43,44,12,28,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,39,40,21,22,33,34,12,11,12,
1,1,2,2,59,60,21,22,21,22,53,54,2,38,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,49,50,21,22,43,44,2,1,2,
1,1,2,2,45,46,5,6,7,8,47,48,12,24,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,59,60,31,32,53,54,12,11,12,
1,1,2,2,55,56,15,16,17,18,57,58,12,34,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,45,46,5,6,47,48,2,1,2,
1,1,1,1,2,12,12,12,1,11,12,11,12,44,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,55,56,15,16,57,58,12,11,12,
1,11,11,11,1,2,12,12,11,11,12,11,12,24,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,
11,11,12,12,11,12,2,12,11,12,11,12,12,34,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,
1,1,1,2,11,12,12,11,11,12,11,12,12,44,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,
1,11,1,1,11,12,2,11,11,11,12,11,12,54,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,
65,66,67,68,65,66,65,66,67,68,27,28,12,48,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,25,26,65,66,27,28,2,1,2,
75,76,77,78,75,76,75,76,77,78,37,38,1,1,1,2,11,12,11,12,11,12,11,12,11,12,11,12,11,35,36,75,76,37,38,12,11,12,
21,21,21,21,21,21,21,21,21,22,23,11,11,11,11,12,1,2,1,2,1,2,1,2,1,2,1,2,1,29,30,21,22,23,24,2,1,2,
31,31,31,31,31,31,31,31,21,22,33,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,39,40,31,32,33,34,12,11,12,
21,22,21,22,21,21,21,21,21,22,43,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,49,50,31,32,43,44,2,1,2,
31,32,31,32,31,32,31,32,21,22,53,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,12,11,59,60,31,32,53,54,12,11,12,
21,22,21,22,22,21,22,22,21,22,23,1,1,1,2,2,1,2,1,2,1,2,1,2,1,2,1,2,1,49,50,31,32,43,44,2,1,2,
31,32,31,31,32,22,21,21,21,22,33,11,11,11,12,12,11,12,11,12,11,12,11,12,11,12,11,12,11,59,60,31,32,53,54,12,11,12,
21,22,21,21,31,32,31,21,22,22,23,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,29,30,31,32,23,24,2,2,2,
21,32,31,31,32,31,32,21,21,22,33,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,39,40,31,32,33,34,12,12,12,
31,22,21,22,21,22,21,21,31,32,43,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,49,50,31,32,43,44,11,12,2,
21,22,31,21,22,21,22,31,31,32,53,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,59,60,31,32,53,54,12,12,12
</data>
</layer>
<layer name="ladder" width="38" height="24">
<data encoding="csv">
0,81,82,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,83,84,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,85,86,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,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,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,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,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,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,89,90,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,91,92,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,93,94,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,95,96,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
</data>
</layer>
<objectgroup name="collision" offsetx="-1" offsety="-1">
<object id="1" x="-1" y="419" width="351" height="349"/>
<object id="2" x="163" y="6" width="186" height="191"/>
<object id="3" x="961" y="0" width="121" height="219"/>
<object id="4" x="966" y="417" width="113" height="348"/>
<object id="5" x="44" y="0" width="38" height="84"/>
</objectgroup>
<objectgroup name="start_end">
<object id="10" x="35" y="103" width="55" height="55">
<ellipse/>
</object>
<object id="12" x="1135" y="643">
<polygon points="0,0 54,86 -11,89"/>
</object>
</objectgroup>
</map>
20 core/src/com/mygdx/game/GameScreen.java
View file
@@ -573,7 +573,7 @@ public void gameUpdate() {
// }

private boolean collidesWithMap() {
boolean result = false;
boolean result = false;
for (int x = 0; x < collisionArray.size(); x++) {
if (interp.overlaps(collisionArray.get(x))) {
result = true;
@@ -582,24 +582,6 @@ private boolean collidesWithMap() {
}
return result;
}
<<<<<<< HEAD

=======

// wtf david
// private boolean collidesWithMap() {
// boolean result = false;
// if (!interp.overlaps(collide) && !interp.overlaps(collideBoulder))
// return false;
// for (int x = 0; x < collisionArray.size(); x++) {
// if (interp.overlaps(collisionArray.get(x))) {
// result = true;
// break;
// }
// }
// return result;
// }
>>>>>>> origin/master

private void priorityDraw() {
if (direction.equals("up"))
8 core/src/com/mygdx/game/SplashScreen.java
View file
@@ -61,7 +61,7 @@ public void show() {
splashTitleSprite = new Sprite(splashTitle);
splashTitleSprite.setPosition(0f, 768 - splashTitleSprite.getHeight());

roll = new Texture("roll_left.png");
roll = new Texture("roll_right.png");
walk = new Texture("left_walk.png");

TextureRegion[][] temp_left = TextureRegion.split(walk, 32, 64);
@@ -80,11 +80,9 @@ public void show() {
}

walkAnim = new Animation(0.15f, framesWalk);
<<<<<<< HEAD

rollAnim = new Animation(0.08f, framesRoll);
=======
rollAnim = new Animation(0.10f, framesRoll);
>>>>>>> origin/master


Tween.set(splashTitleSprite, SpriteManager.ALPHA).target(0f).start(tweenManager);
Tween.to(splashTitleSprite, SpriteManager.ALPHA, 2f).target(1f).repeatYoyo(1, 4f)
2 desktop/.classpath
View file
@@ -7,6 +7,6 @@
</classpathentry>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry combineaccessrules="false" kind="src" path="/my-gdx-game-core"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/my-gdx-game-core"/>
<classpathentry kind="output" path="bin"/>
</classpath>
5 desktop/.project
View file
@@ -26,6 +26,11 @@
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/core/assets</locationURI>
</link>
<link>
<name>assets_</name>
<type>2</type>
<locationURI>PARENT-1-PROJECT_LOC/core/assets</locationURI>
</link>
</linkedResources>
<filteredResources>
<filter>