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.

Sign up for GitHub

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

Don't extract the remaining abstract things #76702

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Don't extract the remaining abstract things #76702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions data/json/item_spell_effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"id": "dragon_inflatable",
"type": "SPELL",
"name": { "str": "Inflatable Dragon" },
"description": "Creates a short-lived inflatable.",
"name": { "str": "Inflatable Dragon", "//~": "NO_I18N" },
"description": { "str": "Creates a short-lived inflatable.", "//~": "NO_I18N" },
"valid_targets": [ "ground" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"effect": "summon",
Expand All @@ -22,8 +22,8 @@
{
"id": "ghost_inflatable",
"type": "SPELL",
"name": { "str": "Inflatable Ghost" },
"description": "Creates a short-lived inflatable.",
"name": { "str": "Inflatable Ghost", "//~": "NO_I18N" },
"description": { "str": "Creates a short-lived inflatable.", "//~": "NO_I18N" },
"valid_targets": [ "ground" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"effect": "summon",
Expand All @@ -42,8 +42,8 @@
{
"id": "fog_machine",
"type": "SPELL",
"name": { "str": "Fog Ex Machina" },
"description": "You see fog bubbling out of the device.",
"name": { "str": "Fog Ex Machina", "//~": "NO_I18N" },
"description": { "str": "You see fog bubbling out of the device.", "//~": "NO_I18N" },
"effect": "attack",
"shape": "cone",
"valid_targets": [ "ally", "hostile", "ground" ],
Expand Down
28 changes: 14 additions & 14 deletions data/json/monsters/LIXA_monsters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"id": "LIXA_spit_light",
"type": "GUN",
"copy-from": "fake_item",
"name": { "str": "photonic gun" },
"description": "Horks up a glob of congealed light.",
"name": { "str": "photonic gun", "//~": "NO_I18N" },
"description": { "str": "Horks up a glob of congealed light.", "//~": "NO_I18N" },
"flags": [ "NEVER_JAMS", "NO_TURRET" ],
"ammo_effects": [ "BLINDS_EYES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING", "NO_PENETRATE_OBSTACLES" ],
"skill": "rifle",
Expand All @@ -16,8 +16,8 @@
{
"type": "SPELL",
"id": "LIXA_spread_light",
"name": { "str": "Spread Light" },
"description": "Splashes congealed light along the ground in a cone.",
"name": { "str": "Spread Light", "//~": "NO_I18N" },
"description": { "str": "Splashes congealed light along the ground in a cone.", "//~": "NO_I18N" },
"valid_targets": [ "hostile", "ground" ],
"max_level": 1,
"flags": [ "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ],
Expand All @@ -36,8 +36,8 @@
{
"id": "LIXA_photonic_death",
"type": "SPELL",
"name": { "str": "Photonic Death" },
"description": "Puddle o' light.",
"name": { "str": "Photonic Death", "//~": "NO_I18N" },
"description": { "str": "Puddle o' light.", "//~": "NO_I18N" },
"valid_targets": [ "ground", "self", "hostile" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"shape": "blast",
Expand All @@ -54,8 +54,8 @@
{
"type": "SPELL",
"id": "LIXA_spawn_copy",
"name": { "str": "Summon Eigenspectre Copy" },
"description": "Ripping off the hounds of Tindalos!",
"name": { "str": "Summon Eigenspectre Copy", "//~": "NO_I18N" },
"description": { "str": "Ripping off the hounds of Tindalos!", "//~": "NO_I18N" },
"flags": [ "HOSTILE_SUMMON", "RANDOM_DAMAGE", "PERMANENT", "NO_EXPLOSION_SFX" ],
"valid_targets": [ "ground", "self" ],
"min_damage": 1,
Expand All @@ -71,8 +71,8 @@
"id": "LIXA_vector_volley",
"type": "GUN",
"copy-from": "fake_item",
"name": { "str": "coordinate rotation volley" },
"description": "Fake gun that fires, uh. Coordinate transform matrices?",
"name": { "str": "coordinate rotation volley", "//~": "NO_I18N" },
"description": { "str": "Fake gun that fires, uh. Coordinate transform matrices?", "//~": "NO_I18N" },
"flags": [ "NEVER_JAMS", "NO_TURRET" ],
"modes": [ [ "DEFAULT", "auto", 3 ] ],
"ammo_effects": [ "BLINDS_EYES", "NO_PENETRATE_OBSTACLES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING" ],
Expand All @@ -85,8 +85,8 @@
{
"type": "SPELL",
"id": "LIXA_reshuffle_cone",
"name": { "str": "an arc of coordinate reassignment" },
"description": "Spawns LIXA reshuffle.",
"name": { "str": "an arc of coordinate reassignment", "//~": "NO_I18N" },
"description": { "str": "Spawns LIXA reshuffle.", "//~": "NO_I18N" },
"effect": "attack",
"shape": "cone",
"valid_targets": [ "hostile", "ground" ],
Expand Down Expand Up @@ -114,8 +114,8 @@
{
"type": "SPELL",
"id": "mon_LIXA_vector_death",
"name": { "str": "Unfold Collapse" },
"description": "Ends the fight.",
"name": { "str": "Unfold Collapse", "//~": "NO_I18N" },
"description": { "str": "Ends the fight.", "//~": "NO_I18N" },
"valid_targets": [ "hostile" ],
"max_level": 1,
"flags": [ "SILENT", "NO_HANDS", "NO_LEGS" ],
Expand Down
21 changes: 15 additions & 6 deletions data/json/monsters/bird.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
{
"abstract": "mon_bird_flying_base",
"type": "MONSTER",
"name": { "str": "flying bird abstract" },
"description": "This is an abstract monster for other flying birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can fly, but cannot swim.",
"name": { "str": "flying bird abstract", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract monster for other flying birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can fly, but cannot swim.",
"//~": "NO_I18N"
},
"bodytype": "bird",
"default_faction": "bird_small_flying",
"categories": [ "WILDLIFE" ],
Expand Down Expand Up @@ -47,8 +50,11 @@
{
"abstract": "mon_bird_flightless_base",
"type": "MONSTER",
"name": { "str": "flightless bird abstract" },
"description": "This is an abstract monster for other flightless birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can neither fly nor swim.",
"name": { "str": "flightless bird abstract", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract monster for other flightless birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can neither fly nor swim.",
"//~": "NO_I18N"
},
"copy-from": "mon_bird_flying_base",
"default_faction": "bird_small_flightless",
"speed": 105,
Expand All @@ -57,8 +63,11 @@
{
"abstract": "mon_bird_water_base",
"type": "MONSTER",
"name": { "str": "water bird abstract" },
"description": "This is an abstract monster for other water birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can both fly and swim.",
"name": { "str": "water bird abstract", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract monster for other water birds to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug. Use this when your bird can both fly and swim.",
"//~": "NO_I18N"
},
"copy-from": "mon_bird_flying_base",
"default_faction": "bird_small_waterfowl",
"speed": 85,
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/insect_spider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"abstract": "mon_larva_abstract",
"type": "MONSTER",
"name": { "str": "larva", "str_pl": "larvae" },
"description": "A fake monster. If you're seeing this something went wrong.",
"name": { "str": "larva", "str_pl": "larvae", "//~": "NO_I18N" },
"description": { "str": "A fake monster. If you're seeing this something went wrong.", "//~": "NO_I18N" },
"default_faction": "insect",
"bodytype": "insect",
"species": [ "INSECT" ],
Expand Down
24 changes: 12 additions & 12 deletions data/json/monsters/lab_security_drones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"id": "green_maintenance_check",
"type": "SPELL",
"name": { "str": "Green Maintenance Badge Trait" },
"description": "Adds trait for badge check.",
"name": { "str": "Green Maintenance Badge Trait", "//~": "NO_I18N" },
"description": { "str": "Adds trait for badge check.", "//~": "NO_I18N" },
"valid_targets": [ "hostile" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"message": "the drone scans for your ID badge.",
Expand Down Expand Up @@ -68,9 +68,9 @@
{
"id": "yellow_maintenance_check",
"type": "SPELL",
"name": { "str": "Ocher Maintenance Badge Trait" },
"name": { "str": "Ocher Maintenance Badge Trait", "//~": "NO_I18N" },
"//": "renamed player facing name to ocher.",
"description": "Adds trait for badge check.",
"description": { "str": "Adds trait for badge check.", "//~": "NO_I18N" },
"valid_targets": [ "hostile" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"message": "the drone scans for your ID badge.",
Expand Down Expand Up @@ -129,8 +129,8 @@
{
"id": "blue_maintenance_check",
"type": "SPELL",
"name": { "str": "Blue Maintenance Badge Trait" },
"description": "Adds trait for badge check.",
"name": { "str": "Blue Maintenance Badge Trait", "//~": "NO_I18N" },
"description": { "str": "Adds trait for badge check.", "//~": "NO_I18N" },
"valid_targets": [ "hostile" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"message": "the drone scans for your ID badge.",
Expand Down Expand Up @@ -189,8 +189,8 @@
{
"id": "blue_maintenance_check2",
"type": "SPELL",
"name": { "str": "Blue Maintenance Badge Trait" },
"description": "Adds trait for badge check.",
"name": { "str": "Blue Maintenance Badge Trait", "//~": "NO_I18N" },
"description": { "str": "Adds trait for badge check.", "//~": "NO_I18N" },
"valid_targets": [ "hostile" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"message": "the drone scans for your ID badge.",
Expand Down Expand Up @@ -275,8 +275,8 @@
{
"id": "green_researcher_check",
"type": "SPELL",
"name": { "str": "Light Green Researcher Badge Trait" },
"description": "Adds trait for badge check.",
"name": { "str": "Light Green Researcher Badge Trait", "//~": "NO_I18N" },
"description": { "str": "Adds trait for badge check.", "//~": "NO_I18N" },
"valid_targets": [ "hostile" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"message": "the drone scans for your ID badge.",
Expand Down Expand Up @@ -350,8 +350,8 @@
{
"id": "black_security_check",
"type": "SPELL",
"name": { "str": "Black Security Badge Trait" },
"description": "Adds trait for badge check.",
"name": { "str": "Black Security Badge Trait", "//~": "NO_I18N" },
"description": { "str": "Adds trait for badge check.", "//~": "NO_I18N" },
"valid_targets": [ "hostile" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"message": "the drone scans for your ID badge.",
Expand Down
23 changes: 13 additions & 10 deletions data/json/monsters/mammal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"id": "mon_human",
"type": "MONSTER",
"name": { "str": "human" },
"description": "Placeholder for human corpses. If you see this, it's a bug.",
"name": { "str": "human", "//~": "NO_I18N" },
"description": { "str": "Placeholder for human corpses. If you see this, it's a bug.", "//~": "NO_I18N" },
"bodytype": "human",
"copy-from": "mon_zombie",
"harvest": "human",
Expand All @@ -16,8 +16,8 @@
{
"id": "mon_human_scorched",
"type": "MONSTER",
"name": { "str": "charred human" },
"description": "Placeholder for charred human corpses. If you see this, it's a bug.",
"name": { "str": "charred human", "//~": "NO_I18N" },
"description": { "str": "Placeholder for charred human corpses. If you see this, it's a bug.", "//~": "NO_I18N" },
"bodytype": "human",
"copy-from": "mon_zombie_scorched",
"harvest": "human",
Expand All @@ -30,8 +30,8 @@
{
"id": "mon_child",
"type": "MONSTER",
"name": { "str": "child", "str_pl": "children" },
"description": "Placeholder for children corpses. If you see this, it's a bug.",
"name": { "str": "child", "str_pl": "children", "//~": "NO_I18N" },
"description": { "str": "Placeholder for children corpses. If you see this, it's a bug.", "//~": "NO_I18N" },
"bodytype": "human",
"copy-from": "mon_zombie_child",
"symbol": "h",
Expand Down Expand Up @@ -1109,8 +1109,11 @@
{
"abstract": "mon_dog_small",
"type": "MONSTER",
"name": { "str": "Small dog abstract" },
"description": "This is an abstract for small dogs to copy from, so that they are less likely to mess up fields like zombification by accident.",
"name": { "str": "small dog abstract", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract for small dogs to copy from, so that they are less likely to mess up fields like zombification by accident.",
"//~": "NO_I18N"
},
"copy-from": "mon_dog",
"volume": "10 L",
"weight": "6 kg",
Expand Down Expand Up @@ -2228,7 +2231,7 @@
"abstract": "mon_rabbit_base",
"type": "MONSTER",
"name": { "str": "rabbit" },
"description": "Rabbit abstract",
"description": { "str": "rabbit abstract", "//~": "NO_I18N" },
"default_faction": "mammal_small",
"bodytype": "pig",
"categories": [ "WILDLIFE" ],
Expand Down Expand Up @@ -2268,7 +2271,7 @@
{
"abstract": "mon_rabbit_baby_base",
"type": "MONSTER",
"name": { "str": "rabbit kit abstract" },
"name": { "str": "rabbit kit abstract", "//~": "NO_I18N" },
"copy-from": "mon_rabbit_base",
"volume": "150 ml",
"weight": "30 g",
Expand Down
28 changes: 20 additions & 8 deletions data/json/monsters/reptile_amphibian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
{
"abstract": "mon_snake_abstract",
"type": "MONSTER",
"name": { "str": "abstract snake" },
"description": "This is an abstract monster for other snakes to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"name": { "str": "abstract snake", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract monster for other snakes to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"//~": "NO_I18N"
},
"default_faction": "snake_small",
"bodytype": "snake",
"categories": [ "WILDLIFE" ],
Expand Down Expand Up @@ -48,8 +51,11 @@
{
"abstract": "mon_snakelet_abstract",
"type": "MONSTER",
"name": { "str": "abstract snakelet" },
"description": "This is an abstract monster for other snakelets to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"name": { "str": "abstract snakelet", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract monster for other snakelets to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"//~": "NO_I18N"
},
"copy-from": "mon_snake_abstract",
"volume": "10 ml",
"weight": "10 g",
Expand All @@ -64,8 +70,11 @@
{
"abstract": "mon_turtle_abstract",
"type": "MONSTER",
"name": { "str": "abstract turtle" },
"description": "This is an abstract monster for other turtles to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"name": { "str": "abstract turtle", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract monster for other turtles to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"//~": "NO_I18N"
},
"default_faction": "turtle_small",
"bodytype": "turtle",
"categories": [ "WILDLIFE" ],
Expand Down Expand Up @@ -96,8 +105,11 @@
{
"abstract": "mon_turtle_baby_abstract",
"type": "MONSTER",
"name": { "str": "abstract turtle hatchling" },
"description": "This is an abstract monster for other turtle hatchlings to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"name": { "str": "abstract turtle hatchling", "//~": "NO_I18N" },
"description": {
"str": "This is an abstract monster for other turtle hatchlings to copy from, so that we have some common foundation to work with. If it appears in the game that's a bug.",
"//~": "NO_I18N"
},
"copy-from": "mon_turtle_abstract",
"volume": "15 ml",
"weight": "15 g",
Expand Down
15 changes: 9 additions & 6 deletions data/json/monsters/singularities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
{
"id": "LTNT_LIFE_DRAIN",
"type": "SPELL",
"name": { "str": "Life Drain" },
"description": "When even the grass rises against you, what hope do you have?",
"name": { "str": "Life Drain", "//~": "NO_I18N" },
"description": { "str": "When even the grass rises against you, what hope do you have?", "//~": "NO_I18N" },
"flags": [ "NO_EXPLOSION_SFX" ],
"valid_targets": [ "hostile" ],
"shape": "blast",
Expand All @@ -125,8 +125,11 @@
{
"id": "LTNT_attract_nearby",
"type": "SPELL",
"name": { "str": "Visual Sundering" },
"description": "The fact a shadow can make such an awful, loud sound makes your head want to split in two.",
"name": { "str": "Visual Sundering", "//~": "NO_I18N" },
"description": {
"str": "The fact a shadow can make such an awful, loud sound makes your head want to split in two.",
"//~": "NO_I18N"
},
"flags": [ "NO_EXPLOSION_SFX" ],
"valid_targets": [ "ground", "hostile" ],
"shape": "blast",
Expand Down Expand Up @@ -420,8 +423,8 @@
"type": "SPELL",
"//": "This is a hack because npc_die is not working(?!) for EOC_KILL_SHADOW",
"id": "BEGONE_SHADOW",
"name": { "str": "BEGONE_SHADOW" },
"description": "BEGONE_SHADOW.",
"name": { "str": "BEGONE_SHADOW", "//~": "NO_I18N" },
"description": { "str": "BEGONE_SHADOW.", "//~": "NO_I18N" },
"valid_targets": [ "ground", "self" ],
"base_casting_time": 0,
"min_damage": 1000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/zed_amalgamation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
{
"type": "MONSTER",
"abstract": "mon_amalgamation_abstract_small",
"name": { "str": "abstracted amalgamation" },
"name": { "str": "abstracted amalgamation", "//~": "NO_I18N" },
"color": "white",
"symbol": "a",
"bodytype": "spider",
Expand Down
Loading
Loading