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
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b09866d
Create high_tech_weapons_melee.json and add Laser Saber
collectanos Nov 8, 2023
654952e
Add RC scout car
collectanos Nov 9, 2023
911f471
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
11670e8
Update data/json/EraOfDecay/items/tools/other.json
collectanos Nov 9, 2023
b28fcea
Update data/json/EraOfDecay/items/tools/other.json
collectanos Nov 9, 2023
f16e00b
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
c8d3790
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
df30340
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
c92e2c5
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
1cb7aeb
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
c7d3482
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
8182864
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
660d076
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
31aab12
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
1010aa7
Update data/json/EraOfDecay/items/tools/other.json
collectanos Nov 9, 2023
addf9a3
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
5e712b9
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
78e7d91
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
d22f607
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
798613e
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
cf7a1a6
Update data/json/items/melee/high_tech_weapons_melee.json
collectanos Nov 9, 2023
0f3055c
Merge branch 'AtomicFox556:master' into master
collectanos Nov 13, 2023
71972db
Add colored hoodie
collectanos Nov 13, 2023
c034491
Add Colored skirts
collectanos Nov 13, 2023
21d3b67
Update data/json/items/melee/high_tech_weapons_melee.json
AtomicFox556 Nov 13, 2023
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
46 changes: 46 additions & 0 deletions data/json/EraOfDecay/items/tools/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,51 @@
"name": { "str": "sharpened entrenching tool" },
"description": "A stout, collapsible spade. It's commonly used by military forces and favored by hikers for digging. This one had its edges crudely shapened, turning it into a much more dangerous weapon in melee combat.",
"melee_damage": { "bash": 6, "cut": 16 }
},
{
"id": "rc_scout_car",
"copy-from": "rc_scout_car",
"type": "TOOL",
"name": { "str": "RC scout car" },
"description": "A small wheeled drone, nimble and almost undetectable it mounts a robotic eye for espionage work. Once turned on, a remote controller will let you use it as a mobile camera.",
"symbol": "e",
"ammo": [ "battery" ],
"charges_per_use": 1,
"proportional": { "weight": 0.73, "volume": 0.75, "price": 0.8 },
"use_action": {
"target": "rc_scout_car_on",
"menu_text": "Activate RC scout car",
"msg": "You activate the RC scout car.",
"active": true,
"type": "transform"
},
"flags": [ "RADIO_CONTAINER" ],
"pocket_data": [
{
"pocket_type": "MAGAZINE_WELL",
"holster": true,
"rigid": true,
"max_contains_volume": "2 L",
"max_contains_weight": "2 kg",
"item_restriction": [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ]
}
]
},
{
"id": "rc_scout_car_on",
"copy-from": "rc_scout_car",
"type": "TOOL",
"name": { "str": "RC scout car (on)", "str_pl": "RC scout cars (on)" },
"description": "This RC scout car is on, and continuously transmitting a video-feed of its immediate surroundings. Use a remote control to drive it around.",
"turns_per_charge": 5,
"revert_to": "rc_scout_car",
"use_action": {
"target": "rc_scout_car",
"menu_text": "Deactivate RC scout car",
"msg": "You deactivate the RC scout car.",
"type": "transform"
},
"emits": [ "emit_clairvoyant" ],
"flags": [ "LIGHT_15", "RADIO_CONTAINER", "RADIOCAR" ]
}
]
61 changes: 61 additions & 0 deletions data/json/items/melee/high_tech_weapons_melee.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
[
{
"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": -1,
"melee_damage": { "bash": 9 },
"material": [ "steel" ],
"symbol": "/",
"color": "light_gray",
"ammo": [ "battery" ],
"charges_per_use": 1,
"use_action": [
collectanos marked this conversation as resolved.
Show resolved Hide resolved
{
"target": "plasma_saber_on",
"msg": "The plasma saber activates.",
"active": true,
"need_charges": 1,
"need_charges_msg": "The plasma saber power cell is empty.",
"type": "transform"
}
],
"flags": [ "DURABLE_MELEE", "BELT_CLIP" ],
"pocket_data": [
collectanos marked this conversation as resolved.
Show resolved Hide resolved
{
"pocket_type": "MAGAZINE_WELL",
"flag_restriction": [ "BATTERY_HEAVY" ],
"default_magazine": "heavy_plus_battery_cell"
}
]
},
{
"id": "plasma_saber_on",
"copy-from": "plasma_saber",
"type": "TOOL",
"name": { "str": "plasma saber (on)", "str_pl": "plasma sabers (on)" },
"description": "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.",
"material": [ "steel" ],
"longest_side": "180 cm",
"cutting": 80,
collectanos marked this conversation as resolved.
Show resolved Hide resolved
"revert_to": "plasma_saber",
"power_draw": 5000,
"use_action": [
{ "type": "firestarter", "moves": 200, "moves_slow": 2000 },
{
"target": "plasma_saber",
"msg": "The plasma saber deactivates.",
"menu_text": "Turn off",
"type": "transform"
}
],
"flags": [ "LIGHT_50", "DURABLE_MELEE", "TRADER_AVOID", "FIRESTARTER", "NONCONDUCTIVE" ]
}
]
Loading