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

Yugg Gun to fix issues with gene sting #75079

Merged
merged 30 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
839d811
yugg gun
Maleclypse Jul 18, 2024
83c018c
Update data/json/monster_special_attacks/monster_gun.json
Maleclypse Jul 18, 2024
1b52890
Fix
Maleclypse Jul 18, 2024
4ca4d19
Merge branch 'Yugg-genesting-gun' of https://github.com/Maleclypse/Ca…
Maleclypse Jul 18, 2024
d41432c
Update generic_guns_validator.py
Maleclypse Jul 18, 2024
f92b6ce
burrowing nether
Maleclypse Jul 18, 2024
d4ecb65
Update tools/json_tools/generic_guns_validator.py
Maleclypse Jul 18, 2024
b0281f6
Update generic_guns_validator.py
Maleclypse Jul 18, 2024
fee8516
Update monster_gun.json
Maleclypse Jul 18, 2024
c5adc30
Update monster_gun.json
Maleclypse Jul 18, 2024
40a7f2d
Update monster_gun.json
Maleclypse Jul 18, 2024
f890189
fix
Maleclypse Jul 18, 2024
5fded1d
Update data/json/monster_special_attacks/monster_gun.json
Maleclypse Jul 19, 2024
4c50ec2
Fixes
Maleclypse Jul 19, 2024
e5b0aae
Fixes
Maleclypse Jul 19, 2024
84f4d96
Update data/json/species.json
Maleclypse Jul 19, 2024
63a31e6
Damage type
Maleclypse Jul 21, 2024
4f693b4
Update spells.json
Maleclypse Jul 21, 2024
d443697
Update spells.json
Maleclypse Jul 22, 2024
71ad208
Update spells.json
Maleclypse Jul 22, 2024
417b8f1
It works!
Maleclypse Jul 22, 2024
e0c700f
Apply suggestions from code review
Maleclypse Jul 22, 2024
a2c26e3
Update data/json/items/ammo/barb.json
Maleclypse Jul 22, 2024
ba89ee2
Update data/json/items/ammo/barb.json
Maleclypse Jul 22, 2024
186fbec
Update data/json/items/ammo/barb.json
Maleclypse Jul 23, 2024
d2f6c12
Update data/json/items/ammo/barb.json
Maleclypse Jul 23, 2024
dbbf841
Update data/json/items/ammo/barb.json
Maleclypse Jul 23, 2024
d3e9f9c
Update data/json/ammo_effects.json
Maleclypse Jul 23, 2024
3dd289b
Update junk_dps.json
Maleclypse Jul 24, 2024
561c64f
Merge branch 'master' into Yugg-genesting-gun
Maleclypse Jul 24, 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 @@ -368,6 +368,11 @@
"type": "ammo_effect",
"explosion": { "power": 7980, "shrapnel": { "casing_mass": 8725, "fragment_mass": 0.5 } }
},
{
"id": "GENE_STING",
"type": "ammo_effect",
"spell_data": { "id": "spell_gene_sting" }
},
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
{
"id": "FLASHBANG",
"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",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"ammo_type": "gene_sting",
"damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 5 },
"dispersion": 120,
"loudness": 0,
"count": 10,
"show_stats": true,
"effects": [ "GENE_STING" ],
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"melee_damage": { "bash": 6, "cut": 2 }
}
]
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",
"name": "yugg stinger",
"default": "gene_sting_barb"
},
{
"type": "ammunition_type",
"id": "BB",
Expand Down
34 changes: 34 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,40 @@
"durability": 8,
"melee_damage": { "bash": 2 }
},
{
"id": "gene_sting_gun",
"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",
"PSEUDO",
"NEVER_JAMS",
"NONCONDUCTIVE",
"NO_REPAIR",
"WATERPROOF_GUN",
"NO_SALVAGE",
"NO_UNLOAD",
"RELOAD_AND_SHOOT"
],
"skill": "pistol",
"ammo": [ "gene_sting" ],
"clip_size": 1,
"weight": "540 g",
"volume": "750 ml",
"longest_side": "25 cm",
"to_hit": 1,
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"reload_noise_volume": 2,
"loudness": 2,
"range": 12,
"dispersion": 100,
"durability": 8,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting_barb": 15 } } ],
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"melee_damage": { "bash": 2 }
},
{
"id": "feral_human_thrown_rock",
"type": "GUN",
Expand Down
12 changes: 10 additions & 2 deletions data/json/monsters/nether.json
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,7 @@
"description": "A huge, slimy worm-like creature. Its pale, flattened head drips an oily mucus as it breaches the ground, searching for prey. Its pinkish mouth opens and closes, revealing long fangs glistening with ropey strands of saliva, which leave smoldering stains wherever they drip.",
"default_faction": "nether",
"bodytype": "snake",
"species": [ "NETHER" ],
"species": [ "NETHER_BURROWING" ],
"diff": 10,
"volume": "600 L",
"weight": "800 kg",
Expand All @@ -1478,7 +1478,15 @@
"weakpoint_sets": [ "wps_netherium_abomination" ],
"harvest": "exempt",
"death_function": { "corpse_type": "NO_CORPSE", "eoc": "EOC_YUGG_DEATH" },
"special_attacks": [ { "type": "spell", "spell_data": { "id": "spell_gene_sting", "min_level": 5 }, "cooldown": 160 } ],
"special_attacks": [
{
"type": "gun",
"cooldown": 2,
"gun_type": "gene_sting_gun",
"ranges": [ [ 2, 24, "DEFAULT" ] ],
"description": "The yugg launches a viscous barb!"
}
],
"flags": [
"SEES",
"HEARS",
Expand Down
7 changes: 7 additions & 0 deletions data/json/species.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@
"description": "a nether creature",
"flags": [ "DRACULIN_IMMUNE" ]
},
{
"type": "SPECIES",
"id": "NETHER_BURROWING",
"description": "a nether creature",
"footsteps": "slithering",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"flags": [ "DRACULIN_IMMUNE" ]
},
{
"type": "SPECIES",
"id": "NETHER_EMANATION",
Expand Down
2 changes: 2 additions & 0 deletions tools/json_tools/generic_guns_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
'chemical_spray',
'fishspear',
'flammable',
'gene_sting_barb',
'm235', # Rocket
'metal_rail',
'nail',
Expand Down Expand Up @@ -56,6 +57,7 @@
'ksg-25',
'raging_judge',
'american_180',
'gene_sting_gun',
'ppsh',
'af2011a1_38super',
# Magazines
Expand Down
Loading