Skip to content

Commit

Permalink
[Aftershock] Fix Police bots (Again) (CleverRaven#79040)
Browse files Browse the repository at this point in the history
* Fix my mistake and restore the police robots from their broken state

* Lint

* Lint

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>
  • Loading branch information
QuillInkwell and github-actions[bot] authored Jan 10, 2025
1 parent 42e255b commit 43ccb71
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 15 deletions.
6 changes: 3 additions & 3 deletions data/mods/Aftershock/itemgroups/robot_storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
[ "afs_bot_riotbot", 5 ],
[ "afs_bot_copbot", 15 ],
[ "afs_bot_eyebot", 20 ],
[ "afs_broken_riotbot", 10 ],
[ "afs_broken_copbot", 70 ],
[ "afs_broken_eyebot", 100 ]
[ "broken_afs_riotbot", 10 ],
[ "broken_afs_copbot", 70 ],
[ "broken_afs_eyebot", 100 ]
]
}
]
8 changes: 4 additions & 4 deletions data/mods/Aftershock/items/corpses.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
{
"type": "GENERIC",
"id": "broken_eyebot_heater",
"copy-from": "afs_broken_eyebot",
"copy-from": "broken_afs_eyebot",
"color": "pink",
"name": "broken floating heater",
"description": "A broken floating heater, now cold and motionless. Could be stripped down or re-crafted."
Expand Down Expand Up @@ -327,7 +327,7 @@
},
{
"type": "GENERIC",
"id": "afs_broken_eyebot",
"id": "broken_afs_eyebot",
"symbol": ",",
"color": "green",
"name": { "str": "broken eyebot" },
Expand Down Expand Up @@ -378,7 +378,7 @@
},
{
"type": "GENERIC",
"id": "afs_broken_copbot",
"id": "broken_afs_copbot",
"symbol": ",",
"color": "green",
"name": { "str": "broken police bot" },
Expand All @@ -395,7 +395,7 @@
},
{
"type": "GENERIC",
"id": "afs_broken_riotbot",
"id": "broken_afs_riotbot",
"symbol": ",",
"color": "green",
"name": { "str": "broken riot control bot" },
Expand Down
8 changes: 4 additions & 4 deletions data/mods/Aftershock/items/inactiverobot.json
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
"abstract": "bot_eyebot_base",
"type": "TOOL",
"name": { "str": "inactive eyebot", "//~": "NO_I18N" },
"looks_like": "afs_broken_eyebot",
"looks_like": "broken_afs_eyebot",
"price": "100 USD",
"price_postapoc": "100 USD",
"material": [ "steel", "plastic" ],
Expand Down Expand Up @@ -565,7 +565,7 @@
},
{
"id": "afs_bot_eyebot",
"looks_like": "afs_broken_eyebot",
"looks_like": "broken_afs_eyebot",
"type": "TOOL",
"name": { "str": "inactive eyebot" },
"description": "An inactive eyebot. Using this item involves turning it on and launching the UAV. If reprogrammed and rewired successfully, the eyebot will then keep watch for intruders.",
Expand All @@ -592,7 +592,7 @@
},
{
"id": "afs_bot_copbot",
"looks_like": "afs_broken_copbot",
"looks_like": "broken_afs_copbot",
"type": "TOOL",
"name": { "str": "inactive police bot" },
"description": "An inactive police robot. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully, the police bot will then identify you as law enforcement, roam around or follow you, and attempt to detain lawbreakers.",
Expand All @@ -619,7 +619,7 @@
},
{
"id": "afs_bot_riotbot",
"looks_like": "afs_broken_riotbot",
"looks_like": "broken_afs_riotbot",
"type": "TOOL",
"name": { "str": "inactive riot control bot" },
"description": "An inactive riot control bot. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully, the robot will bring order and peace to the horde.",
Expand Down
21 changes: 18 additions & 3 deletions data/mods/Aftershock/migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,12 @@
{
"id": [ "broken_eyebot" ],
"type": "MIGRATION",
"replace": "afs_broken_eyebot"
"replace": "broken_afs_eyebot"
},
{
"id": [ "afs_broken_eyebot" ],
"type": "MIGRATION",
"replace": "broken_afs_eyebot"
},
{
"id": [ "bot_copbot" ],
Expand All @@ -114,7 +119,12 @@
{
"id": [ "broken_copbot" ],
"type": "MIGRATION",
"replace": "afs_broken_copbot"
"replace": "broken_afs_copbot"
},
{
"id": [ "afs_broken_copbot" ],
"type": "MIGRATION",
"replace": "broken_afs_copbot"
},
{
"id": [ "bot_riotbot" ],
Expand All @@ -124,6 +134,11 @@
{
"id": [ "broken_riotbot" ],
"type": "MIGRATION",
"replace": "afs_broken_riotbot"
"replace": "broken_afs_riotbot"
},
{
"id": [ "afs_broken_riotbot" ],
"type": "MIGRATION",
"replace": "broken_afs_riotbot"
}
]
2 changes: 1 addition & 1 deletion data/mods/Aftershock/recipes/deconstruction/robot.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
]
},
{
"result": "afs_broken_eyebot",
"result": "broken_afs_eyebot",
"type": "uncraft",
"activity_level": "LIGHT_EXERCISE",
"skill_used": "electronics",
Expand Down

0 comments on commit 43ccb71

Please sign in to comment.