Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed character override .csv entries loading as something else than string #413

Merged
merged 3 commits into from
Oct 17, 2024
Merged

Fixed character override .csv entries loading as something else than string #413

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a943a1
Fixed character override `.csv` entries loading as something else tha…
Leidtier Sep 11, 2024
037a266
Fixed intendation
Leidtier Sep 11, 2024
5bb9d08
fixed intendation again
Leidtier Sep 11, 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
18 changes: 10 additions & 8 deletions src/games/gameable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,17 +260,14 @@ def __apply_character_overrides(self, overrides_folder: str, character_df_column
elif extension == ".csv":
extra_df = self.__get_character_df(full_path_file)
for i in range(extra_df.shape[0]):#for each row in df
name = extra_df.iloc[i].get("name", "")
if pd.isna(name): name = ""
base_id = extra_df.iloc[i].get("base_id", "")
if pd.isna(base_id): base_id = ""
race = extra_df.iloc[i].get("race", "")
if pd.isna(race): race = ""
name = self.get_string_from_df(extra_df.iloc[i], "name")
base_id = self.get_string_from_df(extra_df.iloc[i], "base_id")
race = self.get_string_from_df(extra_df.iloc[i], "race")
matcher = self._get_matching_df_rows_matcher(base_id, name, race)
if isinstance(matcher, type(None)): #character not in csv, add as new row
row = []
for entry in character_df_column_headers:
value = extra_df.iloc[i].get(entry, "")
value = self.get_string_from_df(extra_df.iloc[i], entry)
row.append(value)
self.character_df.loc[len(self.character_df.index)] = row
else: #character is in csv, update row
Expand All @@ -281,4 +278,9 @@ def __apply_character_overrides(self, overrides_folder: str, character_df_column
except Exception as e:
logging.log(logging.WARNING, f"Could not load character override file '{file}' in '{overrides_folder}'. Most likely there is an error in the formating of the file. Error: {e}")


@staticmethod
def get_string_from_df(iloc, column_name: str) -> str:
entry = iloc.get(column_name, "")
if pd.isna(entry): entry = ""
elif not isinstance(entry, str): entry = str(entry)
return entry