Skip to content

Commit 76b150d

Browse files
waveylwaveyl
committed
misc fix
1 parent 386770f commit 76b150d

File tree

11 files changed

+71
-37
lines changed

11 files changed

+71
-37
lines changed

‎Kenan-Structured-Modpack/Arcana/monsters/monsters.json‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"damage_max_instance": [ { "damage_type": "heat", "amount": 15, "armor_multiplier": 0.9 } ]
3636
},
3737
{
38-
"type": "gun",
38+
"type": "ITEM",
39+
"subtypes": [ "GUN" ],
3940
"cooldown": 10,
4041
"move_cost": 500,
4142
"gun_type": "monster_fire_fake",
@@ -171,7 +172,8 @@
171172
[ "GRENADIER_ELITE", 15 ],
172173
[ "PARROT", 25 ],
173174
{
174-
"type": "gun",
175+
"type": "ITEM",
176+
"subtypes": [ "GUN" ],
175177
"cooldown": 15,
176178
"move_cost": 50,
177179
"gun_type": "monster_lightning_fake",
@@ -256,7 +258,8 @@
256258
"damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.5 } ]
257259
},
258260
{
259-
"type": "gun",
261+
"type": "ITEM",
262+
"subtypes": [ "GUN" ],
260263
"cooldown": 15,
261264
"move_cost": 500,
262265
"gun_type": "monster_fire_fake",
@@ -782,7 +785,8 @@
782785
[ "GRENADIER_ELITE", 20 ],
783786
[ "PARROT", 40 ],
784787
{
785-
"type": "gun",
788+
"type": "ITEM",
789+
"subtypes": [ "GUN" ],
786790
"cooldown": 25,
787791
"move_cost": 50,
788792
"gun_type": "monster_laser_fake",
@@ -971,7 +975,8 @@
971975
"cooldown": 100
972976
},
973977
{
974-
"type": "gun",
978+
"type": "ITEM",
979+
"subtypes": [ "GUN" ],
975980
"cooldown": 5,
976981
"move_cost": 75,
977982
"gun_type": "monster_laser_fake",
@@ -1067,7 +1072,8 @@
10671072
"special_attacks": [
10681073
[ "PARROT_AT_DANGER", 5 ],
10691074
{
1070-
"type": "gun",
1075+
"type": "ITEM",
1076+
"subtypes": [ "GUN" ],
10711077
"cooldown": 5,
10721078
"move_cost": 100,
10731079
"gun_type": "monster_hammer_fake",
@@ -1105,7 +1111,8 @@
11051111
"special_attacks": [
11061112
[ "PARROT_AT_DANGER", 5 ],
11071113
{
1108-
"type": "gun",
1114+
"type": "ITEM",
1115+
"subtypes": [ "GUN" ],
11091116
"cooldown": 5,
11101117
"move_cost": 100,
11111118
"gun_type": "monster_lightning_fake",
@@ -1141,7 +1148,8 @@
11411148
"special_attacks": [
11421149
[ "PARROT_AT_DANGER", 5 ],
11431150
{
1144-
"type": "gun",
1151+
"type": "ITEM",
1152+
"subtypes": [ "GUN" ],
11451153
"cooldown": 5,
11461154
"move_cost": 100,
11471155
"gun_type": "monster_fire_fake",

‎Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/monsters/thex_MIB.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
[ "PARROT_AT_DANGER", { "math": [ "13 + rand(11)" ] } ],
3737
{
3838
"gun_type": "glock_17",
39-
"type": "gun",
39+
"type": "ITEM",
40+
"subtypes": [ "GUN" ],
4041
"description": "The %s shoots!",
4142
"condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
4243
"ammo_type": "9mmfmj",
@@ -251,7 +252,8 @@
251252
[ "PARROT_AT_DANGER", { "math": [ "13 + rand(11)" ] } ],
252253
{
253254
"gun_type": "glock_17",
254-
"type": "gun",
255+
"type": "ITEM",
256+
"subtypes": [ "GUN" ],
255257
"description": "The %s shoots!",
256258
"condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
257259
"ammo_type": "9mmfmj",

‎Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/monsters/thex_fairy.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@
228228
"special_attacks": [
229229
{
230230
"gun_type": "fairy_pistol",
231-
"type": "gun",
231+
"type": "ITEM",
232+
"subtypes": [ "GUN" ],
232233
"description": "The %s shoots!",
233234
"condition": { "and": [ { "not": { "u_has_effect": "maimed_arm" } }, { "not": { "u_has_effect": "disarmed" } } ] },
234235
"ammo_type": "9mmfairy",

‎Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Mod/items/touhou_bionic_items.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"subtypes": ["GUN"],
66
"name": "Lunatic gun (shot)",
77
"description": "this a pseudo item",
8-
"volume": 12,
8+
"volume": "3 L",
99
"price": 0,
1010
"material": [ "steel", "plastic" ],
1111
"symbol": "(",
@@ -28,7 +28,7 @@
2828
"subtypes": ["GUN"],
2929
"name": "Lunatic gun (semi)",
3030
"description": "this a pseudo item",
31-
"volume": 12,
31+
"volume": "3 L",
3232
"price": 0,
3333
"material": [ "steel", "plastic" ],
3434
"symbol": "(",

‎Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Mod/monsters/touhou_summoned.json‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,8 @@
266266
"special_attacks": [
267267
{
268268
"gun_type": "water_mp5",
269-
"type": "gun",
269+
"type": "ITEM",
270+
"subtypes": [ "GUN" ],
270271
"ammo_type": "water",
271272
"cooldown": 2,
272273
"fake_dex": 10,
@@ -391,7 +392,8 @@
391392
"special_attacks": [
392393
{
393394
"gun_type": "alternate_knife_gun",
394-
"type": "gun",
395+
"type": "ITEM",
396+
"subtypes": [ "GUN" ],
395397
"description": "The maid throws a knife!",
396398
"ammo_type": "alternate_knife_knife",
397399
"cooldown": { "math": [ "2 + rand(1)" ] },
@@ -445,7 +447,8 @@
445447
"special_attacks": [
446448
{
447449
"gun_type": "lunatic_pistol2_illusionary",
448-
"type": "gun",
450+
"type": "ITEM",
451+
"subtypes": [ "GUN" ],
449452
"description": "",
450453
"ammo_type": "ammo_lunar_small_1_illusionary",
451454
"cooldown": 1,
@@ -572,7 +575,8 @@
572575
[ "PARROT_AT_DANGER", { "math": [ "10 + rand(10)" ] } ],
573576
{
574577
"gun_type": "chasm_gun",
575-
"type": "gun",
578+
"type": "ITEM",
579+
"subtypes": [ "GUN" ],
576580
"description": "",
577581
"ammo_type": "chasm_ammo_ammo",
578582
"cooldown": { "math": [ "3 + rand(3)" ] },
@@ -866,7 +870,8 @@
866870
},
867871
{
868872
"gun_type": "myon_gun",
869-
"type": "gun",
873+
"type": "ITEM",
874+
"subtypes": [ "GUN" ],
870875
"description": "",
871876
"ammo_type": "myon_bullet_bullet",
872877
"cooldown": { "math": [ "2 + rand(2)" ] },

‎Kenan-Structured-Modpack/Dorf_Life/items.json‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[
22
{
3-
"type": "comestible",
3+
"type": "ITEM",
4+
"subtypes": [ "COMESTIBLE" ],
45
"id": "caveyot_helmet_plump",
56
"name": { "str": "dark truffle" },
67
"weight": "120 g",
@@ -20,7 +21,8 @@
2021
"vitamins": [ [ "vitC", 4 ], [ "iron", 7 ] ]
2122
},
2223
{
23-
"type": "comestible",
24+
"type": "ITEM",
25+
"subtypes": [ "COMESTIBLE" ],
2426
"id": "caveyot_helmet_plump_cooked",
2527
"name": { "str": "cooked dark truffle" },
2628
"weight": "120 g",
@@ -38,7 +40,8 @@
3840
"flags": [ "EATEN_HOT", "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ]
3941
},
4042
{
41-
"type": "comestible",
43+
"type": "ITEM",
44+
"subtypes": [ "COMESTIBLE" ],
4245
"id": "caveyot_pod_sweet",
4346
"name": { "str": "vibrant bulb" },
4447
"weight": "115 g",
@@ -52,7 +55,8 @@
5255
"volume": "250 ml"
5356
},
5457
{
55-
"type": "comestible",
58+
"type": "ITEM",
59+
"subtypes": [ "COMESTIBLE" ],
5660
"id": "caveyot_wheat_cave",
5761
"name": { "str": "cloudy brush", "str_pl": "cloudy brushes" },
5862
"weight": "120 g",
@@ -65,7 +69,8 @@
6569
"volume": "250 ml"
6670
},
6771
{
68-
"type": "comestible",
72+
"type": "ITEM",
73+
"subtypes": [ "COMESTIBLE" ],
6974
"id": "caveyot_tails_pig",
7075
"name": { "str": "spiral stalk" },
7176
"weight": "120 g",
@@ -78,7 +83,8 @@
7883
"volume": "250 ml"
7984
},
8085
{
81-
"type": "comestible",
86+
"type": "ITEM",
87+
"subtypes": [ "COMESTIBLE" ],
8288
"id": "caveyot_bush_quarry",
8389
"name": { "str": "hardened bramble branch", "str_pl": "hardened bramble branches" },
8490
"weight": "200 g",
@@ -90,7 +96,8 @@
9096
"volume": "250 ml"
9197
},
9298
{
93-
"type": "comestible",
99+
"type": "ITEM",
100+
"subtypes": [ "COMESTIBLE" ],
94101
"id": "caveyot_bush_quarry_cooked",
95102
"name": { "str_sp": "roasted bramble nuts" },
96103
"looks_like": "hickory_nut_roasted",

‎Kenan-Structured-Modpack/Mining_Mod/items.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"description": "This is a primitive pickaxe, traditionally made from antler or bone, and fire-hardened for greater hardness. Less than ideal, but still suitable for striking the earth.",
131131
"sub": "pickaxe",
132132
"weight": "760 g",
133-
"volume": 10,
133+
"volume": "2.5 L",
134134
"price": "8 USD",
135135
"to_hit": -3,
136136
"melee_damage": { "bash": 10, "stab": 3 },

‎Kenan-Structured-Modpack/PM_World/ScaryMonstersAndNiceSprites/Distortions.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@
190190
"starting_ammo": { "water": 10 },
191191
"special_attacks": [
192192
{
193-
"type": "gun",
193+
"type": "ITEM",
194+
"subtypes": [ "GUN" ],
194195
"cooldown": 15,
195196
"move_cost": 120,
196197
"gun_type": "fake_watergun",

‎Kenan-Structured-Modpack/Tankmod_Revived/monsters.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"special_attacks": [
2727
[ "PARROT", 20 ],
2828
{
29-
"type": "gun",
29+
"type": "ITEM",
30+
"subtypes": [ "GUN" ],
3031
"cooldown": 5,
3132
"move_cost": 300,
3233
"gun_type": "tank_gun_auto_monster",

‎Kenan-Structured-Modpack/nocts_cata_mod_DDA/Monsters/c_monster_override.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
"revert_to_itype": "bot_laserturret",
5151
"special_attacks": [
5252
{
53-
"type": "gun",
53+
"type": "ITEM",
54+
"subtypes": [ "GUN" ],
5455
"cooldown": 1,
5556
"gun_type": "laser_cannon",
5657
"fake_skills": [ [ "gun", 4 ], [ "rifle", 8 ] ],

0 commit comments

Comments
 (0)