Skip to content

Commit

Permalink
AFS TSKBEM STEED (CleverRaven#67802)
Browse files Browse the repository at this point in the history
* TSKBEM STEED

* Update robots.json

* Apply suggestions from code review

Co-authored-by: Karol1223 <[email protected]>

* Update dictionary.txt

* Update robots.json

* Update robots.json

* Update robots.json

* Update robots.json

* Update robots.json

* Type fixes

* Add registry card

* Add registry key for taming

* Linting

* Typo

* Commestible Type for ID Card

* Unnecessary plural

* Horse and card spawns

* Remove bad entry

* Update prepnet_trade.json

* Fix Prepnet

* Test bump

* Update prepnet_trade.json

---------

Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: Karol1223 <[email protected]>
  • Loading branch information
3 people authored Oct 28, 2023
1 parent f16ef6d commit ce449ad
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 5 deletions.
6 changes: 3 additions & 3 deletions data/mods/Aftershock/itemgroups/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@
"id": "consumer_electronics",
"type": "item_group",
"copy-from": "consumer_electronics",
"extend": { "items": [ [ "afs_atomic_smartphone", 2 ], [ "afs_imager", 2 ], [ "atomic_light", 4 ] ] }
"extend": { "items": [ [ "afs_atomic_smartphone", 2 ], [ "afs_imager", 2 ], [ "atomic_light", 4 ], [ "STEED_registry", 1 ] ] }
},
{
"id": "electronics",
"type": "item_group",
"copy-from": "electronics",
"extend": { "items": [ [ "afs_atomic_smartphone", 1 ], [ "afs_imager", 2 ], [ "atomic_light", 2 ] ] }
"extend": { "items": [ [ "afs_atomic_smartphone", 1 ], [ "afs_imager", 2 ], [ "atomic_light", 2 ], [ "STEED_registry", 1 ] ] }
},
{
"id": "lab_dorm",
"type": "item_group",
"copy-from": "lab_dorm",
"extend": { "items": [ [ "afs_atomic_smartphone", 5 ], [ "atomic_light", 3 ] ] }
"extend": { "items": [ [ "afs_atomic_smartphone", 5 ], [ "atomic_light", 3 ], [ "STEED_registry", 1 ] ] }
},
{
"id": "subway",
Expand Down
13 changes: 13 additions & 0 deletions data/mods/Aftershock/items/id_cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,18 @@
"volume": "5 ml",
"category": "keys",
"to_hit": -3
},
{
"id": "STEED_registry",
"type": "COMESTIBLE",
"name": { "str": "STEED registry key" },
"description": "A slim card that is used to initialize a STEED, which will then imprint the rider's biometric data and follow them unerringly.",
"weight": "6 g",
"volume": "5 ml",
"symbol": ",",
"color": "green",
"comestible_type": "INVALID",
"use_action": [ "PETFOOD" ],
"petfood": [ "STEED_registry" ]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
{ "monster": "mon_utilibot_const", "weight": 550, "cost_multiplier": 0 },
{ "monster": "mon_utilibot_const", "weight": 250, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
{ "monster": "mon_utilibot_fire", "weight": 100, "cost_multiplier": 0 },
{ "monster": "mon_hazmatbot", "weight": 100, "cost_multiplier": 0, "pack_size": [ 1, 2 ] }
{ "monster": "mon_hazmatbot", "weight": 100, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
{ "monster": "mon_mech_horse", "weight": 15, "cost_multiplier": 0 }
]
},
{
Expand Down
63 changes: 63 additions & 0 deletions data/mods/Aftershock/mobs/robots.json
Original file line number Diff line number Diff line change
Expand Up @@ -785,5 +785,68 @@
"STUN_IMMUNE"
],
"armor": { "bash": 12, "cut": 8, "bullet": 6 }
},
{
"id": "mon_mech_horse",
"type": "MONSTER",
"name": { "str": "STEED" },
"description": "Found on nearly every frontier planet, the ubiquitous TSKBEM STEED (Surface Traversing Equine Emulating Drone) is an incredibly rugged quadrupedal machine based on old Earth horses and mules. Capable of crossing the roughest terrain, powered by a compact atomic reactor, generous storage capacity, light armor, and a lifetime warranty, the STEED is a priceless tool for prospectors and homesteaders. This version has been ruggedized against Salus IV's extreme cold, but does not keep you warm while riding.",
"default_faction": "mech_bot",
"looks_like": "mon_horse",
"species": [ "ROBOT" ],
"diff": 5,
"volume": "600 L",
"weight": "800 kg",
"hp": 200,
"speed": 350,
"material": [ "qt_steel", "nanoprinted_alloy", "kevlar" ],
"symbol": "H",
"color": "light_gray",
"aggression": -50,
"morale": 100,
"melee_skill": 2,
"melee_dice": 2,
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "bash", "amount": 20 } ],
"vision_night": 100,
"death_function": { "corpse_type": "BROKEN" },
"death_drops": { "groups": [ [ "robots", 20 ] ] },
"path_settings": { "max_dist": 30, "avoid_traps": true, "avoid_sharp": true },
"petfood": {
"food": [ "STEED_registry" ],
"feed": "The %s activates as you swipe the registry key. A nearly inaudible hum is the only indication the STEED is active."
},
"flags": [
"SEES",
"HEARS",
"CLIMBS",
"COLDPROOF",
"BASHES",
"PUSH_MON",
"ELECTRONIC",
"NO_BREATHE",
"PET_MOUNTABLE",
"PATH_AVOID_DANGER_2",
"PATH_AVOID_FALL",
"PATH_AVOID_FIRE",
"STUN_IMMUNE"
],
"armor": { "bash": 10, "cut": 15, "bullet": 10 }
},
{
"type": "GENERIC",
"id": "broken_mech_horse",
"name": { "str": "broken STEED" },
"description": "A broken STEED, it looks beyond repair. At least the atomic core shielding should be intact.",
"volume": "600 L",
"weight": "800 kg",
"price": 1000,
"price_postapoc": 10,
"to_hit": -3,
"material": [ "qt_steel", "nanoprinted_alloy", "kevlar" ],
"symbol": "H",
"color": "light_gray",
"flags": [ "TRADER_AVOID", "NO_REPAIR", "LEAK_DAM", "RADIOACTIVE" ],
"melee_damage": { "bash": 7 }
}
]
2 changes: 1 addition & 1 deletion data/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "item_group",
"id": "prepnet_id_cards",
"subtype": "distribution",
"items": [ [ "id_science", 90 ], [ "id_military", 5 ], [ "id_industrial", 5 ] ]
"items": [ [ "id_science", 90 ], [ "id_military", 5 ], [ "id_industrial", 5 ], [ "STEED_registry", 1 ] ]
},
{
"type": "item_group",
Expand Down
1 change: 1 addition & 0 deletions tools/spell_checker/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2569,6 +2569,7 @@ rrrip
rrrrip
rubra
rugerlcp
ruggedized
ruleset
ruminant
ruminants
Expand Down

0 comments on commit ce449ad

Please sign in to comment.