Skip to content

Commit

Permalink
Merge pull request #46624 from Mom-Bun/robotuncrafts
Browse files Browse the repository at this point in the history 
[AFTERSHOCK] Adding Robot Uncrafts + Reworking their descriptions
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored Jan 11, 2021
2 parents 17c4100 + 3558b15 commit b8bc223
Show file tree
Hide file tree
Showing 7 changed files with 626 additions and 215 deletions.
71 changes: 20 additions & 51 deletions data/mods/Aftershock/items/corpses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
"symbol": ",",
"color": "light_gray",
"looks_like": "broken_cleanerbot",
"name": "broken utility robot",
"name": { "str": "broken Seneschal" },
"category": "other",
"description": "A broken utility robot, now limp and unmoving. Could be gutted for parts or crafted into a salvaged robot.",
"description": "A broken Seneschal, now limp and unmoving. Could be gutted for parts or crafted into a salvaged robot.",
"material": [ "steel", "plastic" ],
"weight": "140 kg",
"volume": "62500 ml",
Expand All @@ -69,7 +69,8 @@
{
"type": "GENERIC",
"id": "broken_hazmatbot",
"name": "broken utility robot",
"name": "broken Likvidator",
"description": "A broken Likvidator, now limp and unmoving. Could be gutted for parts or crafted into a salvaged robot.",
"copy-from": "broken_utilibot",
"color": "green"
},
Expand All @@ -85,24 +86,24 @@
"id": "broken_utilibot_butler",
"copy-from": "broken_utilibot",
"color": "dark_gray",
"name": "broken butler-bot",
"description": "A broken butler-bot, now silent and mangled. Could be stripped down for parts."
"name": { "str": "broken Famulus", "str_pl": "broken Famuli" },
"description": "A broken Famulus, now silent and mangled. If it wasn't for the obvious rivets and welding, it would look completely human. Could be stripped down for parts."
},
{
"type": "GENERIC",
"id": "broken_utilibot_const",
"copy-from": "broken_utilibot",
"color": "dark_gray",
"name": "broken construction robot",
"description": "A broken construction robot, now wrecked and immobile. Could be stripped down for parts."
"name": "broken Udarnik",
"description": "A broken Udarnik, now wrecked and immobile. Could be stripped down for parts."
},
{
"type": "GENERIC",
"id": "broken_utilibot_fire",
"copy-from": "broken_utilibot",
"color": "yellow",
"name": "broken firefighter robot",
"description": "A broken firefighter robot, now cold and inert. Could be stripped down for parts."
"name": "broken Brandspojt",
"description": "A broken Brandspojt, now cold and inert. Could be stripped down for parts."
},
{
"type": "GENERIC",
Expand Down Expand Up @@ -133,48 +134,24 @@
"id": "broken_milbot_556",
"copy-from": "broken_milbot_disarmed",
"color": "light_gray",
"name": "broken military robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated 5.56mm firearm. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_milbot_308",
"copy-from": "broken_milbot_disarmed",
"color": "light_gray",
"name": "broken military robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated 7.62mm firearm. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_milbot_8x40mm",
"copy-from": "broken_milbot_disarmed",
"color": "light_gray",
"name": "broken military robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated 8x40mm firearm. Could be stripped for parts."
"name": "broken Imaginifier",
"description": "A broken military humaniform, shattered and inert. While it looks nowhere near human, you still feel uneasy - as if it is studying you with its eyes. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_milbot_needle",
"copy-from": "broken_milbot_disarmed",
"color": "light_gray",
"name": "broken military robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated flechette gun. Could be stripped for parts."
"name": "broken Hashashiyyin",
"description": "A broken Hashashiyyin, shattered and inert. While it looks nowhere near human, you still feel uneasy - as if it is studying you with its eyes. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_milbot_40mm",
"copy-from": "broken_milbot_disarmed",
"color": "red",
"name": "broken military robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated 40mm grenade launcher. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_milbot_flame",
"copy-from": "broken_milbot_disarmed",
"color": "red",
"name": "broken military flame robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated flamethrower. Could be stripped for parts."
"name": "broken Suppressor",
"description": "A broken Suppressor, shattered and inert. Could be stripped for parts."
},
{
"type": "GENERIC",
Expand All @@ -189,8 +166,8 @@
"id": "broken_defbot_shot",
"copy-from": "broken_defbot_disarmed",
"color": "light_gray",
"name": "broken defense bot",
"description": "A broken defense robot. Its internal weapons have been removed. Could be gutted for parts or crafted into a salvaged robot."
"name": { "str": "broken Aegis", "str_pl": "broken Aegises" },
"description": "A broken defense robot. Could be gutted for parts or crafted into a salvaged robot."
},
{
"type": "GENERIC",
Expand Down Expand Up @@ -227,14 +204,6 @@
"name": "broken Wraitheon Irradiant",
"description": "The irreparably broken remains of an Irradiant weapons platform. Its mounted plasma cannon self-destructed when the robot was rendered inoperable, but its remains could still be disassembled for some valuable parts."
},
{
"type": "GENERIC",
"id": "broken_advbot_rail",
"copy-from": "broken_advbot_disarmed",
"color": "magenta",
"name": "broken advanced robot",
"description": "A broken advanced robot. This one is armed with an integrated laser-emitter. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_advbot_emp",
Expand Down Expand Up @@ -287,9 +256,9 @@
"symbol": ",",
"color": "white",
"looks_like": "broken_tribot",
"name": "broken medical bot",
"name": "broken surgical droid",
"category": "other",
"description": "A broken medical robot, now crumpled and inert. Could be stripped down for parts.",
"description": "A broken surgical robot, now crumpled and inert. Could be stripped down for parts.",
"price": 30000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
Expand Down
32 changes: 32 additions & 0 deletions data/mods/Aftershock/items/obsolete.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,5 +437,37 @@
"warmth": 20,
"material_thickness": 2,
"flags": [ "OUTER", "VARSIZE" ]
},
{
"type": "GENERIC",
"id": "broken_milbot_flame",
"copy-from": "broken_milbot_disarmed",
"color": "red",
"name": "broken military flame robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated flamethrower. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_milbot_308",
"copy-from": "broken_milbot_disarmed",
"color": "light_gray",
"name": "broken military robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated 7.62mm firearm. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_milbot_8x40mm",
"copy-from": "broken_milbot_disarmed",
"color": "light_gray",
"name": "broken military robot",
"description": "A broken military robot, shattered and inert. This one is armed with an integrated 8x40mm firearm. Could be stripped for parts."
},
{
"type": "GENERIC",
"id": "broken_advbot_rail",
"copy-from": "broken_advbot_disarmed",
"color": "magenta",
"name": "broken advanced robot",
"description": "A broken advanced robot. This one is armed with an integrated laser-emitter. Could be stripped for parts."
}
]
95 changes: 91 additions & 4 deletions data/mods/Aftershock/items/robotparts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
{
"type": "GENERIC",
"id": "chickenbot_chassis",
"name": { "str_sp": "chicken walker chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the chicken walker.",
"name": { "str_sp": "Pathfinder chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the pathfinder.",
"symbol": "c",
"color": "light_gray",
"weight": "60000 g",
Expand All @@ -41,14 +41,101 @@
{
"type": "GENERIC",
"id": "tankbot_chassis",
"name": { "str_sp": "Beagle chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Beagle tank.",
"name": { "str_sp": "Regulator chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Regulator tank.",
"symbol": "c",
"color": "light_gray",
"weight": "150000 g",
"volume": "575000 ml",
"price": 1000000,
"material": [ "steel" ],
"category": "spare_parts"
},
{
"type": "GENERIC",
"id": "utilibot_chassis",
"name": { "str_sp": "Seneschal chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Seneschal.",
"symbol": "c",
"color": "light_gray",
"weight": "40000 g",
"volume": "70000 ml",
"price": 200000,
"material": [ "steel" ],
"category": "spare_parts"
},
{
"type": "GENERIC",
"id": "hazmatbot_chassis",
"name": { "str_sp": "Likvidator chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Likvidator.",
"copy-from": "utilibot_chassis",
"color": "green"
},
{
"type": "GENERIC",
"id": "butlerbot_chassis",
"name": { "str_sp": "Famulus chassis" },
"description": "What's left when you remove all moving parts and electronics. Looking at it fills you with uneasiness as the Famulus stares at you with empty eyes.",
"copy-from": "utilibot_chassis",
"color": "dark_gray"
},
{
"type": "GENERIC",
"id": "utilibot_const_chassis",
"name": { "str_sp": "Udarnik chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Udarnik.",
"copy-from": "utilibot_chassis",
"color": "dark_gray"
},
{
"type": "GENERIC",
"id": "utilibot_fire_chassis",
"name": { "str_sp": "Brandspojt chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Brandspojt.",
"copy-from": "utilibot_chassis",
"color": "yellow"
},
{
"type": "GENERIC",
"id": "medibot_chassis",
"name": { "str_sp": "Surgical Droid chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Surgical Droid.",
"copy-from": "utilibot_chassis",
"color": "white"
},
{
"type": "GENERIC",
"id": "defbot_shot_chassis",
"name": { "str_sp": "Aegis chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Aegis.",
"copy-from": "utilibot_chassis",
"color": "blue"
},
{
"type": "GENERIC",
"id": "milbot_base_chassis",
"name": { "str_sp": "military robot chassis" },
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the military robot.",
"symbol": "c",
"weight": "40000 g",
"volume": "70000 ml",
"price": 200000,
"material": [ "steel" ],
"category": "spare_parts",
"color": "red_green"
},
{
"type": "GENERIC",
"id": "milbot_humaniform_chassis",
"name": { "str_sp": "military humaniform chassis" },
"description": "What's left when you remove all moving parts and electronics. You still feel deep down that its hollow eyes are studying you.",
"symbol": "c",
"weight": "40000 g",
"volume": "70000 ml",
"price": 200000,
"material": [ "steel" ],
"category": "spare_parts",
"color": "red_green"
}
]
Loading

0 comments on commit b8bc223

Please sign in to comment.