Skip to content

Commit b638008

Browse files
MrKeiKunMrKeiKun
committed
Use double-quoted string constants for type and race in level_penalty
1 parent 0e4015c commit b638008

3 files changed

Lines changed: 90 additions & 91 deletions

File tree

‎db/re/level_penalty.conf‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -35,219 +35,219 @@ level_penalty_db: (
3535
**************************************************************************
3636
{
3737
// Level of the defending element (by default, may be Lv1 up to Lv4)
38-
type: <EXP_PENALTY_RATE or ITEM_DROP_PENALTY_RATE>,
39-
race: <RC_* constant>,
38+
type: <"EXP_PENALTY_RATE" or "ITEM_DROP_PENALTY_RATE">,
39+
race: <RC_* constant (e.g. "RC_Boss", "RC_NonBoss")>,
4040
diff: <level difference>,
4141
rate: <penalty rate, where 100 means 100% (base rate, no additions/reductions)>
4242
},
4343
**************************************************************************/
4444
{
45-
type: EXP_PENALTY_RATE,
46-
race: RC_NONBOSS,
45+
type: "EXP_PENALTY_RATE",
46+
race: "RC_NonBoss",
4747
diff: 16,
4848
rate: 40
4949
},
5050
{
51-
type: EXP_PENALTY_RATE,
52-
race: RC_NONBOSS,
51+
type: "EXP_PENALTY_RATE",
52+
race: "RC_NonBoss",
5353
diff: 15,
5454
rate: 115
5555
},
5656
{
57-
type: EXP_PENALTY_RATE,
58-
race: RC_NONBOSS,
57+
type: "EXP_PENALTY_RATE",
58+
race: "RC_NonBoss",
5959
diff: 14,
6060
rate: 120
6161
},
6262
{
63-
type: EXP_PENALTY_RATE,
64-
race: RC_NONBOSS,
63+
type: "EXP_PENALTY_RATE",
64+
race: "RC_NonBoss",
6565
diff: 13,
6666
rate: 125
6767
},
6868
{
69-
type: EXP_PENALTY_RATE,
70-
race: RC_NONBOSS,
69+
type: "EXP_PENALTY_RATE",
70+
race: "RC_NonBoss",
7171
diff: 12,
7272
rate: 130
7373
},
7474
{
75-
type: EXP_PENALTY_RATE,
76-
race: RC_NONBOSS,
75+
type: "EXP_PENALTY_RATE",
76+
race: "RC_NonBoss",
7777
diff: 11,
7878
rate: 135
7979
},
8080
{
81-
type: EXP_PENALTY_RATE,
82-
race: RC_NONBOSS,
81+
type: "EXP_PENALTY_RATE",
82+
race: "RC_NonBoss",
8383
diff: 10,
8484
rate: 140
8585
},
8686
{
87-
type: EXP_PENALTY_RATE,
88-
race: RC_NONBOSS,
87+
type: "EXP_PENALTY_RATE",
88+
race: "RC_NonBoss",
8989
diff: 9,
9090
rate: 135
9191
},
9292
{
93-
type: EXP_PENALTY_RATE,
94-
race: RC_NONBOSS,
93+
type: "EXP_PENALTY_RATE",
94+
race: "RC_NonBoss",
9595
diff: 8,
9696
rate: 130
9797
},
9898
{
99-
type: EXP_PENALTY_RATE,
100-
race: RC_NONBOSS,
99+
type: "EXP_PENALTY_RATE",
100+
race: "RC_NonBoss",
101101
diff: 7,
102102
rate: 125
103103
},
104104
{
105-
type: EXP_PENALTY_RATE,
106-
race: RC_NONBOSS,
105+
type: "EXP_PENALTY_RATE",
106+
race: "RC_NonBoss",
107107
diff: 6,
108108
rate: 120
109109
},
110110
{
111-
type: EXP_PENALTY_RATE,
112-
race: RC_NONBOSS,
111+
type: "EXP_PENALTY_RATE",
112+
race: "RC_NonBoss",
113113
diff: 5,
114114
rate: 115
115115
},
116116
{
117-
type: EXP_PENALTY_RATE,
118-
race: RC_NONBOSS,
117+
type: "EXP_PENALTY_RATE",
118+
race: "RC_NonBoss",
119119
diff: 4,
120120
rate: 110
121121
},
122122
{
123-
type: EXP_PENALTY_RATE,
124-
race: RC_NONBOSS,
123+
type: "EXP_PENALTY_RATE",
124+
race: "RC_NonBoss",
125125
diff: 3,
126126
rate: 105
127127
},
128128
{
129-
type: EXP_PENALTY_RATE,
130-
race: RC_NONBOSS,
129+
type: "EXP_PENALTY_RATE",
130+
race: "RC_NonBoss",
131131
diff: 0,
132132
rate: 100
133133
},
134134
{
135-
type: EXP_PENALTY_RATE,
136-
race: RC_NONBOSS,
135+
type: "EXP_PENALTY_RATE",
136+
race: "RC_NonBoss",
137137
diff: -1,
138138
rate: 100
139139
},
140140
{
141-
type: EXP_PENALTY_RATE,
142-
race: RC_NONBOSS,
141+
type: "EXP_PENALTY_RATE",
142+
race: "RC_NonBoss",
143143
diff: -6,
144144
rate: 95
145145
},
146146
{
147-
type: EXP_PENALTY_RATE,
148-
race: RC_NONBOSS,
147+
type: "EXP_PENALTY_RATE",
148+
race: "RC_NonBoss",
149149
diff: -11,
150150
rate: 90
151151
},
152152
{
153-
type: EXP_PENALTY_RATE,
154-
race: RC_NONBOSS,
153+
type: "EXP_PENALTY_RATE",
154+
race: "RC_NonBoss",
155155
diff: -16,
156156
rate: 85
157157
},
158158
{
159-
type: EXP_PENALTY_RATE,
160-
race: RC_NONBOSS,
159+
type: "EXP_PENALTY_RATE",
160+
race: "RC_NonBoss",
161161
diff: -21,
162162
rate: 60
163163
},
164164
{
165-
type: EXP_PENALTY_RATE,
166-
race: RC_NONBOSS,
165+
type: "EXP_PENALTY_RATE",
166+
race: "RC_NonBoss",
167167
diff: -26,
168168
rate: 35
169169
},
170170
{
171-
type: EXP_PENALTY_RATE,
172-
race: RC_NONBOSS,
171+
type: "EXP_PENALTY_RATE",
172+
race: "RC_NonBoss",
173173
diff: -31,
174174
rate: 10
175175
},
176176
{
177-
type: EXP_PENALTY_RATE,
178-
race: RC_BOSS,
177+
type: "EXP_PENALTY_RATE",
178+
race: "RC_Boss",
179179
diff: 0,
180180
rate: 100
181181
},
182182
{
183-
type: ITEM_DROP_PENALTY_RATE,
184-
race: RC_NONBOSS,
183+
type: "ITEM_DROP_PENALTY_RATE",
184+
race: "RC_NonBoss",
185185
diff: 16,
186186
rate: 50
187187
},
188188
{
189-
type: ITEM_DROP_PENALTY_RATE,
190-
race: RC_NONBOSS,
189+
type: "ITEM_DROP_PENALTY_RATE",
190+
race: "RC_NonBoss",
191191
diff: 13,
192192
rate: 60
193193
},
194194
{
195-
type: ITEM_DROP_PENALTY_RATE,
196-
race: RC_NONBOSS,
195+
type: "ITEM_DROP_PENALTY_RATE",
196+
race: "RC_NonBoss",
197197
diff: 10,
198198
rate: 70
199199
},
200200
{
201-
type: ITEM_DROP_PENALTY_RATE,
202-
race: RC_NONBOSS,
201+
type: "ITEM_DROP_PENALTY_RATE",
202+
race: "RC_NonBoss",
203203
diff: 7,
204204
rate: 80
205205
},
206206
{
207-
type: ITEM_DROP_PENALTY_RATE,
208-
race: RC_NONBOSS,
207+
type: "ITEM_DROP_PENALTY_RATE",
208+
race: "RC_NonBoss",
209209
diff: 4,
210210
rate: 90
211211
},
212212
{
213-
type: ITEM_DROP_PENALTY_RATE,
214-
race: RC_NONBOSS,
213+
type: "ITEM_DROP_PENALTY_RATE",
214+
race: "RC_NonBoss",
215215
diff: 0,
216216
rate: 100
217217
},
218218
{
219-
type: ITEM_DROP_PENALTY_RATE,
220-
race: RC_NONBOSS,
219+
type: "ITEM_DROP_PENALTY_RATE",
220+
race: "RC_NonBoss",
221221
diff: -4,
222222
rate: 90
223223
},
224224
{
225-
type: ITEM_DROP_PENALTY_RATE,
226-
race: RC_NONBOSS,
225+
type: "ITEM_DROP_PENALTY_RATE",
226+
race: "RC_NonBoss",
227227
diff: -7,
228228
rate: 80
229229
},
230230
{
231-
type: ITEM_DROP_PENALTY_RATE,
232-
race: RC_NONBOSS,
231+
type: "ITEM_DROP_PENALTY_RATE",
232+
race: "RC_NonBoss",
233233
diff: -10,
234234
rate: 70
235235
},
236236
{
237-
type: ITEM_DROP_PENALTY_RATE,
238-
race: RC_NONBOSS,
237+
type: "ITEM_DROP_PENALTY_RATE",
238+
race: "RC_NonBoss",
239239
diff: -13,
240240
rate: 60
241241
},
242242
{
243-
type: ITEM_DROP_PENALTY_RATE,
244-
race: RC_NONBOSS,
243+
type: "ITEM_DROP_PENALTY_RATE",
244+
race: "RC_NonBoss",
245245
diff: -16,
246246
rate: 50
247247
},
248248
{
249-
type: ITEM_DROP_PENALTY_RATE,
250-
race: RC_BOSS,
249+
type: "ITEM_DROP_PENALTY_RATE",
250+
race: "RC_Boss",
251251
diff: 0,
252252
rate: 100
253253
}

‎src/map/pc.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11629,7 +11629,6 @@ static bool pc_read_level_penalty_db_sub(const struct config_setting_t *it, int
1162911629

1163011630
const char *type_str = NULL;
1163111631
if (libconfig->setting_lookup_string(it, "type", &type_str)) {
11632-
// Handle type constants
1163311632
if (strcmp(type_str, "EXP_PENALTY_RATE") == 0) {
1163411633
type = 1;
1163511634
} else if (strcmp(type_str, "ITEM_DROP_PENALTY_RATE") == 0) {
@@ -11643,7 +11642,7 @@ static bool pc_read_level_penalty_db_sub(const struct config_setting_t *it, int
1164311642
return false;
1164411643
}
1164511644

11646-
if (!libconfig->setting_lookup_int(it, "race", &race)) {
11645+
if (!map->setting_lookup_const(it, "race", &race)) {
1164711646
ShowError("%s: Invalid or missing race for entry %d in '%s', skipping...\n", __func__, n, source);
1164811647
return false;
1164911648
}

‎tools/level_penalty_converter.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030
import sys
3131

3232
RACE_NAMES = {
33-
0: 'RC_FORMLESS',
34-
1: 'RC_UNDEAD',
35-
2: 'RC_BRUTE',
36-
3: 'RC_PLANT',
37-
4: 'RC_INSECT',
38-
5: 'RC_FISH',
39-
6: 'RC_DEMON',
40-
7: 'RC_DEMIHUMAN',
41-
8: 'RC_ANGEL',
42-
9: 'RC_DRAGON',
43-
10: 'RC_PLAYER',
44-
11: 'RC_BOSS',
45-
12: 'RC_NONBOSS',
33+
0: 'RC_Formless',
34+
1: 'RC_Undead',
35+
2: 'RC_Brute',
36+
3: 'RC_Plant',
37+
4: 'RC_Insect',
38+
5: 'RC_Fish',
39+
6: 'RC_Demon',
40+
7: 'RC_DemiHuman',
41+
8: 'RC_Angel',
42+
9: 'RC_Dragon',
43+
10: 'RC_Player',
44+
11: 'RC_Boss',
45+
12: 'RC_NonBoss',
4646
}
4747

4848
TYPE_NAMES = {
@@ -88,8 +88,8 @@
8888
**************************************************************************
8989
{
9090
\t// Level of the defending element (by default, may be Lv1 up to Lv4)
91-
\ttype: <EXP_PENALTY_RATE or ITEM_DROP_PENALTY_RATE>,
92-
\trace: <RC_* constant>,
91+
\ttype: <"EXP_PENALTY_RATE" or "ITEM_DROP_PENALTY_RATE">,
92+
\trace: <RC_* constant (e.g. "RC_Boss", "RC_NonBoss")>,
9393
\tdiff: <level difference>,
9494
\trate: <penalty rate, where 100 means 100% (base rate, no additions/reductions)>
9595
},
@@ -128,8 +128,8 @@ def main():
128128
print(HEADER)
129129
for type_id, race_id, diff, rate in entries:
130130
print('{')
131-
print(f'\ttype: {TYPE_NAMES[type_id]},')
132-
print(f'\trace: {RACE_NAMES[race_id]},')
131+
print(f'\ttype: "{TYPE_NAMES[type_id]}",')
132+
print(f'\trace: "{RACE_NAMES[race_id]}",')
133133
print(f'\tdiff: {diff},')
134134
print(f'\trate: {rate}')
135135
print('},')

0 commit comments

Comments
 (0)