Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
211 commits
Select commit Hold shift + click to select a range
7d75935
made the classes
HalaMaloul Apr 20, 2023
b977712
added stats
Emkung Apr 20, 2023
c7f4fa5
added basic Gameplay
alexanderyoung1020 Apr 20, 2023
347759d
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 Apr 20, 2023
129d1c2
some stuff
Emkung Apr 24, 2023
c2dec15
back to normal classes no abstract
HalaMaloul Apr 24, 2023
2c55853
made a basic consturctor
HalaMaloul Apr 24, 2023
5d8bcc0
added comments
Emkung Apr 24, 2023
8bedfa3
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung Apr 24, 2023
6f23900
black cat constructor
HalaMaloul Apr 24, 2023
c0125a7
grey cat constructor added
alexanderyoung1020 Apr 24, 2023
f5ea4a3
fixed grey
alexanderyoung1020 Apr 24, 2023
09fa5f3
black cat class
HalaMaloul Apr 24, 2023
a7f2826
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul Apr 24, 2023
f3dc29e
white cat
Emkung Apr 24, 2023
f81fe3c
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung Apr 24, 2023
daebc94
random num added
Emkung Apr 25, 2023
c89b48b
Orange cat added
Apr 25, 2023
6c3b40b
Orange cat added
Apr 25, 2023
e5861c9
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Apr 25, 2023
6c33b2d
monster and cat
Emkung Apr 25, 2023
cf6cff6
added some cat stuff
Emkung Apr 25, 2023
4cc5202
added black cat special stat
Emkung Apr 25, 2023
e259cb5
changes
HalaMaloul Apr 25, 2023
a4c4708
Orange
Apr 25, 2023
c081d49
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Apr 25, 2023
96bfd9c
changes
HalaMaloul Apr 25, 2023
69aec84
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul Apr 25, 2023
5cf5d2b
New monster sub class
Emkung Apr 25, 2023
611c262
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung Apr 25, 2023
27b9fb2
deleted some files
Emkung Apr 25, 2023
01d5126
stuff
Emkung Apr 25, 2023
92bf988
changes
Apr 25, 2023
0b4bdae
added get functions
Emkung Apr 25, 2023
4b793a3
black cat stat
Emkung Apr 25, 2023
c838dc8
stuff
Emkung Apr 25, 2023
80939cb
cat n stuff
Emkung Apr 25, 2023
7c314b2
added battle gameplay
Emkung Apr 26, 2023
6b7cd67
added battle gameplay to characters
Emkung Apr 26, 2023
f32fb13
added some more battle stuff
Emkung Apr 26, 2023
a4a81ce
changes
Apr 26, 2023
112168e
Updated monster class
alexanderyoung1020 Apr 26, 2023
ad67740
updated monster class
alexanderyoung1020 Apr 26, 2023
9246ae6
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Apr 26, 2023
b0844a6
changes
Apr 26, 2023
6d10478
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Apr 26, 2023
0c1820f
changed name
Emkung Apr 26, 2023
e52c569
java doc monster
HalaMaloul Apr 26, 2023
caf9fad
stuff
Emkung Apr 26, 2023
cc22304
java doc monster
HalaMaloul Apr 26, 2023
455256c
i am not sure
HalaMaloul Apr 26, 2023
9211689
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul Apr 26, 2023
5d75662
changed some method to return
Emkung Apr 26, 2023
ee021e5
changes
Apr 26, 2023
90f5123
java doc monster
HalaMaloul Apr 26, 2023
e0e25ae
added some return
Emkung Apr 26, 2023
d821220
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung Apr 26, 2023
8c1b94c
changed int
Emkung Apr 26, 2023
79761ce
updated cat class
alexanderyoung1020 Apr 26, 2023
c264bf5
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 Apr 26, 2023
144d5c9
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Apr 26, 2023
0ac710a
changed some bugs
Emkung Apr 26, 2023
d5d8d27
changes
Apr 26, 2023
b343e2d
fixed classes
alexanderyoung1020 Apr 26, 2023
ca7aaf0
stuff
alexanderyoung1020 Apr 26, 2023
8a44d53
stuff added
Emkung Apr 26, 2023
976642d
java doc cat class
HalaMaloul Apr 26, 2023
a84e6b0
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung Apr 26, 2023
03e1fb3
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung Apr 26, 2023
b8889d4
changed name
Emkung Apr 26, 2023
3556163
chanGES
Apr 26, 2023
5194cf1
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Apr 26, 2023
9c4c416
explore or rest
HalaMaloul Apr 26, 2023
38a6183
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul Apr 26, 2023
f1c75b0
black & grey updates
alexanderyoung1020 Apr 26, 2023
6ad6471
or
HalaMaloul Apr 26, 2023
f0061df
added character names to game play
alexanderyoung1020 Apr 26, 2023
dc5a887
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 Apr 26, 2023
daa0357
changes
Apr 26, 2023
dbda291
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Apr 26, 2023
762f821
testing
HalaMaloul Apr 27, 2023
aa86782
xha
Apr 27, 2023
71dfb03
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul Apr 27, 2023
d63c661
testing
HalaMaloul Apr 27, 2023
effceb1
added some cmnts to gameplay
alexanderyoung1020 Apr 27, 2023
82f36ee
added a random event feature to explore method
alexanderyoung1020 Apr 28, 2023
dfe3cba
more cmnts & possible code
alexanderyoung1020 Apr 28, 2023
a49d1fa
updated "rest"
alexanderyoung1020 Apr 28, 2023
90d739c
added selection menu
alexanderyoung1020 Apr 28, 2023
e29a4f5
stuff
Emkung Apr 28, 2023
d4675ed
stuff
Emkung Apr 28, 2023
4df4098
suggestion for battlemode class
alexanderyoung1020 Apr 28, 2023
d8427dd
fixed bug
alexanderyoung1020 Apr 28, 2023
39f34bf
fixed babka drawing
alexanderyoung1020 Apr 29, 2023
05125f5
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 1, 2023
3055b54
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 1, 2023
6eda539
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 1, 2023
c80032e
added some stuff
Emkung May 2, 2023
430ce3e
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 2, 2023
56c988d
Maybe fixed broken guava ref?
jcrouser May 2, 2023
727b014
added main
alexanderyoung1020 May 2, 2023
b5dbe43
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 May 2, 2023
9a3820e
added chatbot
alexanderyoung1020 May 2, 2023
bc0413f
added sunny object
alexanderyoung1020 May 2, 2023
28daec7
yuki object created
alexanderyoung1020 May 2, 2023
f25c286
moved gameplay to main
HalaMaloul May 2, 2023
60cdfe4
deleted main
HalaMaloul May 2, 2023
ab9ab96
removed main
HalaMaloul May 2, 2023
612a4d6
created all our cat objects
alexanderyoung1020 May 2, 2023
f80133e
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 May 2, 2023
8707c48
m
HalaMaloul May 3, 2023
e92e3cb
hh
May 4, 2023
47e95b5
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 4, 2023
113050a
changing gameplay
HalaMaloul May 4, 2023
e168eb0
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 4, 2023
b52006d
jj
May 4, 2023
637666e
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 4, 2023
252f744
stuff
Emkung May 4, 2023
5419eda
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 4, 2023
6cca157
del a line
alexanderyoung1020 May 4, 2023
559091d
changes
HalaMaloul May 4, 2023
1557987
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 4, 2023
86cd19f
fixed if else
alexanderyoung1020 May 4, 2023
da3d873
changes
HalaMaloul May 4, 2023
7beab1f
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 May 4, 2023
38b12a6
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 May 4, 2023
5ed7052
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 4, 2023
0047469
changes
HalaMaloul May 4, 2023
ab8b073
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 4, 2023
a62ac45
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 4, 2023
3cdb3a5
changes
HalaMaloul May 4, 2023
aaf29bf
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 4, 2023
974d667
changes
HalaMaloul May 4, 2023
4aedd05
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 4, 2023
910d0c0
changes
HalaMaloul May 4, 2023
7a754b9
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 4, 2023
b793b1a
changes
HalaMaloul May 4, 2023
a2d1c65
changes
HalaMaloul May 4, 2023
6ec3c9f
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 4, 2023
b58e35a
changes
HalaMaloul May 4, 2023
fb1369a
adding more random outcomes
alexanderyoung1020 May 4, 2023
9e94dc1
changes
HalaMaloul May 5, 2023
4d600b9
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 5, 2023
810247d
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 7, 2023
f594928
Javadocs added in gameplay and cat
May 7, 2023
a9c7a76
movement
Emkung May 7, 2023
f563444
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 7, 2023
a8fc625
map
Emkung May 9, 2023
2499549
updates to gameplay, cat class toString()
alexanderyoung1020 May 9, 2023
781d5ab
added story
alexanderyoung1020 May 9, 2023
be356dc
added hunt mode
alexanderyoung1020 May 9, 2023
829d767
fixed a bug
alexanderyoung1020 May 9, 2023
a8c2282
map
Emkung May 9, 2023
1eef6a8
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 9, 2023
69089b4
stuff
alexanderyoung1020 May 9, 2023
08f9060
map
Emkung May 9, 2023
ccd2e33
map and monster
Emkung May 9, 2023
04f0bd2
map
Emkung May 9, 2023
e915e8d
map done draft
Emkung May 10, 2023
3a23957
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 May 11, 2023
0cd60b6
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
alexanderyoung1020 May 11, 2023
3b33526
working
Emkung May 11, 2023
4d9e14c
Revert "movement"
Emkung May 11, 2023
f94247f
changes
HalaMaloul May 11, 2023
3cd7575
changes
HalaMaloul May 11, 2023
a316603
undo working
Emkung May 11, 2023
9e6bbe8
stuff
Emkung May 11, 2023
b5e03bd
changes
HalaMaloul May 11, 2023
2450afa
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 11, 2023
bfa1e02
fixed bug
Emkung May 11, 2023
a211705
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 11, 2023
3a9cff2
more comments on main
May 11, 2023
42e46ec
restricting
Emkung May 11, 2023
6161d12
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 11, 2023
fefff84
yiiiiiii
Emkung May 11, 2023
6760eac
more comments
May 11, 2023
8b1b4d6
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 11, 2023
9bea034
changes
HalaMaloul May 12, 2023
72680c2
playerscore increase
Emkung May 12, 2023
e4b0286
stuff
Emkung May 12, 2023
294ed73
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 12, 2023
02d19cd
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
HalaMaloul May 12, 2023
ade79e8
fixed bug
Emkung May 12, 2023
accd048
stuff
Emkung May 12, 2023
0a1118e
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 12, 2023
8226f19
changes
HalaMaloul May 12, 2023
a6bb050
changes
Emkung May 12, 2023
dd47d9f
comments
May 12, 2023
8e7cc24
changes
HalaMaloul May 12, 2023
428cfad
changes
HalaMaloul May 12, 2023
55dc915
changes
HalaMaloul May 12, 2023
e278f61
clean up
Emkung May 12, 2023
c2da325
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 12, 2023
ec3c36f
changes
HalaMaloul May 12, 2023
5b6a77f
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 12, 2023
1da5ffb
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 12, 2023
55090eb
changes
HalaMaloul May 12, 2023
845c051
Cheatsheet
May 12, 2023
b30a8a2
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 12, 2023
4119f36
changes
Emkung May 12, 2023
bee6f38
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
Emkung May 12, 2023
27ee392
changes
HalaMaloul May 12, 2023
9e53a73
image
Emkung May 12, 2023
5b640ac
cheatsheet
May 12, 2023
2c692db
cheatsheet
May 12, 2023
6234855
changes
HalaMaloul May 12, 2023
55bdc46
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 12, 2023
88bc830
Merge branch 'main' of https://github.com/HalaMaloul/CSC120-FinalProject
May 12, 2023
dd89e35
map
Emkung May 12, 2023
daff25b
changes
HalaMaloul May 12, 2023
b6a1f8e
changes
HalaMaloul May 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added AlternativeMapDesign/Illustration.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added AlternativeMapDesign/alternativedesignmap.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 93 additions & 0 deletions Cat.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import java.util.Random;
/**

The Cat class represents a cat in the game.
*/
public class Cat {
public String name;
private int dexterity; //dex is the number you add on to a long range attack, which is a random attack number from 0-20, specifically for kick
private int strength; //strength is the number you add onto a attack, specifically for bite
private int iq; //iq is intelligence and the ability to escape, it adds onto a random 0-20 number
/**
* Constructor for the Cat class.
* @param name The name of the cat.
* @param dexterity The dexterity of the cat.
* @param strength The strength of the cat.
* @param iq The intelligence of the cat.
* @param hp The hit points of the cat.
* @param gameplay The gameplay object that the cat interacts with.
*/
public Cat(String name, int dexterity, int strength, int iq) {
this.name = name;
this.dexterity = dexterity;
this.strength = strength;
this.iq = iq;

}
/**
* The cat kicks
* @return The total damage dealt by the cat's kick.
*/
public int kick() {
Random random = new Random();
int randomNumber = random.nextInt(dexterity);
int ttl_dmg = randomNumber + this.dexterity;
return ttl_dmg;
}
/**
* The cat bites.
* @return The total damage dealt by the cat's bite.
*/
public int bite() {
Random random = new Random();
int randomNumber = random.nextInt(strength);
int ttl_dmg = randomNumber + this.strength;
return ttl_dmg;
}
/**
* The cat tries to escape.
* @return The total IQ of the cat and a random number from 0-20.
*/
public int escape() {
Random random = new Random();
int randomNumber = random.nextInt(iq);
int ttl_IQ = randomNumber + this.iq;
return ttl_IQ;
}
/**
* Hides the player from the monster's view.
*/
public void hide() {
System.out.println("The monster can't see you now");
}
/**
* the cat meows
*/
public void meow() {
System.out.println("meow! meow! meow!");
}
/**
* Gets the name of the cat.
* @return The name of the cat.
*/
public String getName() {
return name;
}
/**
* Gets the dexterity of the cat.
* @return The dexterity of the cat.
*/
public int getDexterity() {
return this.dexterity;
}
public int getStrength() {
return this.strength;
}
public int getIQ() {
return this.iq;
}

public String toString() {
return this.name;
}
}
Binary file added Cheatsheet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading