Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2a66f6e
big back activities
yongteck Jul 26, 2024
b21bef8
kaydn is a bum
yongteck Jul 26, 2024
70f1e77
Merge branch 'main' into main
yongteck Jul 26, 2024
f96d557
what
chxy75 Jul 26, 2024
c9dd619
yong teck is a dummy guy
kaydnnn Jul 26, 2024
3694fe4
bum kayden V1
yongteck Jul 26, 2024
f96c436
jijiji
Jayden185YT Jul 26, 2024
7a03a32
bum boy kayden V2
yongteck Jul 26, 2024
1a20e53
Kaydn is a bum V3
yongteck Jul 26, 2024
0320f21
Merge pull request #1 from yongteck/kaydnbumboy
yongteck Aug 1, 2024
b3ab3b1
edited
kaydnnn Aug 1, 2024
0f704ee
Merge pull request #2 from yongteck/kaydnbumboy
kaydnnn Aug 1, 2024
65c5b32
neymar v1
yongteck Aug 1, 2024
b6e3754
1/8
chxy75 Aug 1, 2024
0277391
Merge pull request #3 from yongteck/testting-merge-pull-shit
yongteck Aug 1, 2024
b4fe313
heheheha
yongteck Aug 2, 2024
03a05b6
split stuff up into stuff
yongteck Aug 2, 2024
658e9ad
Merge branch 'main' into ytbranch
yongteck Aug 2, 2024
1aec8dd
Merge pull request #4 from yongteck/ytbranch
yongteck Aug 2, 2024
40f2910
changed the read me
yongteck Aug 2, 2024
b41daee
editied etities
yongteck Aug 2, 2024
904439e
2/8 xy
chxy75 Aug 2, 2024
85114b8
Merge remote-tracking branch 'origin/main' into xythetester
chxy75 Aug 2, 2024
f86c560
item 1
chxy75 Aug 7, 2024
538916e
added entitiies module
yongteck Aug 7, 2024
73cf466
item_1
chxy75 Aug 7, 2024
8c8e97f
Merge branch 'main' into ytbranch
yongteck Aug 7, 2024
a488e37
Merge pull request #5 from yongteck/ytbranch
yongteck Aug 7, 2024
f123e9d
Merge branch 'main' into xythetester
yongteck Aug 7, 2024
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
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

## Members

- Mr Ng
- Ghostttt
- Member 3
- Member 4
- Kaydnnnnnnnnnn toh shinnnnnn something
- smth
- kaydn is bad at basketball
- Trashy yong teck
- yong teck sucks

-edited readme for merge test kaydnbumboy 1st Aug

<Description of your project>
we are a for profit chairty dedicated to helping students all over the world. Any amount you donate will have a large percentage given to us and only up to 2% will go the other students :)))
22 changes: 22 additions & 0 deletions entities.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
class Entities:
def __init__(self,hp,damage,sanity):
self.hp = hp
self.damage = damage
self.sanity = sanity
self.effects = []

def change_sanity(self,value):
self.sanity += value

def change_damage(self,value):
self.damage += value

def change_hp(self,value):
self.hp += value

def add_effects(self,lst):
self.effects += [i for i in lst if i not in self.effects]

def remove_effects(self,lst):
self.effects = [i for i in self.effects if i not in lst]

22 changes: 22 additions & 0 deletions game.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
class Game:
def __init__(self):
print("game has started")
self.ended = False
self.phase = "explore"
self.player = Player()

def isover(self):
return self.ended

def CheckNode(self,room):
return

def gameloop(self):
print("game is running")

if self.phase == "explore":
print("at node: ",self.player.playerpos)
elif self.phase == "battle":
print("fighting now")
elif self.phase == "event":
print("kaydn bum event")
37 changes: 35 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,37 @@
# Import statements

from entities import Entities
from game import Game
from rooms import Room
#yt

#jayden
if __name__ == "__main__":
pass
print("skibidi toilet")

#kaydn

#xinyu

class Item:
def __init__(self, descriptions, effects, states):
self.description = descriptions
self.effects = effects
self.states = states

def check_description(self):
return self.description

def check_effects(self):
return self.effects

def check_states(self):
return self.states

def set_descriptions(self,description):
self.description = description

def set_effects(self, effect):
self.effects = effect

def set_states(self, state):
self.states = state
3 changes: 3 additions & 0 deletions rooms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class Room:
def __init__(self):
pass
3 changes: 3 additions & 0 deletions testing.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
def main():

pass