Skip to content

Commit 151ca8b

Browse files
K4thosK4thos
committed
fixed kitlist.2da importing
https://www.gibberlings3.net/forums/topic/32851-bug-with-conversion-of-the-kitlist2da/
1 parent bd096b4 commit 151ca8b

File tree

2 files changed

+111
-74
lines changed

2 files changed

+111
-74
lines changed

‎EET/lib/bg2_2DA.tph‎

Lines changed: 109 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,5 @@
11
///// \\\\\
2-
///// KITLIST.2DA \\\\\
3-
///// \\\\\
4-
5-
COPY_EXISTING ~KITLIST.2DA~ ~override~
6-
PRETTY_PRINT_2DA
7-
COUNT_2DA_ROWS 3 "cntrow"
8-
READ_2DA_ENTRY (cntrow - 1) 0 3 "kit_index"
9-
PATCH_PRINT ~kit_index = %kit_index%~
10-
BUT_ONLY
11-
12-
ACTION_DEFINE_ASSOCIATIVE_ARRAY table_2DA_kitStrref BEGIN
13-
MATCH1 => strref1
14-
MATCH2 => strref2
15-
MATCH3 => strref3
16-
END
17-
18-
COPY + ~%MOD_FOLDER%/temp/array/KITLIST.2DA~ ~%MOD_FOLDER%/temp/array~
19-
PRETTY_PRINT_2DA
20-
REPLACE_TEXTUALLY ~^38[ ]+OHTYR_OLD[%newline%]+~ ~~
21-
REPLACE_TEXTUALLY ~^39[ ]+FAKIE[%newline%]+~ ~~
22-
COUNT_2DA_ROWS 3 "cntrow"
23-
FOR (cnt = 1; cnt < "%cntrow%"; cnt = cnt + 1) BEGIN
24-
READ_2DA_ENTRY cnt 0 3 "kit_num"
25-
SET kit_num = kit_num + 0x4000
26-
READ_2DA_ENTRY cnt 1 3 "name"
27-
PATCH_IF (NOT FILE_CONTAINS_EVALUATED (~KITLIST.2DA~ ~^[0-9]+[ ]+%name% ~)) BEGIN
28-
REPLACE_EVALUATE CASE_INSENSITIVE ~^[0-9]+[ ]+%name%[ ]+\([0-9\*\-]+\)[ ]+\([0-9\*\-]+\)[ ]+\([0-9\*\-]+\)[ ]+\(.+\)[ ]+[A-Za-z0-9]+$~ BEGIN
29-
PATCH_PRINT ~Patching KITLIST.2DA: %name%~
30-
SET kit_index = kit_index + 1
31-
PHP_EACH table_2DA_kitStrref AS match => var BEGIN
32-
SPRINT strref EVAL ~%%match%%~
33-
PATCH_IF (NOT IS_AN_INT strref) BEGIN
34-
SPRINT EVAL ~%var%~ ~*~
35-
END ELSE BEGIN
36-
LPF EET_strref INT_VAR str = strref add = strrefAdd RET str END
37-
SPRINT EVAL ~%var%~ ~%str%~
38-
END
39-
END
40-
INNER_ACTION BEGIN
41-
COPY_EXISTING - ~KIT.IDS~ ~.../KIT.IDS~
42-
PRETTY_PRINT_2DA
43-
COUNT_REGEXP_INSTANCES ~ %name%\([%newline%]+\)~ num_matches
44-
PATCH_IF (num_matches > 0) BEGIN
45-
REPLACE_EVALUATE CASE_INSENSITIVE ~^\([A-Za-z0-9]+\)[ ]+%name%\([%newline%]+\)~ BEGIN
46-
SPRINT ids_index_sprint ~%MATCH1%~
47-
INNER_PATCH_SAVE ids_index_sprint ~%ids_index_sprint%~ BEGIN
48-
REPLACE_TEXTUALLY ~^0x~ ~0x0000~
49-
END
50-
PATCH_PRINT ~%name% KITIDS = %ids_index_sprint%~
51-
END ~%MATCH1% %name%%MATCH2%~
52-
END ELSE BEGIN
53-
SPRINT ids_index_sprint ~~
54-
PATCH_WARN ~WARNING: %name% kit was not found in kit.ids~
55-
END
56-
APPEND ~KITLIST.2DA~ ~%kit_index% %name% %strref1% %strref2% %strref3% %MATCH4% %ids_index_sprint%~
57-
PRINT ~%kit_index% %name% %strref1% %strref2% %strref3% %MATCH4% %ids_index_sprint% appended to KITLIST.2DA~
58-
OUTER_SET kit_short = kit_index + 0x4000
59-
ACTION_IF (kit_num != kit_short) AND (NOT VARIABLE_IS_SET $remapped_kit(~%kit_num%~)) BEGIN
60-
ACTION_DEFINE_ASSOCIATIVE_ARRAY remapped_kit BEGIN ~%kit_num%~ => ~%kit_short%~ END
61-
OUTER_SPRINT log_remapped_kit ~%log_remapped_kit%%TAB%%kit_num%%TAB%=>%TAB%%kit_short%%TAB%%slash%%slash%%name%%LNL%~
62-
END
63-
END
64-
END ~%kit_index% %name% %strref1% %strref2% %strref3% %MATCH4% %ids_index_sprint%~
65-
END
66-
END
67-
COPY_EXISTING ~KITLIST.2DA~ ~override~
68-
PRETTY_PRINT_2DA
69-
BUT_ONLY
70-
71-
///// \\\\\
72-
///// other KIT files \\\\\
2+
///// KIT files \\\\\
733
///// \\\\\
744

755
ACTION_FOR_EACH file IN CLASWEAP ABCLASRQ ABCLSMOD ABDCDSRQ ABDCSCRQ ALIGNMNT DUALCLAS KITTABLE BACKSTAB CLSWPBON THIEFSKL CLSRCREQ SNEAKATT CRIPPSTR BEGIN
@@ -195,6 +125,112 @@ ACTION_BASH_FOR ~%MOD_FOLDER%/temp/array~ ~^K_.+$~ BEGIN
195125
BUT_ONLY
196126
END
197127

128+
///// \\\\\
129+
///// KITLIST.2DA \\\\\
130+
///// \\\\\
131+
132+
COPY_EXISTING ~WEAPPROF.2DA~ ~override~
133+
PRETTY_PRINT_2DA
134+
COUNT_2DA_ROWS 3 "cntrow"
135+
COUNT_2DA_COLS "cntcol"
136+
FOR (i = 0; i < (cntcol - 1); i = i + 1) BEGIN
137+
READ_2DA_ENTRY 0 i 3 "name"
138+
TO_UPPER name
139+
SET $PROFICIENCY_array(~%name%~) = i
140+
END
141+
BUT_ONLY
142+
143+
COPY_EXISTING ~KITLIST.2DA~ ~override~
144+
PRETTY_PRINT_2DA
145+
COUNT_2DA_ROWS 3 "cntrow"
146+
FOR (cnt = 1; cnt < "%cntrow%"; cnt = cnt + 1) BEGIN
147+
READ_2DA_ENTRY cnt 1 3 "name"
148+
TO_UPPER name
149+
TEXT_SPRINT $KITLIST_array(~%name%~) ~~
150+
END
151+
READ_2DA_ENTRY (cntrow - 1) 0 3 "kit_index"
152+
PATCH_PRINT ~kit_index = %kit_index%~
153+
BUT_ONLY
154+
155+
COPY_EXISTING ~KIT.IDS~ ~override~
156+
COUNT_2DA_ROWS 2 "cntrow"
157+
FOR (cnt = 0; cnt < "%cntrow%"; cnt = cnt + 1) BEGIN
158+
READ_2DA_ENTRY cnt 0 2 "ids_index"
159+
READ_2DA_ENTRY cnt 1 2 "ids_name"
160+
TO_UPPER ids_name
161+
TEXT_SPRINT $KITIDS_array(~%ids_name%~) ~%ids_index%~
162+
END
163+
BUT_ONLY
164+
165+
COPY + ~%MOD_FOLDER%/temp/array/KITLIST.2DA~ ~%MOD_FOLDER%/temp/array~
166+
PRETTY_PRINT_2DA
167+
REPLACE_TEXTUALLY ~^38[ ]+OHTYR_OLD[%newline%]+~ ~~
168+
REPLACE_TEXTUALLY ~^39[ ]+FAKIE[%newline%]+~ ~~
169+
COUNT_2DA_ROWS 10 "cntrow"
170+
FOR (cnt = 0; cnt < "%cntrow%"; cnt = cnt + 1) BEGIN
171+
READ_2DA_ENTRY cnt 0 10 "kit_num"
172+
READ_2DA_ENTRY cnt 1 10 "ROWNAME"
173+
SPRINT name_case ~%ROWNAME%~
174+
TO_UPPER name_case
175+
PATCH_IF (NOT VARIABLE_IS_SET $KITLIST_array(~%name_case%~)) BEGIN
176+
PATCH_PRINT ~Patching KITLIST.2DA: %ROWNAME%~
177+
READ_2DA_ENTRY cnt 2 10 "LOWER"
178+
READ_2DA_ENTRY cnt 3 10 "MIXED"
179+
READ_2DA_ENTRY cnt 4 10 "HELP"
180+
READ_2DA_ENTRY cnt 5 10 "ABILITIES"
181+
READ_2DA_ENTRY cnt 6 10 "PROFICIENCY"
182+
READ_2DA_ENTRY cnt 7 10 "UNUSABLE"
183+
READ_2DA_ENTRY cnt 8 10 "CLASS"
184+
READ_2DA_ENTRY cnt 9 10 "KITIDS"
185+
//strings
186+
PATCH_FOR_EACH var IN LOWER MIXED HELP BEGIN
187+
SPRINT strref EVAL ~%%var%%~
188+
PATCH_IF (NOT IS_AN_INT strref) BEGIN
189+
SPRINT EVAL ~%var%~ ~*~
190+
END ELSE BEGIN
191+
LPF EET_strref INT_VAR str = strref add = strrefAdd RET str END
192+
SPRINT EVAL ~%var%~ ~%str%~
193+
END
194+
END
195+
//proficiency column number
196+
PATCH_IF (VARIABLE_IS_SET $PROFICIENCY_array(~%name_case%~)) BEGIN
197+
SET PROFICIENCY = $PROFICIENCY_array(~%name_case%~)
198+
END ELSE BEGIN
199+
PATCH_WARN ~WARNING: %name_case% kit with unrecognized PROFICIENCY: %PROFICIENCY%~
200+
END
201+
//class
202+
PATCH_IF (VARIABLE_IS_SET $remapped_class(~%CLASS%~)) BEGIN
203+
TEXT_SPRINT CLASS $remapped_class(~%CLASS%~)
204+
END
205+
//append kit
206+
SET kit_index = kit_index + 1
207+
SET kit_num = kit_num + 0x4000
208+
SET kit_short = kit_index + 0x4000
209+
SPRINTF ids_index_sprint ~%x~ (kit_short) //%~
210+
INNER_ACTION BEGIN
211+
//kit ids
212+
ACTION_IF (VARIABLE_IS_SET $KITIDS_array(~%name_case%~)) BEGIN
213+
OUTER_TEXT_SPRINT ids_index_sprint $KITIDS_array(~%name_case%~)
214+
END ELSE BEGIN
215+
APPEND ~KIT.IDS~ ~%ids_index_sprint% %ROWNAME%~
216+
PRINT ~%ids_index_sprint% %ROWNAME% appended to KIT.IDS~
217+
END
218+
OUTER_PATCH_SAVE KITIDS ~%ids_index_sprint%~ BEGIN
219+
REPLACE_TEXTUALLY ~^0x~ ~0x0000~
220+
END
221+
APPEND ~KITLIST.2DA~ ~%kit_index% %ROWNAME% %LOWER% %MIXED% %HELP% %ABILITIES% %PROFICIENCY% %UNUSABLE% %CLASS% %KITIDS%~
222+
PRINT ~%kit_index% %ROWNAME% %LOWER% %MIXED% %HELP% %ABILITIES% %PROFICIENCY% %UNUSABLE% %CLASS% %KITIDS% appended to KITLIST.2DA~
223+
ACTION_IF (kit_num != kit_short) AND (NOT VARIABLE_IS_SET $remapped_kit(~%kit_num%~)) BEGIN
224+
ACTION_DEFINE_ASSOCIATIVE_ARRAY remapped_kit BEGIN ~%kit_num%~ => ~%kit_short%~ END
225+
OUTER_SPRINT log_remapped_kit ~%log_remapped_kit%%TAB%%kit_num%%TAB%=>%TAB%%kit_short%%TAB%%slash%%slash%%ROWNAME%%LNL%~
226+
END
227+
END
228+
END
229+
END
230+
COPY_EXISTING ~KITLIST.2DA~ ~override~
231+
PRETTY_PRINT_2DA
232+
BUT_ONLY
233+
198234
///// \\\\\
199235
///// CHARSND.2DA \\\\\
200236
///// \\\\\
@@ -522,6 +558,7 @@ ACTION_BASH_FOR ~%patch_dir%/spl~ ~SPPR[1-7][5-9][0-9]\.SPL~ BEGIN //Priest leve
522558
END
523559

524560
COPY_EXISTING ~HIDESPL.2DA~ ~override~
561+
PRETTY_PRINT_2DA
525562
REPLACE_TEXTUALLY ~^SPWI93[5-7] .+%LNL%~ ~~ //free 3 level 9 slots (SUMMON_SKELETON_WARRIOR entries)
526563
COUNT_2DA_ROWS 4 "cntrow"
527564
FOR (cnt = 0; cnt < "%cntrow%"; cnt = cnt + 1) BEGIN
@@ -1853,7 +1890,7 @@ BUT_ONLY
18531890
COPY + ~%MOD_FOLDER%/temp/2da/BGCLATXT.2DA~ ~%MOD_FOLDER%/temp/2da~
18541891
~%MOD_FOLDER%/temp/2da/SODCLTXT.2DA~ ~%MOD_FOLDER%/temp/2da~
18551892
PRETTY_PRINT_2DA
1856-
REPLACE_TEXTUALLY ~^OHTYR_OLD[%newline%]+~ ~~
1893+
REPLACE_TEXTUALLY ~^OHTYR_OLD .+[%newline%]+~ ~~
18571894
PATCH_FOR_EACH class IN FIGHTER_MAGE FIGHTER_CLERIC FIGHTER_THIEF FIGHTER_MAGE_THIEF MAGE_THIEF CLERIC_MAGE CLERIC_THIEF FIGHTER_DRUID FIGHTER_MAGE_CLERIC CLERIC_RANGER BEGIN //assign correct biography for multi-class characters
18581895
REPLACE_TEXTUALLY ~^\(%class%[ ]+[-0-9]+[ ]+[-0-9]+[ ]+[-0-9]+[ ]+[-0-9]+[ ]+[-0-9]+[ ]+\)[-0-9]+~ ~\1 15889~
18591896
END

‎EET/lib/bg2_IDS.tph‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ COPY + ~%MOD_FOLDER%/temp/array/GTIMES.IDS~ ~%MOD_FOLDER%/temp/array~
144144
///// KIT.IDS \\\\\
145145
///// \\\\\
146146

147-
COPY_EXISTING ~KIT.IDS~ ~override~
147+
/*COPY_EXISTING ~KIT.IDS~ ~override~
148148
COUNT_2DA_ROWS 2 "cntrow"
149149
READ_2DA_ENTRY (cntrow - 1) 0 2 "ids_index"
150150
SET ids_index = ids_index + 1
@@ -168,7 +168,7 @@ COPY + ~%MOD_FOLDER%/temp/array/KIT.IDS~ ~%MOD_FOLDER%/temp/array~
168168
//PATCH_PRINT ~ids_index = %ids_index_sprint%~
169169
END
170170
END
171-
END
171+
END*/
172172

173173
///// \\\\\
174174
///// SONGLIST.IDS \\\\\

0 commit comments

Comments
 (0)