Skip to content

Commit

Permalink
Merge pull request CleverRaven#76702 from Uwuewsky/no-i18n-monster
Browse files Browse the repository at this point in the history
Don't extract the remaining abstract things
  • Loading branch information
Maleclypse authored Sep 28, 2024
2 parents 5213009 + 5d0697c commit de3f2b6
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 38 deletions.
12 changes: 6 additions & 6 deletions data/json/item_spell_effects.json
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
8 changes: 4 additions & 4 deletions data/json/monsters/LIXA_monsters.json
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 Down Expand Up @@ -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 Down
21 changes: 15 additions & 6 deletions data/json/monsters/bird.json
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
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
23 changes: 13 additions & 10 deletions data/json/monsters/mammal.json
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
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
2 changes: 1 addition & 1 deletion data/json/monsters/zed_amalgamation.json
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
2 changes: 1 addition & 1 deletion data/json/monsters/zed_dormant.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"id": "mon_pseudo_dormant_zombie",
"type": "MONSTER",
"name": { "str": "zombie" },
"description": "Fake zombie used for spawning dormant zombies. If you see this, open an issue on github.",
"description": { "str": "Fake zombie used for spawning dormant zombies. If you see this, open an issue on github.", "//~": "NO_I18N" },
"copy-from": "mon_zombie",
"looks_like": "corpse_mon_zombie",
"hp": 5,
Expand Down

0 comments on commit de3f2b6

Please sign in to comment.