Skip to content

Commit

Permalink
Merge pull request #77498 from Uwuewsky/no-i18n-main
Browse files Browse the repository at this point in the history
NO_I18N for base game
  • Loading branch information
Maleclypse authored Nov 3, 2024
2 parents 00c818b + e557031 commit c825d95
Show file tree
Hide file tree
Showing 50 changed files with 523 additions and 327 deletions.
2 changes: 1 addition & 1 deletion data/core/weather.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
"id": "null",
"type": "weather_type",
"name": "NULL Weather - BUG",
"name": { "str": "NULL Weather - BUG", "//~": "NO_I18N" },
"color": "magenta",
"map_color": "magenta_red",
"sym": "0",
Expand Down
12 changes: 6 additions & 6 deletions data/json/furniture_and_terrain/furniture-fakes.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"type": "furniture",
"id": "f_clear",
"//": "This is used to clear a tile of furniture used by 'rows' during mapgen",
"name": "seeing this is a bug",
"description": "Seeing this is a bug. If seen, please report and destroy.",
"name": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"description": { "str": "Seeing this is a bug. If seen, please report and destroy.", "//~": "NO_I18N" },
"symbol": "#",
"color": "black",
"move_cost_mod": 2,
Expand All @@ -14,8 +14,8 @@
{
"type": "furniture",
"id": "f_fake_bench_hands",
"name": "fake workbench hands",
"description": "This fake workbench holds the stats for working on a wielded item.",
"name": { "str": "fake workbench hands", "//~": "NO_I18N" },
"description": { "str": "This fake workbench holds the stats for working on a wielded item.", "//~": "NO_I18N" },
"symbol": "#",
"color": "red",
"move_cost_mod": 2,
Expand Down Expand Up @@ -43,8 +43,8 @@
"type": "furniture",
"id": "f_no_item",
"//": "This is used in a hack to clear furniture with the keg iexamine of all items except the stored liquid before usage.",
"name": "seeing this is a bug",
"description": "Seeing this is a bug. If seen, please report and destroy.",
"name": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"description": { "str": "Seeing this is a bug. If seen, please report and destroy.", "//~": "NO_I18N" },
"symbol": "#",
"color": "black",
"move_cost_mod": 2,
Expand Down
18 changes: 9 additions & 9 deletions data/json/items/basecamp.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
{
"id": "fake_char_kiln",
"//": "The stationary object needs a larger capacity than the portable base object",
"//2": "A fake kiln used for basecamps.",
"type": "TOOL",
"copy-from": "fake_crafting_tool",
"name": { "str": "basecamp kiln" },
"description": "A fake kiln used for basecamps.",
"sub": "char_kiln",
"ammo": [ "charcoal" ],
"//1": "250 liters of materials can produce 100 liters of charcoal.",
Expand All @@ -14,10 +14,10 @@
{
"id": "fake_char_smoker",
"//": "The stationary object needs a larger capacity than the portable base object",
"//2": "A fake charcoal smoker used for basecamps.",
"type": "TOOL",
"copy-from": "fake_crafting_tool",
"name": { "str": "basecamp charcoal smoker" },
"description": "A fake charcoal smoker used for basecamps.",
"sub": "char_smoker",
"ammo": [ "charcoal" ],
"//1": "holds 450 liters of charcoal. a full smoking rack cycle of 20L of stuff would consume 15,000 charcoal (75 liters, 15.6kg of charcoal)",
Expand All @@ -26,20 +26,20 @@
{
"id": "fake_forge",
"//": "The stationary object needs a larger capacity than the portable base object",
"//1": "A fake charcoal forge used for basecamps.",
"type": "TOOL",
"name": { "str": "basecamp forge" },
"copy-from": "char_forge",
"description": "A fake charcoal forge used for basecamps.",
"extend": { "flags": [ "ALLOWS_REMOTE_USE", "ZERO_WEIGHT", "PSEUDO" ] },
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 2000, "coal": 10000 } } ]
},
{
"id": "fake_clay_kiln",
"//": "The stationary object needs a larger capacity than the portable base object",
"//1": "A fake clay kiln used for basecamps.",
"type": "TOOL",
"copy-from": "fake_crafting_tool",
"name": { "str": "basecamp clay kiln" },
"description": "A fake clay kiln used for basecamps.",
"sub": "brick_kiln",
"ammo": [ "charcoal", "coal" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "charcoal": 2000, "coal": 10000 } } ]
Expand All @@ -49,7 +49,7 @@
"type": "TOOL",
"copy-from": "fake_crafting_tool",
"name": { "str": "basecamp fireplace" },
"description": "A fake fireplace used for basecamps.",
"//": "A fake fireplace used for basecamps.",
"sub": "hotplate",
"ammo": [ "tinder" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "tinder": 50000 } } ],
Expand All @@ -60,7 +60,7 @@
"type": "TOOL",
"copy-from": "fake_crafting_tool",
"name": { "str": "basecamp stove" },
"description": "A fake stove used for basecamps.",
"//": "A fake stove used for basecamps.",
"sub": "hotplate",
"ammo": [ "tinder" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "tinder": 50000 } } ],
Expand All @@ -71,21 +71,21 @@
"type": "TOOL",
"copy-from": "fake_item",
"name": { "str": "basecamp drop hammer" },
"description": "A fake drop hammer used for basecamps.",
"//": "A fake drop hammer used for basecamps.",
"qualities": [ [ "HAMMER", 5 ], [ "ANVIL", 3 ] ]
},
{
"id": "parkour_practice",
"type": "TOOL",
"copy-from": "fake_item",
"name": { "str": "basecamp parkour gym" },
"description": "A fake parkour gym used for parkour training in basecamps."
"//": "A fake parkour gym used for parkour training in basecamps."
},
{
"id": "fake_digester_tank",
"type": "TOOL",
"copy-from": "fake_item",
"name": { "str": "small anaerobic digester tank" },
"description": "A fake tank for mixing biomass and water."
"//": "A fake tank for mixing biomass and water."
}
]
13 changes: 8 additions & 5 deletions data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@
"symbol": "%",
"calories": 70,
"vitamins": [ [ "veggy_allergen", 1 ] ],
"description": "Some grass, edible by grazers and ruminants only. Seeing this item is a bug.",
"description": { "str": "Some grass, edible by grazers and ruminants only. Seeing this item is a bug.", "//~": "NO_I18N" },
"price": "0 cent",
"price_postapoc": "0 cent",
"material": [ "veggy" ],
Expand All @@ -1264,7 +1264,10 @@
"symbol": "%",
"calories": 50,
"vitamins": [ [ "veggy_allergen", 1 ] ],
"description": "A small plant or flower, edible by grazers and ruminants only. Seeing this item is a bug.",
"description": {
"str": "A small plant or flower, edible by grazers and ruminants only. Seeing this item is a bug.",
"//~": "NO_I18N"
},
"price": "0 cent",
"price_postapoc": "0 cent",
"material": [ "veggy" ],
Expand All @@ -1281,7 +1284,7 @@
"symbol": "%",
"calories": 174,
"vitamins": [ [ "veggy_allergen", 1 ] ],
"description": "Some underbrush, edible by ruminants only. Seeing this item is a bug.",
"description": { "str": "Some underbrush, edible by ruminants only. Seeing this item is a bug.", "//~": "NO_I18N" },
"price": "0 cent",
"price_postapoc": "0 cent",
"material": [ "veggy" ],
Expand All @@ -1298,7 +1301,7 @@
"symbol": "%",
"calories": 130,
"vitamins": [ ],
"description": "Some nectar. Seeing this item is a bug.",
"description": { "str": "Some nectar. Seeing this item is a bug.", "//~": "NO_I18N" },
"price": "0 cent",
"price_postapoc": "0 cent",
"flags": [ "TRADER_AVOID" ],
Expand Down Expand Up @@ -1421,7 +1424,7 @@
"comestible_type": "FOOD",
"id": "camp_meal_small",
"name": { "str": "prepared meal (small)", "str_pl": "prepared meals (small)" },
"description": "I am an item used in faction camps. If you see this description, it is a bug.",
"description": { "str": "I am an item used in faction camps. If you see this description, it is a bug.", "//~": "NO_I18N" },
"weight": "250 g",
"volume": "250 ml",
"price": "100 cent",
Expand Down
19 changes: 11 additions & 8 deletions data/json/items/fake.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"abstract": "fake_item",
"type": "GENERIC",
"name": { "str": "fake item", "//~": "NO_I18N" },
"description": { "str": "Dummy item.", "//~": "NO_I18N" },
"description": { "str": "Dummy item. If you see this description, it is a bug.", "//~": "NO_I18N" },
"//": "Include ZERO_WEIGHT flag to avoid errors when instantiating pseudo items.",
"flags": [ "ZERO_WEIGHT", "TRADER_AVOID", "DEBUG_ONLY" ],
"weight": "1 g",
Expand All @@ -15,8 +15,8 @@
"id": "fake_crafting_tool",
"copy-from": "fake_item",
"type": "TOOL",
"name": { "str": "fake crafting tool" },
"description": "Used for practice recipes and the like.",
"name": { "str": "fake crafting tool", "//~": "NO_I18N" },
"description": { "str": "Used for practice recipes and the like. If you see this description, it is a bug.", "//~": "NO_I18N" },
"extend": { "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ] }
},
{
Expand Down Expand Up @@ -240,7 +240,7 @@
"id": "fake_power_tool",
"type": "TOOL",
"copy-from": "fake_item",
"name": { "str": "fake power tool" },
"name": { "str": "fake power tool", "//~": "NO_I18N" },
"ammo": [ "battery" ],
"extend": { "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO", "USE_UPS" ] }
},
Expand Down Expand Up @@ -418,8 +418,8 @@
"id": "pseudo_magazine",
"type": "MAGAZINE",
"category": "spare_parts",
"name": { "str": "pseudo magazine" },
"description": "Pseudo magazine for use in dirty vehicle hacks.",
"name": { "str": "pseudo magazine", "//~": "NO_I18N" },
"description": { "str": "Pseudo magazine for use in dirty vehicle hacks.", "//~": "NO_I18N" },
"flags": [ "PSEUDO", "ZERO_WEIGHT", "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "DEBUG_ONLY" ],
"ammo_type": [ "battery" ],
"capacity": 1000000,
Expand Down Expand Up @@ -486,8 +486,11 @@
"//": "This is used exclusively in the rescue mission for Barry to blow a hole in the scout tower.",
"type": "TOOL",
"category": "weapons",
"name": { "str": "fake 50lbs dynamite car bomb" },
"description": "Several sticks of explosives, bundled together with a fuse attached. Use this item to light the fuse. You will, of course, need a lighter or matches in your inventory to do this. Shortly after lighting the fuse, this item will explode, so get away!",
"name": { "str": "fake 50lbs dynamite car bomb", "//~": "NO_I18N" },
"description": {
"str": "Several sticks of explosives, bundled together with a fuse attached. Use this item to light the fuse. You will, of course, need a lighter or matches in your inventory to do this. Shortly after lighting the fuse, this item will explode, so get away!",
"//~": "NO_I18N"
},
"weight": "22680 g",
"volume": "15020 ml",
"price": 6000,
Expand Down
16 changes: 8 additions & 8 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"symbol": "?",
"color": "white",
"name": { "str_sp": "animal" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"stackable": true,
"price": "0 cent",
"volume": "1 L",
Expand All @@ -20,7 +20,7 @@
"symbol": "$",
"color": "red",
"name": { "str_sp": "nearby fire" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"price": "0 cent",
"volume": "1 ml",
"flags": [ "PSEUDO" ]
Expand All @@ -46,7 +46,7 @@
"symbol": "?",
"color": "white",
"name": { "str_sp": "muscle" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"stackable": true,
"price": "0 cent",
"volume": "1 L",
Expand All @@ -60,7 +60,7 @@
"symbol": "?",
"color": "white",
"name": { "str_sp": "wind" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"stackable": true,
"price": "0 cent",
"volume": "1 L",
Expand All @@ -74,7 +74,7 @@
"symbol": "?",
"color": "white",
"name": { "str_sp": "sun light" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"stackable": true,
"price": "0 cent",
"volume": "1 L",
Expand All @@ -88,7 +88,7 @@
"symbol": "?",
"color": "white",
"name": { "str": "metabolism" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"stackable": true,
"price": "0 cent",
"volume": "1 L",
Expand All @@ -102,7 +102,7 @@
"symbol": "$",
"color": "red",
"name": { "str_sp": "a smoking device and a source of flame" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"price": "0 cent",
"volume": "0 ml",
"flags": [ "PSEUDO" ]
Expand All @@ -113,7 +113,7 @@
"symbol": "$",
"color": "red",
"name": { "str_sp": "none" },
"description": "seeing this is a bug",
"description": { "str": "seeing this is a bug", "//~": "NO_I18N" },
"price": "0 cent",
"volume": "0 ml",
"flags": [ "PSEUDO" ],
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/gun/bio.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"id": "bio_emp_gun",
"type": "GUN",
"name": { "str": "EMP Projector" },
"description": "this a pseudo item",
"description": { "str": "this a pseudo item", "//~": "NO_I18N" },
"weight": "2950 g",
"volume": "2 L",
"price": "16 kUSD",
Expand All @@ -50,7 +50,7 @@
"id": "bio_laser_gun",
"type": "GUN",
"name": { "str": "laser finger" },
"description": "this a pseudo item",
"description": { "str": "this a pseudo item", "//~": "NO_I18N" },
"volume": "3 L",
"price": "0 cent",
"material": [ "steel", "plastic" ],
Expand All @@ -71,7 +71,7 @@
"id": "bio_lightning",
"type": "GUN",
"name": { "str": "Chain Lightning" },
"description": "this a pseudo item",
"description": { "str": "this a pseudo item", "//~": "NO_I18N" },
"volume": "3 L",
"price": "0 cent",
"material": [ "steel", "plastic" ],
Expand All @@ -92,7 +92,7 @@
"id": "mut_quills",
"type": "GUN",
"name": { "str_sp": "Assault barbs" },
"description": "this a pseudo item",
"description": { "str": "this a pseudo item", "//~": "NO_I18N" },
"volume": "3 L",
"price": "0 cent",
"material": [ "steel", "plastic" ],
Expand All @@ -111,7 +111,7 @@
"id": "mut_longpull",
"type": "GUN",
"name": { "str": "Ranged pulling implement" },
"description": "this a pseudo item",
"description": { "str": "this a pseudo item", "//~": "NO_I18N" },
"volume": "100 ml",
"price": "0 cent",
"material": [ "steel", "plastic" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/software.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": { "str_sp": "software" },
"symbol": "#",
"container": "usb_drive",
"description": "IF YOU ARE SEEING THIS IT IS A BUG.",
"description": { "str": "IF YOU ARE SEEING THIS IT IS A BUG.", "//~": "NO_I18N" },
"flags": [ "IRREMOVABLE", "NO_DROP" ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"id": "screw_press",
"type": "TOOL",
"name": { "str": "screw press", "str_pl": "screw presses" },
"description": "This is a crafting_pseudo_item if you have it something is wrong.",
"description": { "str": "This is a crafting_pseudo_item if you have it something is wrong.", "//~": "NO_I18N" },
"weight": "70000 g",
"volume": "100 L",
"price": "200 USD",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/entry_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"id": "pseudo_bio_picklock",
"type": "TOOL",
"name": { "str": "bio lockpick" },
"description": "this a pseudo item",
"description": { "str": "this a pseudo item", "//~": "NO_I18N" },
"volume": "0 ml",
"price": "0 cent",
"price_postapoc": "0 cent",
Expand Down
Loading

0 comments on commit c825d95

Please sign in to comment.