(Done)Adds riot control turrets and makes them more common than lethal types. Removes roadblock robots. #35821
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -229,7 +229,7 @@ | |
| ], | ||
| "place_monsters": [ { "monster": "GROUP_OFFICE_TOWER_2", "x": [ 7, 21 ], "y": [ 13, 21 ], "chance": 2, "repeat": [ 1 ] } ], | ||
| "place_monster": [ { "monster": "mon_zombie_scientist", "x": [ 7, 21 ], "y": [ 4, 10 ], "repeat": [ 1, 3 ] } ], | ||
| "monster": { "7": { "monster": "mon_turret_riot" } } | ||
| } | ||
| }, | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -178,11 +178,11 @@ | |
| "place_item": [ { "item": "visions_solitude", "x": 16, "y": 108, "amount": 1 } ], | ||
| "place_monsters": [ | ||
| { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 15, 20 ], "y": [ 34, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, | ||
| { "monster": "GROUP_TURRET_RIOT", "x": [ 15, 20 ], "y": [ 39, 42 ], "density": 0.1 }, | ||
| { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 15, 20 ], "y": [ 44, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, | ||
| { "monster": "GROUP_TURRET_RIOT", "x": [ 32, 39 ], "y": [ 39, 42 ], "density": 0.1 }, | ||
| { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 51, 56 ], "y": [ 34, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, | ||
| { "monster": "GROUP_TURRET_RIOT", "x": [ 51, 56 ], "y": [ 39, 42 ], "density": 0.1 }, | ||
| { "monster": "GROUP_ZOMBIE_PRISON", "x": [ 51, 56 ], "y": [ 44, 37 ], "repeat": [ 1, 2 ], "density": 0.2 }, | ||
| { "monster": "GROUP_ROBOT_EYEBOT", "x": [ 24, 47 ], "y": [ 0, 13 ], "density": 0.1 }, | ||
| { "monster": "GROUP_ROBOT_EYEBOT", "x": [ 27, 44 ], "y": [ 52, 60 ], "density": 0.1 }, | ||
|
|
@@ -253,7 +253,7 @@ | |
| }, | ||
| "place_monsters": [ { "monster": "GROUP_ZOMBIE_COP", "x": [ 35, 38 ], "y": [ 2, 7 ], "density": 0.2 } ], | ||
| "monster": { | ||
| "7": { "monster": "mon_turret_riot" }, | ||
| "Z": { "monster": "mon_zombie_prisoner" }, | ||
| "C": { "monster": "mon_broken_cyborg" } | ||
| } | ||
|
|
@@ -454,7 +454,7 @@ | |
| ",": [ { "monster": "mon_zombie_cop", "chance": 1 }, { "monster": "mon_zombie_prisoner", "chance": 2 } ], | ||
| "^": { "monster": "mon_zombie_brute", "chance": 1 }, | ||
| " ": { "monster": "mon_dog_zombie_cop", "chance": 1 }, | ||
| ".": { "monster": "mon_turret_riot", "chance": 1 }, | ||
| "U": { "monster": "mon_dog_gshepherd", "chance": 10 }, | ||
| ":": { "monster": "mon_dog_gshepherd", "chance": 1 } | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4261,7 +4261,6 @@ | |
| { "monster": "mon_zombie_technician", "freq": 50, "cost_multiplier": 3 }, | ||
| { "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 }, | ||
| { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 }, | ||
| { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 50 }, | ||
| { "monster": "mon_skeleton_hulk", "freq": 1, "cost_multiplier": 50 } | ||
| ] | ||
|
|
@@ -4351,27 +4350,6 @@ | |
| "default": "mon_spider_web", | ||
| "monsters": [ ] | ||
| }, | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_POLICE", | ||
|
|
@@ -5080,18 +5058,6 @@ | |
| "default": "mon_zombie_cop", | ||
| "monsters": [ { "monster": "mon_zombie_cop", "freq": 100, "cost_multiplier": 0 } ] | ||
| }, | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_PARK_ANIMAL", | ||
|
|
@@ -5315,12 +5281,6 @@ | |
| "default": "mon_dark_wyrm", | ||
| "monsters": [ { "monster": "mon_dark_wyrm", "freq": 40, "cost_multiplier": 1 } ] | ||
| }, | ||
| { | ||
| "name": "GROUP_STRAY_DOGS", | ||
| "type": "monstergroup", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| [ | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_ROBOT", | ||
| "default": "mon_manhack", | ||
| "monsters": [ | ||
| { "monster": "mon_skitterbot", "freq": 220, "cost_multiplier": 0 }, | ||
| { "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 }, | ||
| { "monster": "mon_talon_m202a1", "freq": 75, "cost_multiplier": 0 }, | ||
| { "monster": "mon_copbot", "freq": 0, "cost_multiplier": 0 }, | ||
| { "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_TURRET", | ||
| "default": "mon_turret_rifle", | ||
| "monsters": [ { "monster": "mon_turret_bmg", "freq": 50, "cost_multiplier": 2 } ] | ||
| }, | ||
| { | ||
| "name": "GROUP_HAZMATBOT", | ||
| "type": "monstergroup", | ||
| "default": "mon_hazmatbot", | ||
| "monsters": [ { "monster": "mon_hazmatbot", "freq": 40, "cost_multiplier": 1 } ] | ||
| }, | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_ROBOT_EYEBOT", | ||
| "default": "mon_eyebot", | ||
| "monsters": [ { "monster": "mon_eyebot", "freq": 100, "cost_multiplier": 0 } ] | ||
| }, | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_ROBOT_SECUBOT", | ||
| "default": "mon_secubot", | ||
| "monsters": [ { "monster": "mon_secubot", "freq": 100, "cost_multiplier": 0 } ] | ||
| }, | ||
| { | ||
| "type": "monstergroup", | ||
| "name": "GROUP_TURRET_RIOT", | ||
| "default": "mon_turret_riot", | ||
| "monsters": [ { "monster": "mon_turret_riot", "freq": 100, "cost_multiplier": 0 } ] | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -220,5 +220,55 @@ | |||||
| "death_drops": { }, | ||||||
| "death_function": [ "BROKEN" ], | ||||||
| "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] | ||||||
| }, | ||||||
| { | ||||||
| "id": "mon_turret_riot", | ||||||
I-am-Erk marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment.
Suggested change
Consistent monster IDs for UGVs. This should go in defense_bot.json too because we're likely to have moving ones at some point. |
||||||
| "type": "MONSTER", | ||||||
| "name": "riot control turret", | ||||||
| "description": "These rapid-deployable riot control turrets were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs. They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'. In the days before the cataclysm, massive stockrooms of the things were put into circulation.", | ||||||
| "default_faction": "cop_bot", | ||||||
| "looks_like": "mon_turret", | ||||||
| "species": [ "ROBOT" ], | ||||||
| "diff": 20, | ||||||
| "volume": "62500 ml", | ||||||
| "weight": 172000, | ||||||
| "hp": 30, | ||||||
| "speed": 100, | ||||||
| "material": [ "steel" ], | ||||||
| "symbol": "2", | ||||||
| "color": "blue", | ||||||
| "aggression": 50, | ||||||
| "morale": 100, | ||||||
| "anger_triggers": [ "PLAYER_CLOSE", "HURT", "FRIEND_ATTACKED", "FRIEND_DIED" ], | ||||||
| "armor_bash": 14, | ||||||
| "armor_cut": 16, | ||||||
| "vision_day": 50, | ||||||
| "vision_night": 3, | ||||||
| "revert_to_itype": "bot_turret_riot", | ||||||
| "starting_ammo": { "40mm_sponge": 100 }, | ||||||
| "special_attacks": [ | ||||||
| { | ||||||
| "//": "For later: needs the ability to preferentially target legs and arms", | ||||||
| "type": "gun", | ||||||
| "cooldown": 1, | ||||||
| "move_cost": 150, | ||||||
| "gun_type": "pseudo_m203", | ||||||
| "ammo_type": "40mm_sponge", | ||||||
| "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ], | ||||||
| "fake_dex": 12, | ||||||
| "ranges": [ [ 0, 30, "DEFAULT" ] ], | ||||||
| "require_targeting_npc": true, | ||||||
| "require_targeting_monster": true, | ||||||
| "laser_lock": false, | ||||||
| "targeting_cost": 200, | ||||||
| "targeting_timeout_extend": -10, | ||||||
| "targeting_sound": "\"Universal curfew is in effect. Please return to your home. This unit is authorized to open fire.\"", | ||||||
| "targeting_volume": 50, | ||||||
| "no_ammo_sound": "a chk!" | ||||||
| } | ||||||
| ], | ||||||
| "death_drops": { }, | ||||||
| "death_function": [ "BROKEN" ], | ||||||
| "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ] | ||||||
| } | ||||||
| ] | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consistent IDs for our UGVs makes it easier to know exactly what they are by ID only.