Clean sh does not wipe your classes

Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
main
unknown 2 years ago
parent 0fc9aee919
commit e1aa57b7f1
  1. 2
      Java/scripts/build.sh
  2. 2
      Java/scripts/build2.sh
  3. BIN
      bin/sig/DrawLoop.class
  4. BIN
      bin/sig/RabiClone.class
  5. BIN
      bin/sig/engine/Action.class
  6. BIN
      bin/sig/engine/Alpha.class
  7. BIN
      bin/sig/engine/AnimatedObject.class
  8. BIN
      bin/sig/engine/AnimatedSprite.class
  9. BIN
      bin/sig/engine/Color.class
  10. BIN
      bin/sig/engine/Edge.class
  11. BIN
      bin/sig/engine/Font.class
  12. BIN
      bin/sig/engine/GameEntity.class
  13. BIN
      bin/sig/engine/Key.class
  14. BIN
      bin/sig/engine/KeyBind.class
  15. BIN
      bin/sig/engine/MouseScrollValue.class
  16. BIN
      bin/sig/engine/Object.class
  17. BIN
      bin/sig/engine/PaletteColor.class
  18. BIN
      bin/sig/engine/Panel$1.class
  19. BIN
      bin/sig/engine/Panel$2.class
  20. BIN
      bin/sig/engine/Panel$3.class
  21. BIN
      bin/sig/engine/Panel.class
  22. BIN
      bin/sig/engine/Point.class
  23. BIN
      bin/sig/engine/Rectangle.class
  24. BIN
      bin/sig/engine/Sprite.class
  25. BIN
      bin/sig/engine/String.class
  26. BIN
      bin/sig/engine/Transform.class
  27. BIN
      bin/sig/map/Background.class
  28. BIN
      bin/sig/map/CollisionType.class
  29. BIN
      bin/sig/map/Map.class
  30. BIN
      bin/sig/map/Maps.class
  31. BIN
      bin/sig/map/Tile.class
  32. BIN
      bin/sig/map/Type.class
  33. BIN
      bin/sig/map/View.class
  34. BIN
      bin/sig/objects/ConfigureControls.class
  35. BIN
      bin/sig/objects/EditorRenderer$1.class
  36. BIN
      bin/sig/objects/EditorRenderer.class
  37. BIN
      bin/sig/objects/LevelRenderer.class
  38. BIN
      bin/sig/objects/Player$1.class
  39. BIN
      bin/sig/objects/Player.class
  40. BIN
      bin/sig/objects/actor/State.class
  41. BIN
      bin/sig/utils/TimeUtils.class
  42. 1
      manifest
  43. BIN
      maps/world1.map
  44. 38
      src/sig/objects/Player.java

@ -6,4 +6,4 @@ printf "\n\n\nRunning Program...\n\n"
ORIGINAL_LOC=$(pwd)
cd $OUT_DIR
java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@"
#${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh
${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh

@ -6,4 +6,4 @@ printf "\n\n\nRunning Program...\n\n"
ORIGINAL_LOC=$(pwd)
cd $OUT_DIR
java ${CUSTOM_PARAMS} -cp ".;../lib/bin/ " "-Djava.library.path=${LIBRARY_PATH}" ${MAIN_CLASS} "$@"
#${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh
${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -1 +0,0 @@
Main-Class: sig.RabiClone

Binary file not shown.

@ -375,8 +375,7 @@ public class Player extends AnimatedObject{
if(checked_tile_top_right.getCollision()==CollisionType.BLOCK||checked_tile_top_left.getCollision()==CollisionType.BLOCK){
//System.out.println(checked_tile_top_right.getCollision()+"//"+checked_tile_top_left.getCollision());
if(checked_tile_bottom_center.getCollision()==CollisionType.SLOPE){
}else{
} else {
if (checked_tile_top_right.getCollision()==CollisionType.BLOCK) {
setX(((int)(getX()-getAnimatedSpr().getWidth()/2)/Tile.TILE_WIDTH)*Tile.TILE_WIDTH+Tile.TILE_WIDTH/2+3+check_distance_x);
} else {
@ -399,7 +398,7 @@ public class Player extends AnimatedObject{
groundCollision=false;
} else {
if(checked_tile_bottom_center.getCollision()==CollisionType.SLOPE){
setY(-(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4));
moveUpSlope(checked_tile_bottom_center);
}
groundCollision=true;
jumpCount=maxJumpCount;
@ -414,9 +413,9 @@ public class Player extends AnimatedObject{
Tile checked_tile_bottom_left = RabiClone.CURRENT_MAP.getTile((int)(getX()-getAnimatedSpr().getWidth()/2+4)/Tile.TILE_WIDTH, (int)(getY()+getAnimatedSpr().getHeight()/2+check_distance_y)/Tile.TILE_HEIGHT);
Tile checked_tile_bottom_center = RabiClone.CURRENT_MAP.getTile((int)(getX())/Tile.TILE_WIDTH, (int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT);
if(checked_tile_bottom_center.getCollision()==CollisionType.SLOPE
&& getY()+check_distance_y>(-(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4)))
&& getY()+check_distance_y>ySlopeCollisionPoint(checked_tile_bottom_center))
{
setY(-(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4));
moveUpSlope(checked_tile_bottom_center);
collisionOccured = groundCollision(check_distance_y);
System.out.println(checked_tile_bottom_center);
break;
@ -450,6 +449,35 @@ public class Player extends AnimatedObject{
}
private double ySlopeCollisionPoint(Tile tile) {
switch(tile){
case BIG_SLOPE_LEFT1:
return 0;
case BIG_SLOPE_LEFT2:
return 0;
case BIG_SLOPE_RIGHT1:
return 0;
case BIG_SLOPE_RIGHT2:
return 0;
case SMALL_SLOPE_LEFT:
return -(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4);
case SMALL_SLOPE_RIGHT:
return Tile.TILE_WIDTH-(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4);
}
return 0;
}
private void moveUpSlope(Tile checked_tile_bottom_center) {
setY(ySlopeCollisionPoint(checked_tile_bottom_center));
}
private boolean groundCollision(double check_distance_y) {
boolean collisionOccured;
setY((getY()-check_distance_y));

Loading…
Cancel
Save