Skip to content

Commit

Permalink
work work
Browse files Browse the repository at this point in the history
  • Loading branch information
SilverShadowStar committed Nov 4, 2024
1 parent aec30fd commit f0a1eff
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 69 deletions.
5 changes: 3 additions & 2 deletions requirements.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import pipreqs
pipreqs /workspaces/OdysseyEden/src
pygame
noise
esper
18 changes: 16 additions & 2 deletions src/character/char.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,22 @@

class Character(pyglet.sprite.Sprite):
def __init__(self, **kwargs):
pass

self.mom = mom or None
self.dad = dad or None
self.dna = createDNA(self, mom, dad)
aelf.age = age or randAge(self)
self.traits = traits or randTraits(self)
self.stats = stats or randStats(self)

def randAge(self):
pass

def randTraits(self):
pass

def randStats(self):
pass

def improve_related_stats(self, skill: Skill, levels_gained: int):

if skill.group in con.SKILL_STAT_RELATIONS:
Expand Down
44 changes: 44 additions & 0 deletions src/character/personality.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,47 @@ def check_synergy(self, other):
Returns:
- list: A list of synergy effect descriptions.
"""

class MBTI():
def __init__(self, name: str, trait_effect: Dict, compatibility: Dict, ):

"""Friendships: MBTI Compatibility Overview
Best Friends:
ENFP & INFJ: Deep emotional and intuitive bond, with a balance of creativity and wisdom.
ENTP & INTJ: Intellectual synergy; ENTP’s innovation complements INTJ’s strategic mind.
ISFJ & ESFJ: Loyal and nurturing, they share a focus on care and harmony.
ISFP & ESFP: Fun-loving and emotionally authentic, they connect over shared experiences.
Worst Enemies:
ESTJ & INFP: Clash between ESTJ’s practicality and INFP’s idealism and sensitivity.
ENTJ & ISFP: ENTJ’s forceful leadership may feel oppressive to ISFP’s values-driven, sensitive nature.
ISTJ & ENFP: ISTJ’s need for order contrasts with ENFP’s free-spirited, spontaneous nature.
Balanced but Challenging:
INTP & ENFJ: Intellectual vs. emotional focus; potential for growth but requires understanding.
ISTP & ESFJ: Pragmatic ISTP might clash with ESFJ’s social and emotional approach.
ISFJ & ENTP: Tradition and harmony (ISFJ) vs. challenge and spontaneity (ENTP).
Romantic Relationships: MBTI Compatibility Overview
Best Romance Partners:
INFJ & ENFP: Emotional depth and mutual growth, valuing personal development and intuition.
INTJ & ENFP: Opposites attract; ENFP's creativity softens INTJ’s logic, balancing emotional and strategic thinking.
ENTP & INFJ: Intellectual and emotional depth, creating a dynamic partnership.
ISFJ & ESFJ: Stable, nurturing relationships with shared values and loyalty.
Good but Challenging:
ENTJ & INFP: Strong attraction but potential conflict between ENTJ’s practicality and INFP’s idealism.
INTP & ESFJ: Analytical vs. emotional approach; can balance but requires effort.
ESTP & ISFJ: Adventure (ESTP) vs. stability (ISFJ); potential for excitement but may need compromise.
Struggling Pairings:
ISTJ & ENFP: Stability vs. spontaneity; a difficult match for long-term romance.
ESTJ & INFP: Practicality vs. emotional ideals often leads to misunderstanding.
ENTP & ISFJ: ENTP’s need for novelty clashes with ISFJ’s preference for tradition and security.
Balanced but Needs Effort:
ENFJ & ISTP: Opposite focuses (empathy vs. independence) that require communication.
INTP & ENFJ: Logical INTP and emotionally expressive ENFJ can thrive with mutual respect.
ENTP & ISTJ: Creative vs. orderly; potential to learn from each other with effort."""
7 changes: 5 additions & 2 deletions src/utils/constants.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# constants.py
WORLD_WIDTH = 100
WORLD_HEIGHT = 100

BIOMES = ['forest', 'plains', 'ocean', 'desert', 'moutains']
HOUR_LEN = 60
DAY_LEN = 24
WEEK_LEN = 10
Expand Down Expand Up @@ -61,8 +65,7 @@
ECOLOR = ['brown', 'hazel', 'green', 'blue', 'grey']
NPROFILE = ['small', 'medium', 'tall']
NSHAPE = ['refined', 'hero', 'soft', 'perky', 'dainty', 'strong', 'bulb']
MSHAPE = ['thin', 'round', 'wide', 'fuller lower', 'fuller upper',
'downturned', 'bowshaped', 'full', 'heartshaped']
MSHAPE = ['thin', 'round', 'wide', 'fuller lower', 'fuller upper', 'downturned', 'bowshaped', 'full', 'heartshaped']
RSHAPE = ['round', 'pointed']
RSIZE = ['small', 'medium', 'large']

Expand Down
63 changes: 0 additions & 63 deletions src/utils/ecs.py

This file was deleted.

Empty file removed src/utils/new 1.txt
Empty file.
Empty file removed src/utils/time_progression.py
Empty file.
Empty file removed src/world/bodyofwater.py
Empty file.
7 changes: 7 additions & 0 deletions src/world/world.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from ..utils import constants as con

biome = con.BIOMES
print(str(biome))
class World:
pass

0 comments on commit f0a1eff

Please sign in to comment.