Commit 6a195400 authored by Ankita Tiwari's avatar Ankita Tiwari
Browse files

Implemented character selection

parent 13f7ae8f

app/src/main/java/com/example/game2d/ChalkGameClass.java

+24 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import static android.content.Intent.getIntent; 


import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.graphics.Canvas;
@@ -20,6 +21,7 @@ import java.util.logging.Handler; 
public class ChalkGameClass extends View {

    //PLAYER

    private Bitmap player[] = new Bitmap[2];

    private boolean selectedShortHair;

    private int ranGravity;

    private boolean normGravity;

    private int playerX = 10;
@@ -68,6 +70,9 @@ public class ChalkGameClass extends View { 
    {

        super(context);



        SharedPreferences preferences = getContext().getSharedPreferences("MY_PREFS", 0);

        selectedShortHair = preferences.getBoolean("shortHairSelection", false);



        ranGravity = (int) Math.floor(Math.random() * 5) + 1; //ranGravity is a random integer between 1 and 5
@@ -79,8 +84,17 @@ public class ChalkGameClass extends View { 


        if(normGravity) {

            playerY = 650; //make the player rest at the bottom if normal gravity

            if(selectedShortHair == false)

            {

                player[0] = BitmapFactory.decodeResource(getResources(), R.drawable.girl);

                player[1] = BitmapFactory.decodeResource(getResources(), R.drawable.girl_jump_big);

            }

            else

            {

                player[0] = BitmapFactory.decodeResource(getResources(), R.drawable.boy_big);

                player[1] = BitmapFactory.decodeResource(getResources(), R.drawable.boy_jump_big);

            }



            backgroundImage= BitmapFactory.decodeResource(getResources(), R.drawable.background_normal);

            lives[0] = BitmapFactory.decodeResource(getResources(), R.drawable.hearts);

            lives[1] = BitmapFactory.decodeResource(getResources(), R.drawable.heart_grey);
@@ -89,8 +103,14 @@ public class ChalkGameClass extends View { 
        }

        else {

            playerY = 0; //make the player rest at the top if abnormal gravity

            if(selectedShortHair == false) {

                player[0] = BitmapFactory.decodeResource(getResources(), R.drawable.girl_upsidedown);

            player[1] = BitmapFactory.decodeResource(getResources(), R.drawable.girl_jump_big_upsidedown);

                player[1] = BitmapFactory.decodeResource(getResources(), R.drawable.girl_jump_upsidedown);

            }

            else {

                player[0] = BitmapFactory.decodeResource(getResources(), R.drawable.boy_idle_upsidedown);

                player[1] = BitmapFactory.decodeResource(getResources(), R.drawable.boy_jump_upsidedown);

            }

            backgroundImage = BitmapFactory.decodeResource(getResources(), R.drawable.background_upsidedown);

            lives[0] = BitmapFactory.decodeResource(getResources(), R.drawable.hearts_upsidedown);

            lives[1] = BitmapFactory.decodeResource(getResources(), R.drawable.heart_grey_upsidedown);

app/src/main/java/com/example/game2d/CharacterActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ public class CharacterActivity extends AppCompatActivity { 
        overridePendingTransition(0, 0);

        SaveName(username);





        SharedPreferences preferences = getSharedPreferences("MY_PREFS", 0);

        selectedShortHair = preferences.getBoolean("shortHairSelection", false);//get data



        //username input

        View textInputLayout = findViewById(R.id.textInputLayout);
@@ -68,7 +69,7 @@ public class CharacterActivity extends AppCompatActivity { 
        shortHairButton.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                selectedShortHair = true;

                preferences.edit().putBoolean("shortHairSelection", true).apply();

            }

        });
@@ -77,7 +78,7 @@ public class CharacterActivity extends AppCompatActivity { 
        longHairButton.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View view) {

                selectedShortHair = false;

                preferences.edit().putBoolean("shortHairSelection", false).apply();

            }

        });

app/src/main/java/com/example/game2d/Game.java

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.example.game2d; 


import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;
@@ -37,7 +38,6 @@ public class Game extends SurfaceView implements SurfaceHolder.Callback { 
    public Game(Context context) {

        super(context);

        gameContext = context;

        Log.d("plswork", "meow");



        // Get surface holder and add callback

        SurfaceHolder surfaceHolder = getHolder();

app/src/main/java/com/example/game2d/MainActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import androidx.appcompat.app.ActionBar; 
import androidx.appcompat.app.AppCompatActivity;



import android.content.Intent;

import android.content.SharedPreferences;

import android.media.MediaPlayer;

import android.os.Bundle;

import android.view.Window;
@@ -30,6 +31,9 @@ public class MainActivity extends AppCompatActivity { 
            WindowManager.LayoutParams.FLAG_FULLSCREEN

        );



        SharedPreferences preferences = getSharedPreferences("MY_PREFS", 0);

        Game surfaceView = new Game(this);



        backgroundMusic = MediaPlayer.create( this, R.raw.moog_city_two );

        backgroundMusic.setLooping(true);

app/src/main/res/drawable/boy_big.png

0 → 100644
+2.54 KiB
Loading image diff...