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

Futurism #133

Merged
merged 25 commits into from
Nov 13, 2023
Merged

Futurism #133

merged 25 commits into from
Nov 13, 2023

Conversation

collectanos
Copy link
Collaborator

No description provided.

Comment on lines 2 to 22
{
"id": "plasma_saber",
"type": "TOOL",
"category": "weapons",
"name": { "str": "plasma saber (off)", "str_pl": "plasma sabers (off)" },
"description": "Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.",
"weight": "1000 g",
"volume": "500 ml",
"longest_side": "20 cm",
"price": 5000,
"price_postapoc": 3000,
"to_hit": 3,
"bashing": 9,
"material": [ "steel" ],
"symbol": "/",
"color": "light_gray",
"ammo": [ "battery" ],
"charges_per_use": 1,
"techniques": [ "RAPID", "WBLOCK_2", "PRECISE", "WIDE" ],
"qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "WELD", 2 ], [ "AXE", 3 ], [ "SAW_M", 2 ] ],
"use_action": [
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
{
"id": "plasma_saber",
"type": "TOOL",
"category": "weapons",
"name": { "str": "plasma saber (off)", "str_pl": "plasma sabers (off)" },
"description": "Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.",
"weight": "1000 g",
"volume": "500 ml",
"longest_side": "20 cm",
"price": 5000,
"price_postapoc": 3000,
"to_hit": 3,
"bashing": 9,
"material": [ "steel" ],
"symbol": "/",
"color": "light_gray",
"ammo": [ "battery" ],
"charges_per_use": 1,
"techniques": [ "RAPID", "WBLOCK_2", "PRECISE", "WIDE" ],
"qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "WELD", 2 ], [ "AXE", 3 ], [ "SAW_M", 2 ] ],
"use_action": [
{
"id": "plasma_saber",
"type": "TOOL",
"category": "weapons",
"name": { "str": "plasma saber (off)", "str_pl": "plasma sabers (off)" },
"description": "Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.",
"weight": "1000 g",
"volume": "500 ml",
"longest_side": "20 cm",
"price": 5000,
"price_postapoc": 3000,
"to_hit": 3,
"bashing": 9,
"material": [ "steel" ],
"symbol": "/",
"color": "light_gray",
"ammo": [ "battery" ],
"charges_per_use": 1,
"techniques": [ "RAPID", "WBLOCK_2", "PRECISE", "WIDE" ],
"qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "WELD", 2 ], [ "AXE", 3 ], [ "SAW_M", 2 ] ],
"use_action": [

Comment on lines 33 to 34
"flags": [ "DURABLE_MELEE", "FIRESTARTER", "BELT_CLIP" ],
"pocket_data": [
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
"flags": [ "DURABLE_MELEE", "FIRESTARTER", "BELT_CLIP" ],
"pocket_data": [
"flags": [ "DURABLE_MELEE", "FIRESTARTER", "BELT_CLIP" ],
"pocket_data": [

data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/EraOfDecay/items/tools/other.json Outdated Show resolved Hide resolved
data/json/EraOfDecay/items/tools/other.json Outdated Show resolved Hide resolved
data/json/EraOfDecay/items/tools/other.json Outdated Show resolved Hide resolved
Copy link

@Kenshut Kenshut left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Проверяй

data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
collectanos and others added 16 commits November 10, 2023 00:26
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Copy link

github-actions bot commented Nov 9, 2023

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • An activated plasma saber consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.
  • Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Copy link

@Kenshut Kenshut left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Еще

data/json/items/melee/high_tech_weapons_melee.json Outdated Show resolved Hide resolved
collectanos and others added 3 commits November 10, 2023 00:38
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@collectanos collectanos changed the title Create high_tech_weapons_melee.json and add Laser Saber Futurism Nov 13, 2023
collectanos and others added 2 commits November 14, 2023 00:48
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@AtomicFox556 AtomicFox556 merged commit ba78e00 into AtomicFox556:master Nov 13, 2023
15 of 17 checks passed
@RenechCDDA
Copy link

@AtomicFox556 This appears to be a copy of https://www.nexusmods.com/cataclysmdarkdaysahead/mods/25 (authored by "Maladiktus") without attribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants