From f0a1effc7201ff98c3ad14bda7dc34dd7504843f Mon Sep 17 00:00:00 2001 From: D Date: Mon, 4 Nov 2024 06:56:31 -0700 Subject: [PATCH] work work --- requirements.py | 5 +-- src/character/char.py | 18 ++++++++-- src/character/personality.py | 44 ++++++++++++++++++++++++ src/utils/constants.py | 7 ++-- src/utils/ecs.py | 63 ----------------------------------- src/utils/new 1.txt | 0 src/utils/time_progression.py | 0 src/world/bodyofwater.py | 0 src/world/world.py | 7 ++++ 9 files changed, 75 insertions(+), 69 deletions(-) delete mode 100644 src/utils/ecs.py delete mode 100644 src/utils/new 1.txt delete mode 100644 src/utils/time_progression.py delete mode 100644 src/world/bodyofwater.py diff --git a/requirements.py b/requirements.py index fd17696c..e2f502d2 100644 --- a/requirements.py +++ b/requirements.py @@ -1,2 +1,3 @@ -import pipreqs -pipreqs /workspaces/OdysseyEden/src \ No newline at end of file +pygame +noise +esper \ No newline at end of file diff --git a/src/character/char.py b/src/character/char.py index b6525bca..9c94b862 100644 --- a/src/character/char.py +++ b/src/character/char.py @@ -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: diff --git a/src/character/personality.py b/src/character/personality.py index 6f9e1ddf..03299ef9 100644 --- a/src/character/personality.py +++ b/src/character/personality.py @@ -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.""" \ No newline at end of file diff --git a/src/utils/constants.py b/src/utils/constants.py index 1230de4f..d586a7f1 100644 --- a/src/utils/constants.py +++ b/src/utils/constants.py @@ -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 @@ -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'] diff --git a/src/utils/ecs.py b/src/utils/ecs.py deleted file mode 100644 index 7c693d89..00000000 --- a/src/utils/ecs.py +++ /dev/null @@ -1,63 +0,0 @@ -from functools import cache -from typing import List, Type, Callable, Dict, Tuple -from queue import Queue - -from -class Component: - pass - -class Position(Component): - def __init__(self, x, y): - self.x = x - self.y = y - -class Velocity(Component): - def __init__(self, x, y): - self.x = x - self.y = y - -class Entity: - def __init__(self): - self.components = {} - - def add_component(self, component): - self.components[type(component)] = component - - def get_component(self, component_type): - return self.components.get(component_type) - -class System: - def __init__(self, world): - self.world = world - - def update(self): - pass - -class Movement(System): - def update(self): - for entity in self.world.entities: BISCUTES - position = get_component(Position) - velocity = get_component(Velocity) - - if position and velocity: - position.x += velocity.x - position.y += velocity.y - -class World: - def __init__(self): - self.entities = [] - self.systems = [] - - def add_entity(self, entity): - self.entities.append(entity) - - def add_system(self, system): - self.systems.append(system) - - def update(self): - for system in self.systems: - system.update() - -world = World() - -entity = Entity() diff --git a/src/utils/new 1.txt b/src/utils/new 1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/src/utils/time_progression.py b/src/utils/time_progression.py deleted file mode 100644 index e69de29b..00000000 diff --git a/src/world/bodyofwater.py b/src/world/bodyofwater.py deleted file mode 100644 index e69de29b..00000000 diff --git a/src/world/world.py b/src/world/world.py index e69de29b..5f35b0eb 100644 --- a/src/world/world.py +++ b/src/world/world.py @@ -0,0 +1,7 @@ +from ..utils import constants as con + +biome = con.BIOMES +print(str(biome)) +class World: + pass +