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.

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

JSONize yugg gene sting #74352

Merged
merged 25 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
23d1515
JSONize yugg gene sting
Maleclypse Jun 6, 2024
a32179b
Update data/json/monster_special_attacks/monster_gun.json
Maleclypse Jun 6, 2024
9c64493
Update generic_guns_validator.py
Maleclypse Jun 6, 2024
3373a62
Merge branch 'JSONIZE-Yugg-attack' of https://github.com/Maleclypse/C…
Maleclypse Jun 6, 2024
01e6612
Apply suggestions from code review
Maleclypse Jun 6, 2024
495114a
Apply suggestions from code review
Maleclypse Jun 6, 2024
608f94f
Update tools/json_tools/generic_guns_validator.py
Maleclypse Jun 6, 2024
543d2c2
Apply suggestions from code review
Maleclypse Jun 6, 2024
0475396
Update data/json/monster_special_attacks/spells.json
Maleclypse Jun 6, 2024
50466db
Update data/json/monsters/nether.json
Maleclypse Jun 6, 2024
d06248d
Apply suggestions from code review
Maleclypse Jun 6, 2024
48c5058
Update data/json/monster_special_attacks/spells.json
Maleclypse Jun 6, 2024
c94fbec
Update nether.json
Maleclypse Jun 7, 2024
5518106
Apply suggestions from code review
Maleclypse Jun 7, 2024
51a5f4b
Update data/json/monster_special_attacks/spells.json
Maleclypse Jun 7, 2024
535d6bb
fix
Maleclypse Jun 7, 2024
d8f38a3
Update data/json/monster_special_attacks/spells.json
Maleclypse Jun 7, 2024
76aec00
Update spells.json
Maleclypse Jun 8, 2024
e2a8d57
Merge branch 'JSONIZE-Yugg-attack' of https://github.com/Maleclypse/C…
Maleclypse Jun 8, 2024
59b002e
Update data/json/monster_special_attacks/spells.json
Maleclypse Jun 12, 2024
d034527
Apply suggestions from code review
Maleclypse Jun 12, 2024
c09e319
Update data/json/monster_special_attacks/spells.json
Maleclypse Jun 12, 2024
753546d
Update data/json/monster_special_attacks/spells.json
GuardianDll Jun 13, 2024
4837839
Update spells.json
Maleclypse Jun 15, 2024
4f3d7c5
Stop Mutation Selector from firing
Maleclypse Jun 15, 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
5 changes: 5 additions & 0 deletions data/json/ammo_effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
"type": "ammo_effect",
"//": "Heavily stuns the target. Hardcoded"
},
{
"id": "GENE_STING",
"type": "ammo_effect",
"spell_data": { "id": "spell_gene_sting" }
},
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
{
"id": "DRAW_AS_LINE",
"type": "ammo_effect",
Expand Down
20 changes: 20 additions & 0 deletions data/json/items/ammo/barb.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,25 @@
"show_stats": true,
"effects": [ "PARALYZEPOISON" ],
"melee_damage": { "bash": 6, "cut": 2 }
},
{
"type": "AMMO",
"id": "gene_sting_barb",
"price": "4 USD",
"name": { "str": "gene sting barb" },
"symbol": "=",
"color": "cyan",
"description": "Tiny droplets of cyan venom trickle out of the sponge-like tissue of this sharp barb.",
"material": [ "bone" ],
"volume": "250 ml",
"weight": "37 g",
"ammo_type": "barb",
"damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 5 },
"dispersion": 120,
"loudness": 0,
"count": 10,
"show_stats": true,
"effects": [ "GENE_STING" ],
"melee_damage": { "bash": 6, "cut": 2 }
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
}
]
6 changes: 6 additions & 0 deletions data/json/items/ammo_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@
"name": "barb",
"default": "barb_paralysis"
},
{
"type": "ammunition_type",
"id": "gene_sting_barb",
"name": "yugg stinger",
"default": "gene_sting_barb"
},
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
{
"type": "ammunition_type",
"id": "BB",
Expand Down
35 changes: 35 additions & 0 deletions data/json/monster_special_attacks/monster_gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,41 @@
"durability": 8,
"melee_damage": { "bash": 2 }
},
{
"id": "gene_sting_launcher",
"type": "GUN",
"symbol": "%",
"color": "red",
"name": { "str": "barb launching organ" },
"description": "A mutated organ capable of launching bony barbs at great speed.",
"material": [ "hflesh" ],
"flags": [
"PRIMITIVE_RANGED_WEAPON",
"GENE_STING",
"PSEUDO",
"NEVER_JAMS",
"NONCONDUCTIVE",
"NO_REPAIR",
"WATERPROOF_GUN",
"NO_SALVAGE",
"NO_UNLOAD",
"RELOAD_AND_SHOOT"
],
"skill": "pistol",
"ammo": [ "gene_sting_barb" ],
"clip_size": 1,
"weight": "540 g",
"volume": "750 ml",
"longest_side": "25 cm",
"to_hit": 1,
"reload_noise_volume": 2,
"loudness": 2,
"range": 12,
"dispersion": 100,
"durability": 8,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting_barb": 1 } } ],
"melee_damage": { "bash": 2 }
},
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
{
"id": "feral_human_thrown_rock",
"type": "GUN",
Expand Down
282 changes: 282 additions & 0 deletions data/json/monster_special_attacks/spells.json
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,288 @@
"min_field_intensity": 1,
"max_field_intensity": 2
},
{
"type": "SPELL",
"id": "spell_gene_sting",
"name": { "str": "Gene Sting" },
"description": "Yugg attack which causes random mutation.",
"copy-from": "base_portal",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"min_damage": 1,
"max_damage": 1,
"effect_str": "EOC_gene_sting_selector"
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_selector",
"condition": "u_is_character",
"effect": [
{ "u_message": "The Yugg's barb injects you with something!", "type": "bad" },
{
"weighted_list_eocs": [
[ "EOC_gene_sting_chimera", 6 ],
[ "EOC_gene_sting_insect", 2 ],
[ "EOC_gene_sting_alpha", 1 ],
[ "EOC_gene_sting_ursine", 2 ],
[ "EOC_gene_sting_chiropteran", 2 ],
[ "EOC_gene_sting_medical", 1 ],
[ "EOC_gene_sting_bird", 2 ],
[ "EOC_gene_sting_lupine", 2 ],
[ "EOC_gene_sting_slime", 1 ],
[ "EOC_gene_sting_rat", 2 ],
[ "EOC_gene_sting_plant", 2 ],
[ "EOC_gene_sting_raptor", 1 ],
[ "EOC_gene_sting_batrachian", 2 ],
[ "EOC_gene_sting_mouse", 2 ],
[ "EOC_gene_sting_elfa", 1 ],
[ "EOC_gene_sting_cepholapod", 2 ],
[ "EOC_gene_sting_fish", 2 ],
[ "EOC_gene_sting_gastropod", 2 ],
[ "EOC_gene_sting_rabbit", 2 ],
[ "EOC_gene_sting_human", 2 ],
[ "EOC_gene_sting_beast", 2 ],
[ "EOC_gene_sting_feline", 2 ],
[ "EOC_gene_sting_cattle", 2 ],
[ "EOC_gene_sting_lizard", 2 ],
[ "EOC_gene_sting_troglobite", 2 ],
[ "EOC_gene_sting_crustacean", 2 ]
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_chimera",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "CHIMERA", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_insect",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "INSECT", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_alpha",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "ALPHA", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_ursine",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "URSINE", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_chiropteran",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "CHIROPTERAN", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_medical",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "MEDICAL", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_lupine",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "LUPINE", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_bird",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "BIRD", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_slime",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "SLIME", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_rat",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "RAT", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_plant",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "PLANT", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_raptor",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "RAPTOR", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_batrachian",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "BATRACHIAN", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_elfa",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "ELFA", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_mouse",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "MOUSE", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_cepholapod",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "CEPHALOPOD", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_gastropod",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "GASTROPOD", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_fish",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "FISH", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_rabbit",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "RABBIT", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_human",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "HUMAN", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_beast",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "BEAST", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_feline",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "FELINE", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_cattle",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "CATTLE", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_lizard",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "LIZARD", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_troglobite",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "TROGLOBITE", "use_vitamins": false }
]
},
{
"type": "effect_on_condition",
"id": "EOC_gene_sting_crustacean",
"condition": "u_is_character",
"effect": [
{ "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
{ "u_mutate_category": "CRUSTACEAN", "use_vitamins": false }
]
},
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
{
"type": "SPELL",
"id": "base_portal",
Expand Down
10 changes: 9 additions & 1 deletion data/json/monsters/nether.json
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,15 @@
"families": [ "prof_wp_netherium_abomination" ],
"weakpoint_sets": [ "wps_netherium_abomination" ],
"harvest": "meatslug",
"special_attacks": [ [ "GENE_STING", 20 ] ],
"special_attacks": [
{
"type": "gun",
"cooldown": 2,
"gun_type": "gene_sting_launcher",
"ranges": [ [ 2, 24, "DEFAULT" ] ],
"description": "The yugg launches a viscous barb!"
}
],
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "BASHES", "DESTROYS", "POISON", "VENOM", "NO_BREATHE", "DIGS" ],
"armor": { "bash": 6, "electric": 3 }
},
Expand Down
Loading
Loading