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

Jump to bottom

Fix for #13 #16

Merged
merged 1 commit into from
Dec 24, 2022
Merged

Fix for #13 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions SG_MULTIKITS.BAT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

robocopy ./sg_multikits "../Baldur's Gate - Enhanced Edition/sg_multikits" /E
cd "../Baldur's Gate - Enhanced Edition"
start "weidu.exe BG1" weidu.exe --uninstall
start "setup-sg_multikits.exe BG1" setup-sg_multikits.exe --force-install 1000 --safe-exit --args-list 1 1 1 2 2 1 0
start "setup-sg_multikits.exe BG1" setup-sg_multikits.exe --force-install 1000 --safe-exit --args-list 1 1 3 2 2 1 0

31 changes: 9 additions & 22 deletions sg_multikits/lib/sg#io.tpa
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
INCLUDE "%MOD_FOLDER%/lib/a7#add_kit_ex.tpa"

ACTION_DEFINE_ASSOCIATIVE_ARRAY 2DALIST// ASSOCIATIONS: column-label, is_transposed, mergetype, expected_columns
BEGIN //prompt, one two, loosen, restrict, sum, random, SMART, SKIP
~clastext~ => "0,0,0, 9,10"//class strings
Expand Down Expand Up @@ -79,31 +81,20 @@ END

DEFINE_ACTION_FUNCTION 2da_to_asarray
INT_VAR name_col = 0
ncols = 0
STR_VAR filename = ~~
fileto = ~override~
RET_ARRAY
rows
cols
outtable2
nrows
ncols
BEGIN
ACTION_DEFINE_ASSOCIATIVE_ARRAY "rows" BEGIN END
ACTION_DEFINE_ASSOCIATIVE_ARRAY "cols" BEGIN END
ACTION_DEFINE_ARRAY "outtable2" BEGIN END
COPY_EXISTING "%filename%" "%fileto%"
PATCH_IF ncols == 0 BEGIN
COUNT_2DA_COLS ncols
END ELSE BEGIN
COUNT_2DA_COLS ncolsreal
PATCH_IF ncolsreal != ncols BEGIN
PATCH_WARN ~%filename%: number of columns, %ncolsreal% does not match expected number of columns, %ncols%.~
END
PATCH_IF ncolsreal < ncols BEGIN
ncols = ncolsreal
END
END
LPF a7#add_kit_ex#normalize_table END // fix bugs with mods playing with columns...
COUNT_2DA_COLS ncols

LPF read_2da_header_now RET ncolscheck = ncols RET_ARRAY "cols" = output END

Expand Down Expand Up @@ -133,7 +124,6 @@ RET
column_label
is_transposed
mergetype
ncols
BEGIN
OUTER_SET i = 0
OUTER_WHILE (STRING_LENGTH "%opts%" > 0) BEGIN
Expand All @@ -152,20 +142,17 @@ BEGIN
OUTER_SET column_label = (IS_AN_INT EVAL "%opt_1%") ? EVAL "%opt_1%" : 0
OUTER_SET is_transposed = (IS_AN_INT EVAL "%opt_2%") ? EVAL "%opt_2%" : 0
OUTER_SET mergetype = (IS_AN_INT EVAL "%opt_3%") ? EVAL "%opt_3%" : 0
OUTER_SET ncols_bg1 = (IS_AN_INT EVAL "%opt_4%") ? EVAL "%opt_4%" : 0
OUTER_SET ncols_bg2 = (IS_AN_INT EVAL "%opt_5%") ? EVAL "%opt_5%" : ncols_bg1
OUTER_SET ncols = (GAME_IS ~bgee~) ? ncols_bg1 : ncols_bg2
END
DEFINE_ACTION_MACRO GET_2DAS
BEGIN
//override 2das:


ACTION_PHP_EACH "2DALIST" AS "2da" => "opts" BEGIN
LAF parse_opts STR_VAR opts = EVAL "%opts%" RET col_id = column_label ncols = ncols END
LAF parse_opts STR_VAR opts = EVAL "%opts%" RET col_id = column_label END

LAF 2da_to_asarray
INT_VAR name_col = EVAL "%col_id%" ncols = ncols
INT_VAR name_col = EVAL "%col_id%"
STR_VAR filename = EVAL ~%2da%.2da~
RET_ARRAY ~%2da%_rows~ = rows
~%2da%_cols~ = cols
Expand All @@ -185,14 +172,14 @@ BEGIN

ACTION_DEFINE_ASSOCIATIVE_ARRAY 2DALIST_MOD
BEGIN
~multi_grid~ => "0,0,0,0"
~multi_grid~ => "0,0,0"
END

ACTION_PHP_EACH "2DALIST_MOD" AS "2da" => "opts" BEGIN
LAF parse_opts STR_VAR opts = EVAL "%opts%" RET col_id = column_label ncols = ncols END
LAF parse_opts STR_VAR opts = EVAL "%opts%" RET col_id = column_label END

LAF 2da_to_asarray
INT_VAR name_col = EVAL "%col_id%" ncols = ncols
INT_VAR name_col = EVAL "%col_id%"
STR_VAR filename = EVAL ~%MOD_FOLDER%/lib/%2da%.2da~
fileto = ~~
RET_ARRAY ~%2da%_rows~ = rows
Expand Down