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.

Sign up for GitHub

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

[CR] Update Modular Turrets and Salvaged Robots to match Mainline style and recipes Fixes #35689 #35752

Merged
merged 25 commits into from
Jan 20, 2020
Merged

[CR] Update Modular Turrets and Salvaged Robots to match Mainline style and recipes Fixes #35689 #35752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c9ae45a
Update uncraft_corpse.json
CSHague Nov 25, 2019
0380486
Update uncraft_corpse.json
CSHague Nov 25, 2019
803e2df
Update uncraft_corpse.json
CSHague Nov 25, 2019
9295e4b
Add DROPS_AMMO and appropriate ammo count
CSHague Nov 26, 2019
a03ecb5
Add DROPS_AMMO to turrets and appropriate ammo count
CSHague Nov 26, 2019
e7674fb
Fixed Syntax (again)
CSHague Nov 26, 2019
1b5725c
More syntax
CSHague Nov 26, 2019
0400a9e
Syntax error
CSHague Nov 26, 2019
05a7345
Linting
CSHague Nov 26, 2019
fc6a9df
Linting
CSHague Nov 26, 2019
f080d31
Linting
CSHague Nov 26, 2019
36d35d7
Linting (again?)
CSHague Nov 26, 2019
afe1ca0
Linting
CSHague Nov 26, 2019
333c5ad
Deleted spaces
CSHague Nov 26, 2019
4936b36
Cleanup spaces
CSHague Nov 26, 2019
7d09e13
Cleanup Spaces
CSHague Nov 26, 2019
cb319ea
Cleanup spaces
CSHague Nov 26, 2019
7db0f66
Add Modules to Auto armor recipes
CSHague Nov 26, 2019
14e06aa
Fix flag structure and ammunition flags/count
CSHague Nov 27, 2019
024b122
Remove lights from Turrets to match Main
CSHague Nov 27, 2019
75e5842
Remove Lights from some robots
CSHague Nov 27, 2019
5b2814e
Remove lightstrip from Arson hack
CSHague Nov 28, 2019
84d0ed0
Removed Lighstrips from turrets
CSHague Nov 28, 2019
e914500
Remove power armor backpack frames
CSHague Dec 6, 2019
4663971
Merge branch 'master' into CSHague-Modular-Turret-Update
CSHague Dec 18, 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
68 changes: 30 additions & 38 deletions data/mods/Modular_Turrets/monster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"default_faction": "defense_bot",
"diff": 14,
"color": "light_gray",
"luminance": 200,
"revert_to_itype": "bot_turret_disarmed"
},
{
Expand All @@ -41,7 +40,6 @@
"symbol": "t",
"description": "The Leadworks LLC's TX series turret, a military-grade automated gun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike. It requires a integrated gun module to operate.",
"color": "light_gray",
"luminance": 200,
"revert_to_itype": "bot_milturret_disarmed"
},
{
Expand All @@ -53,7 +51,6 @@
"description": "The DoubleTech T-series turret, an advanced automated gun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike. It requires an integrated gun module to function.",
"default_faction": "defense_bot",
"color": "light_gray",
"luminance": 200,
"revert_to_itype": "bot_advturret_disarmed"
},
{
Expand All @@ -66,7 +63,6 @@
"default_faction": "defense_bot",
"diff": 10,
"color": "light_gray",
"luminance": 200,
"revert_to_itype": "bot_turret_9mm",
"starting_ammo": { "9mm": 100 },
"special_attacks": [
Expand All @@ -80,7 +76,8 @@
"no_ammo_sound": "click click!",
"ranges": [ [ 0, 2, "BURST" ], [ 3, 6, "AUTO" ], [ 7, 12, "DEFAULT" ] ]
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_turret_shot",
Expand All @@ -92,7 +89,6 @@
"default_faction": "defense_bot",
"diff": 10,
"color": "red",
"luminance": 200,
"revert_to_itype": "bot_turret_shot",
"starting_ammo": { "shot_00": 100 },
"special_attacks": [
Expand All @@ -106,7 +102,8 @@
"no_ammo_sound": "click click!",
"ranges": [ [ 0, 8, "DEFAULT" ] ]
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_turret_teargas",
Expand All @@ -118,7 +115,6 @@
"default_faction": "cop_bot",
"diff": 10,
"color": "blue",
"luminance": 300,
"revert_to_itype": "bot_turret_teargas",
"starting_ammo": { "40x46mm_m651": 50 },
"special_attacks": [
Expand All @@ -132,7 +128,8 @@
"no_ammo_sound": "click click!",
"ranges": [ [ 0, 6, "DEFAULT" ], [ 7, 12, "BURST" ] ]
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_turret_beanbag",
Expand All @@ -144,7 +141,6 @@
"default_faction": "cop_bot",
"diff": 5,
"color": "blue",
"luminance": 300,
"revert_to_itype": "bot_turret_beanbag",
"starting_ammo": { "40x46mm_m1006": 50 },
"special_attacks": [
Expand All @@ -158,7 +154,8 @@
"no_ammo_sound": "click click!",
"ranges": [ [ 0, 8, "DEFAULT" ] ]
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_milturret_556",
Expand All @@ -170,9 +167,8 @@
"default_faction": "military",
"diff": 20,
"color": "green",
"luminance": 200,
"revert_to_itype": "bot_milturret_556",
"starting_ammo": { "556": 100 },
"starting_ammo": { "556": 1600 },
"special_attacks": [
{
"type": "gun",
Expand All @@ -191,7 +187,8 @@
"targeting_sound": "\"Hostile Detected.\"",
"targeting_volume": 10
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_milturret_308",
Expand All @@ -203,9 +200,8 @@
"default_faction": "military",
"diff": 20,
"color": "green",
"luminance": 200,
"revert_to_itype": "bot_milturret_308",
"starting_ammo": { "762_51": 100 },
"starting_ammo": { "762_51": 1000 },
"special_attacks": [
{
"type": "gun",
Expand All @@ -224,7 +220,8 @@
"targeting_sound": "\"Hostile Detected.\"",
"targeting_volume": 10
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_milturret_50bmg",
Expand All @@ -236,9 +233,8 @@
"default_faction": "military",
"diff": 30,
"color": "green",
"luminance": 200,
"revert_to_itype": "bot_milturret_50bmg",
"starting_ammo": { "50bmg": 100 },
"starting_ammo": { "50bmg": 400 },
"special_attacks": [
{
"type": "gun",
Expand All @@ -258,7 +254,8 @@
"targeting_sound": "\"Hostile Detected.\"",
"targeting_volume": 10
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_milturret_8x40mm",
Expand All @@ -270,9 +267,8 @@
"default_faction": "military",
"diff": 20,
"color": "green",
"luminance": 200,
"revert_to_itype": "bot_milturret_8x40mm",
"starting_ammo": { "8mm_caseless": 100 },
"starting_ammo": { "8mm_caseless": 1200 },
"special_attacks": [
{
"type": "gun",
Expand All @@ -291,7 +287,8 @@
"targeting_sound": "\"Hostile Detected.\"",
"targeting_volume": 10
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_milturret_needle",
Expand All @@ -303,9 +300,8 @@
"default_faction": "military",
"diff": 20,
"color": "green",
"luminance": 200,
"revert_to_itype": "bot_milturret_needle",
"starting_ammo": { "5x50dart": 100 },
"starting_ammo": { "5x50dart": 1000 },
"special_attacks": [
{
"type": "gun",
Expand All @@ -324,7 +320,8 @@
"targeting_sound": "\"Hostile Detected.\"",
"targeting_volume": 10
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_milturret_40mm",
Expand All @@ -336,7 +333,6 @@
"default_faction": "military",
"diff": 20,
"color": "red",
"luminance": 200,
"revert_to_itype": "bot_milturret_40mm",
"starting_ammo": { "40x46mm_m433": 50 },
"special_attacks": [
Expand All @@ -357,7 +353,8 @@
"targeting_sound": "\"Hostile Detected.\"",
"targeting_volume": 10
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_milturret_flame",
Expand All @@ -369,9 +366,8 @@
"default_faction": "military",
"diff": 20,
"color": "red",
"luminance": 200,
"revert_to_itype": "bot_milturret_flame",
"starting_ammo": { "napalm": 100 },
"starting_ammo": { "napalm": 10000 },
"special_attacks": [
{
"type": "gun",
Expand Down Expand Up @@ -403,7 +399,6 @@
"default_faction": "military",
"diff": 20,
"color": "yellow",
"luminance": 300,
"revert_to_itype": "bot_advturret_laser",
"special_attacks": [
{
Expand Down Expand Up @@ -433,7 +428,6 @@
"default_faction": "military",
"diff": 10,
"color": "light_green",
"luminance": 300,
"revert_to_itype": "bot_advturret_acid",
"special_attacks": [
{
Expand All @@ -459,7 +453,6 @@
"default_faction": "military",
"diff": 20,
"color": "magenta",
"luminance": 300,
"revert_to_itype": "bot_advturret_plasma",
"special_attacks": [
{
Expand Down Expand Up @@ -490,9 +483,8 @@
"default_faction": "military",
"diff": 30,
"color": "magenta",
"luminance": 300,
"revert_to_itype": "bot_advturret_rail",
"starting_ammo": { "steel_rail": 100 },
"starting_ammo": { "steel_rail": 200 },
"special_attacks": [
{
"type": "gun",
Expand All @@ -511,7 +503,8 @@
"targeting_sound": "\"Hostile detected.\"",
"targeting_volume": 10
}
]
],
"extend": { "flags": [ "DROPS_AMMO" ] }
},
{
"id": "mon_advturret_lightning",
Expand All @@ -523,7 +516,6 @@
"default_faction": "military",
"diff": 20,
"color": "yellow",
"luminance": 300,
"revert_to_itype": "bot_advturret_lightning",
"special_attacks": [
{
Expand Down Expand Up @@ -554,7 +546,6 @@
"default_faction": "military",
"diff": 10,
"color": "yellow",
"luminance": 300,
"revert_to_itype": "bot_advturret_emp",
"special_attacks": [
{
Expand Down Expand Up @@ -599,6 +590,7 @@
"ranges": [ [ 0, 2, "BURST" ], [ 3, 6, "AUTO" ], [ 7, 12, "DEFAULT" ] ]
}
],
"extend": { "flags": [ "DROPS_AMMO" ] },
"death_drops": { "groups": [ [ "broken_robots", 10 ], [ "broken_ceramics", 10 ] ] }
}
]
3 changes: 0 additions & 3 deletions data/mods/Modular_Turrets/uncraft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@
[ [ "memory_module", 1 ] ],
[ [ "pathfinding_module", 1 ] ],
[ [ "identification_module", 1 ] ],
[ [ "lightstrip_inactive", 3 ] ],
[ [ "lens", 3 ] ],
[ [ "scrap", 2 ] ],
[ [ "e_scrap", 1 ] ],
Expand All @@ -335,7 +334,6 @@
[ [ "memory_module", 1 ] ],
[ [ "pathfinding_module", 1 ] ],
[ [ "identification_module", 1 ] ],
[ [ "lightstrip_inactive", 3 ] ],
[ [ "lens", 3 ] ],
[ [ "scrap", 2 ] ],
[ [ "e_scrap", 2 ] ],
Expand All @@ -356,7 +354,6 @@
[ [ "memory_module", 1 ] ],
[ [ "pathfinding_module", 1 ] ],
[ [ "identification_module", 1 ] ],
[ [ "lightstrip_inactive", 3 ] ],
[ [ "lens", 3 ] ],
[ [ "scrap", 2 ] ],
[ [ "e_scrap", 5 ] ],
Expand Down
Loading