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

Initial Robofac #30527

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
266e0a7
Basic Mapgen
John-Candlebury May 11, 2019
58e2192
Fix the Inconsistent Volume
Rod995 May 13, 2019
f83e992
typo fix
Rod995 May 13, 2019
c2919ee
vehicles: displace creatures in water instead of colliding
mlangsdorf May 14, 2019
502285f
monsters: only friendly monsters stay still in vehicles
mlangsdorf May 14, 2019
e5d49ac
iexamine: check if the patient, not the player, has bio_painkiller
mlangsdorf Apr 27, 2019
db262fe
player display: display current bionic power level as well as maximum
mlangsdorf Apr 27, 2019
d95b26f
bionics: make (de)activate_bionics player aware
mlangsdorf Apr 25, 2019
7ce5d88
CBMs for NPCs: Add NPC AI rule support for CBM power usage
mlangsdorf Apr 25, 2019
0de3a2b
NPC AI: Add utility functions to access active bionics
mlangsdorf Apr 27, 2019
bd6b051
NPC AI: Allow NPCs to use reactors, furnaces, and burners
mlangsdorf Apr 27, 2019
4b533bd
NPC AI: Allow NPCs to use some weapon CBMs
mlangsdorf Apr 27, 2019
26a9538
NPC AI: NPCs can use defensive bionics and hydraulic muscles
mlangsdorf Apr 27, 2019
6d7241a
NPC AI: Allow NPCs to use health related bionics
mlangsdorf Apr 27, 2019
467c045
NPCs: Add instructions to control ally bionic usage and update tutorial
mlangsdorf Apr 27, 2019
e2c9f66
First npc and mission and related items
John-Candlebury May 15, 2019
d8f87f3
Mapgen updates
John-Candlebury May 15, 2019
5c64c6b
Remove mispleced stuff in robots itemgroup
John-Candlebury May 15, 2019
c4f24f9
Merge pull request #30493 from Rod995/plastic-bowl-fix
Rivet-the-Zombie May 15, 2019
2af8238
Style
kevingranade May 15, 2019
67bbfa9
Fix typos and errors
John-Candlebury May 15, 2019
69124d9
Robot nurses (#29621)
Fris0uman May 15, 2019
f20ddfd
CBMs for NPCs 2: Active CBMs with AI control (#29939)
kevingranade May 15, 2019
5276ee1
Mainline most of CraftGunpowder mod content (#30326)
ArkoselabsDoesNotWork-153164711 May 15, 2019
60c8267
Add activity handlers for some hacks (#30455)
May 15, 2019
8643feb
Mechanism to fully remove local bindings (so a global bind can be set…
esotericist May 15, 2019
b68b6ca
Merge pull request #30519 from mlangsdorf/boat_push_fish
kevingranade May 15, 2019
68dda92
Returned back missing ranch_camp_76 terrain
ZhilkinSerg May 15, 2019
4c06a6c
Removed empty `fill_ter` node for abandoned plaza
ZhilkinSerg May 15, 2019
4d9b46a
Update data/json/npcs/missiondef_robofac.json
John-Candlebury May 15, 2019
aad314f
More fixes
John-Candlebury May 15, 2019
8660372
Lint robofac_trade.json
John-Candlebury May 15, 2019
8b1dd86
Merge pull request #30530 from ZhilkinSerg/fix-ranch-mapgen
kevingranade May 15, 2019
5bf987a
Update src/iexamine.cpp
John-Candlebury May 15, 2019
fbeef3f
Basic Mapgen
John-Candlebury May 11, 2019
146268f
First npc and mission and related items
John-Candlebury May 15, 2019
dce4039
Mapgen updates
John-Candlebury May 15, 2019
fdd82ec
Remove mispleced stuff in robots itemgroup
John-Candlebury May 15, 2019
3df43f6
Fix typos and errors
John-Candlebury May 15, 2019
a350c98
Update data/json/npcs/missiondef_robofac.json
John-Candlebury May 15, 2019
1f5fa37
More fixes
John-Candlebury May 15, 2019
03e9edd
Lint robofac_trade.json
John-Candlebury May 15, 2019
28cf08c
Update src/iexamine.cpp
John-Candlebury May 15, 2019
d6a896c
Merge branch 'robofac-hq' of https://github.com/John-Candlebury/Catac…
John-Candlebury May 15, 2019
bfa1f62
Fix merge error
John-Candlebury May 15, 2019
85a875a
Change symbol number to strings
John-Candlebury May 15, 2019
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
44 changes: 23 additions & 21 deletions data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "Active Defense System",
"description": "A thin forcefield surrounds your body, continually draining power. Anything attempting to penetrate this field has a chance of being deflected at the cost of energy. Bullets will be stopped more often than swords and those in turn more often than massive objects.",
"occupied_bodyparts": [ [ "TORSO", 10 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ],
"flags": [ "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 10,
"react_cost": 10,
"time": 1
Expand All @@ -24,7 +24,7 @@
"name": "Advanced Microreactor System",
"description": "This stripped down mini-reactor is safer than it appears due to integrated radiation cleansers. There is no way to shut it down, but you can toggle additional fuel intake.",
"occupied_bodyparts": [ [ "TORSO", 55 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"included_bionics": [ "bio_plutdump" ],
"upgraded_bionic": "bio_reactor"
},
Expand Down Expand Up @@ -94,7 +94,7 @@
"capacity": 10,
"description": "You have a battery draining attachment, and thus can make use of the energy contained in normal, everyday batteries. Use 'E' to consume batteries. Can be toggled on and off at will.",
"occupied_bodyparts": [ [ "TORSO", 25 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ]
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_blade",
Expand All @@ -104,7 +104,7 @@
"occupied_bodyparts": [ [ "ARM_R", 5 ], [ "HAND_R", 2 ] ],
"act_cost": 200,
"fake_item": "bio_blade_weapon",
"flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON" ]
"flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_blaster",
Expand Down Expand Up @@ -185,7 +185,7 @@
"occupied_bodyparts": [ [ "TORSO", 16 ], [ "ARM_L", 4 ], [ "ARM_R", 4 ] ],
"act_cost": 125,
"fake_item": "bio_lightning",
"flags": [ "BIONIC_GUN" ]
"flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_claws",
Expand All @@ -195,7 +195,7 @@
"occupied_bodyparts": [ [ "HAND_L", 5 ], [ "HAND_R", 5 ] ],
"act_cost": 100,
"fake_item": "bio_claws_weapon",
"flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON" ]
"flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_climate",
Expand Down Expand Up @@ -340,7 +340,7 @@
"name": "Ethanol Burner",
"description": "You burn alcohol as fuel in an extremely efficient reaction. However, you will still suffer the inebriating effects of the substance.",
"occupied_bodyparts": [ [ "TORSO", 26 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_evap",
Expand Down Expand Up @@ -390,7 +390,7 @@
[ "FOOT_L", 1 ],
[ "FOOT_R", 1 ]
],
"flags": [ "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 1,
"react_cost": 1,
"time": 2
Expand Down Expand Up @@ -482,7 +482,7 @@
[ "FOOT_L", 2 ],
[ "FOOT_R", 2 ]
],
"flags": [ "BIONIC_TOGGLED" ]
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_heatsink",
Expand All @@ -501,7 +501,7 @@
[ "FOOT_L", 1 ],
[ "FOOT_R", 1 ]
],
"flags": [ "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 4,
"react_cost": 4,
"time": 1
Expand All @@ -512,7 +512,7 @@
"name": "Hydraulic Muscles",
"description": "While activated, your muscles will be greatly enhanced, increasing your strength by 20.",
"occupied_bodyparts": [ [ "TORSO", 4 ], [ "ARM_L", 8 ], [ "ARM_R", 8 ], [ "LEG_L", 14 ], [ "LEG_R", 14 ] ],
"flags": [ "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 17,
"react_cost": 17,
"time": 1
Expand Down Expand Up @@ -552,7 +552,7 @@
"occupied_bodyparts": [ [ "HAND_R", 1 ] ],
"act_cost": 50,
"fake_item": "bio_laser_gun",
"flags": [ "BIONIC_GUN" ]
"flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_leaky",
Expand All @@ -568,7 +568,7 @@
"name": "Leukocyte Breeder System",
"description": "You are equipped with bionic stimulators which augment your haematopoiesis system, allowing you to accelerate white blood cell production using bionic power. It is supposed to run continuously and may cause unpleasant side effects when turned off.",
"occupied_bodyparts": [ [ "TORSO", 10 ] ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
"act_cost": 10,
"react_cost": 1,
"time": 600
Expand Down Expand Up @@ -623,7 +623,7 @@
"name": "Metabolic Interchange",
"description": "Your digestive system and power supply are interconnected. Bionic energy is replenished at the cost of increasing hunger. Can be toggled on and off at will.",
"occupied_bodyparts": [ [ "TORSO", 25 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ]
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_meteorologist",
Expand All @@ -639,7 +639,7 @@
"name": "Repair Nanobots",
"description": "Inside your body is a fleet of tiny dormant robots. While activated they will flit about your body, repairing damage and stopping bleeding at the cost of power.",
"occupied_bodyparts": [ [ "TORSO", 10 ] ],
"flags": [ "BIONIC_TOGGLED" ]
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_night",
Expand Down Expand Up @@ -685,7 +685,7 @@
"name": "Offensive Defense System",
"description": "A thin forcefield surrounds your body, continually draining power. This field does not deflect penetration, but rather delivers a strong shock, damaging unarmed attackers and those with a conductive weapon.",
"occupied_bodyparts": [ [ "TORSO", 10 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ],
"flags": [ "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 10,
"react_cost": 10,
"time": 1
Expand All @@ -696,15 +696,15 @@
"name": "Sensory Dulling",
"description": "Your nervous system is wired to allow you to inhibit the signals of pain, allowing you to dull your senses at will. However, the use of this system may cause delayed reaction time and drowsiness.",
"occupied_bodyparts": [ [ "HEAD", 2 ] ],
"flags": [ "BIONIC_TOGGLED" ]
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_plut_filter",
"type": "bionic",
"name": "Plutonium Filter",
"description": "This set of tanks and filters allows you to more rapidly extract usable plutonium from slurry for a microreactor.",
"occupied_bodyparts": [ [ "TORSO", 10 ] ],
"flags": [ "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 1,
"react_cost": 1,
"time": 2
Expand Down Expand Up @@ -793,6 +793,7 @@
"name": "Radiation Scrubber System",
"description": "A system of advanced piezomechanical blood filters have been surgically implanted throughout your body, allowing you to purge yourself of absorbed radiation at the cost of some bionic power.",
"occupied_bodyparts": [ [ "TORSO", 5 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ],
"flags": [ "BIONIC_NPC_USABLE" ],
"act_cost": 50
},
{
Expand Down Expand Up @@ -821,7 +822,7 @@
"name": "Microreactor System",
"description": "This stripped down mini-reactor may not be the best thing to have in your chest. There is no way to shut it down, but you can toggle additional fuel intake.",
"occupied_bodyparts": [ [ "TORSO", 55 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"included_bionics": [ "bio_plutdump" ]
},
{
Expand Down Expand Up @@ -886,7 +887,7 @@
"name": "Electroshock Unit",
"description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock your opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.",
"occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "HAND_L", 1 ], [ "HAND_R", 1 ] ],
"flags": [ "BIONIC_TOGGLED" ]
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_shockwave",
Expand Down Expand Up @@ -978,6 +979,7 @@
"description": "Your eyes have quick-reacting transition lenses surgically installed over them. They negate glare penalties, partially protect you from bright flashes, and protect your eyes when welding.",
"occupied_bodyparts": [ [ "EYES", 1 ] ],
"included_bionics": [ "bio_blindfold" ],
"flags": [ "BIONIC_NPC_USABLE" ],
"fake_item": "fake_goggles"
},
{
Expand Down Expand Up @@ -1031,7 +1033,7 @@
"occupied_bodyparts": [ [ "HAND_L", 3 ], [ "HAND_R", 3 ] ],
"fake_item": "toolset",
"included_bionics": [ "bio_tools_extend" ],
"flags": [ "BIONIC_TOGGLED" ]
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_tools_extend",
Expand Down
24 changes: 24 additions & 0 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
"name": [ "Hit-and-run Running" ],
"desc": [ "AI tag for when hit-and-run monsters run away. This is a bug if you have it." ]
},
{
"type": "effect_type",
"id": "dragging",
"name": [ "Dragging" ],
"desc": [ "AI tag for when a monster is dragging you behind it. This is a bug if you have it." ]
},
{
"type": "effect_type",
"id": "operating",
"name": [ "Operating" ],
"desc": [ "AI tag for when a monster is operating on you. This is a bug if you have it." ]
},
{
"type": "effect_type",
"id": "countdown",
Expand Down Expand Up @@ -212,6 +224,18 @@
"rating": "bad",
"show_in_info": true
},
{
"type": "effect_type",
"id": "assisted",
"name": [ "Assisted" ],
"desc": [ "You're receiving assistance to practice a surgery." ]
},
{
"type": "effect_type",
"id": "got_checked",
"name": [ "Got a check-up" ],
"desc": [ "Your received a complete check-up and are now aware of the state of your health." ]
},
{
"type": "effect_type",
"id": "winded",
Expand Down
6 changes: 5 additions & 1 deletion data/json/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -3317,6 +3317,7 @@
[ "sweater", 75 ],
[ "hoodie", 65 ],
[ "jumpsuit", 20 ],
[ "badge_doctor", 10 ],
[ "hazmat_suit", 5 ],
[ "cleansuit", 10 ]
]
Expand Down Expand Up @@ -3446,6 +3447,7 @@
[ "holybook_scientology", 1 ],
[ "recipe_medicalmut", 1 ],
[ "survnote", 1 ],
[ "badge_doctor", 1 ],
[ "tourist_table", 1 ],
[ "thermos", 10 ]
]
Expand Down Expand Up @@ -3500,7 +3502,7 @@
{
"type": "item_group",
"id": "ambulance_equipment",
"items": [ { "group": "tools_medical", "prob": 100 }, { "group": "drugs_emergency", "prob": 50 } ]
"items": [ { "group": "tools_medical", "prob": 100 }, { "group": "drugs_emergency", "prob": 50 }, [ "badge_doctor", 2 ] ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -5297,6 +5299,7 @@
[ "thermometer", 3 ],
[ "hygrometer", 3 ],
[ "barometer", 3 ],
[ "badge_doctor", 5 ],
[ "dnd_handbook", 2 ],
[ "bodypillow", 1 ]
]
Expand Down Expand Up @@ -7026,6 +7029,7 @@
[ "eyedrops", 20 ],
[ "adderall", 10 ],
[ "id_science", 2 ],
[ "badge_doctor", 2 ],
[ "double_plutonium_core", 1 ],
[ "cleansuit", 5 ],
[ "laptop", 10 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"type": "item_group",
"id": "guns_smg_improvised",
"//": "Makeshift or otherwise poor quality SMGs.",
"items": [ ]
"items": [ [ "smg_22", 50 ], [ "smg_38", 30 ], [ "smg_40", 40 ], [ "smg_45", 40 ], [ "smg_9mm", 100 ] ]
},
{
"type": "item_group",
Expand Down
43 changes: 43 additions & 0 deletions data/json/itemgroups/magazines.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@
[ "p226mag_15rd_357sig", 25 ]
]
},
{
"type": "item_group",
"id": "mags_pistol_makeshift",
"//": "Makeshift or otherwise poor quality pistol magazines.",
"items": [ ]
},
{
"type": "item_group",
"id": "mags_pistol_rare",
Expand Down Expand Up @@ -156,6 +162,12 @@
[ "uzimag", 10 ]
]
},
{
"type": "item_group",
"id": "mags_smg_makeshift",
"//": "Makeshift or otherwise poor quality SMG magazines.",
"items": [ [ "survivor9mm_mag", 50 ], [ "smg_22_mag", 20 ], [ "smg_38_mag", 15 ], [ "smg_40_mag", 15 ], [ "smg_45_mag", 20 ] ]
},
{
"type": "item_group",
"id": "mags_smg_rare",
Expand Down Expand Up @@ -185,6 +197,12 @@
[ "stanag30", 10 ]
]
},
{
"type": "item_group",
"id": "mags_rifle_makeshift",
"//": "Makeshift or otherwise poor quality rifle magazines.",
"items": [ [ "survivor223mag", 50 ] ]
},
{
"type": "item_group",
"id": "mags_rifle_rare",
Expand All @@ -206,6 +224,12 @@
"//": "Factory specification shotgun magazines commonly owned by citizens.",
"items": [ ]
},
{
"type": "item_group",
"id": "mags_shotgun_makeshift",
"//": "Makeshift or otherwise poor quality shotgun magazines.",
"items": [ [ "shotbelt_20", 1 ] ]
},
{
"type": "item_group",
"id": "mags_shotgun_rare",
Expand All @@ -218,6 +242,12 @@
"//": "Factory specification magazines commonly owned by citizens that have no better category.",
"items": [ ]
},
{
"type": "item_group",
"id": "mags_other_makeshift",
"//": "Makeshift or otherwise poor quality magazines that have no better category.",
"items": [ [ "nailmag", 20 ], [ "pressurized_tank_chem", 5 ], [ "aux_pressurized_tank", 10 ] ]
},
{
"type": "item_group",
"id": "mags_other_rare",
Expand All @@ -236,6 +266,18 @@
{ "group": "mags_other_common", "prob": 5 }
]
},
{
"type": "item_group",
"id": "mags_makeshift",
"//": "Makeshift or otherwise poor quality magazines.",
"items": [
{ "group": "mags_pistol_makeshift", "prob": 30 },
{ "group": "mags_rifle_makeshift", "prob": 20 },
{ "group": "mags_smg_makeshift", "prob": 10 },
{ "group": "mags_shotgun_makeshift", "prob": 5 },
{ "group": "mags_other_makeshift", "prob": 5 }
]
},
{
"type": "item_group",
"id": "mags_rare",
Expand Down Expand Up @@ -271,6 +313,7 @@
"//": "Magazines for guns typically used by criminals.",
"items": [
{ "group": "mags_common", "prob": 10 },
{ "group": "mags_makeshift", "prob": 5 },
{ "group": "mags_rare", "prob": 20 },
{ "group": "mags_obscure", "prob": 20 },
{ "group": "mags_smg_common", "prob": 10 },
Expand Down
7 changes: 7 additions & 0 deletions data/json/itemgroups/robofac_trade.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"type": "item_group",
"id": "robofac_basic_robots",
"items": [ [ "bot_manhack", 40 ], [ "bot_skitterbot", 25 ] ]
}
]
Loading