Skip to content

Commit

Permalink
snake spawns, stuck weapon techniques, no exploding secubots
Browse files Browse the repository at this point in the history
  • Loading branch information
pisskop committed Oct 8, 2017
1 parent 95161c6 commit 5640288
Show file tree
Hide file tree
Showing 11 changed files with 394 additions and 107 deletions.
281 changes: 246 additions & 35 deletions items/melee.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modinfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"description": "Rebalances spawn list, adds new monsters and items, adds new buildings and fortifies old buildings, and strives to create a harsher enviornment to survive in.",
"category": "creatures",
"author": "pisskop",
"version": "5.5.4", "//": "For the CDDA Launcher Program.",
"version": "5.5.5", "//": "For the CDDA Launcher Program.",
"path": ""
},
{
Expand Down
2 changes: 1 addition & 1 deletion monsters/mutant.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
[ "hammer", 30 ]
],
"special_when_hit": [ "ACIDSPLASH", 80 ],
"flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "BASHES", "BORES", "POISON", "SUNDEATH", "ACIDPROOF", "LEATHER" ]
"flags": [ "SEES", "SMELLS", "HEARS", "GOODHEARING", "CAN_DIG", "BASHES", "BORES", "POISON", "SUNDEATH", "ACIDPROOF", "LEATHER" ]
},
{
"id": "mon_amigara_horror",
Expand Down
13 changes: 10 additions & 3 deletions monsters/robot.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@
"copy-from": "mon_molebot",
"name": "miner bot",
"description": "A long snake-like, segmented robot built to create tunnels and detonate landmines.",
"aggression": -10,
"size": "MEDIUM",
"hp": 80,
"speed": 40,
"aggression": -10,
"morale": 100,
"melee_skill": 5,
"melee_dice": 1,
Expand All @@ -96,19 +98,24 @@
"melee_damage": [
{ "damage_type": "stab", "amount": 18 }
],
"dodge": 2,
"dodge": 3,
"armor_bash": 10,
"armor_cut": 18,
"vision_day": 5,
"vision_night": 5,
"special_attacks": [
[ "slash", 10 ],
{ "type": "leap", "cooldown": 30, "max_range": 3, "allow_no_target": false }
],
"death_drops": {
"groups": [
[ "robots", 70 ],
[ "molebot", 30 ]
]
},
"death_function": [ "BROKEN" ],
"flags": [ "SEES", "HEARS", "GOODHEARING", "BORES", "CAN_DIG", "NO_BREATHE", "ELECTRONIC", "PATH_AVOID_DANGER_1" ]
"flags": [ "SEES", "HEARS", "GOODHEARING", "BORES", "CAN_DIG", "NO_BREATHE", "ELECTRONIC", "PATH_AVOID_DANGER_1" ],
"anger_triggers": ["HURT", "FRIEND_DIED", "PLAYER_CLOSE", "STALK"]
},
{
"id": "mon_broken_cyborg",
Expand Down
38 changes: 19 additions & 19 deletions monsters/zombie.json
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_scorched",
"upgrades": {
"half_life": 4,
"half_life": 5,
"into_group": "GROUP_ZOMBIE_DECAY"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES" ]
Expand Down Expand Up @@ -498,7 +498,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_scorched",
"upgrades": {
"half_life": 4,
"half_life": 5,
"into": "mon_zombie_blind_pk"
},
"flags": [ "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON" ]
Expand Down Expand Up @@ -581,7 +581,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_scorched",
"upgrades": {
"half_life": 9,
"half_life": 10,
"into_group": "GROUP_ZOMBIE_UPGRADE"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON" ]
Expand Down Expand Up @@ -624,7 +624,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_scorched",
"upgrades": {
"half_life": 9,
"half_life": 10,
"into_group": "GROUP_ZOMBIE_UPGRADE"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON" ]
Expand Down Expand Up @@ -667,7 +667,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_scorched_pk",
"upgrades": {
"half_life": 28,
"half_life": 30,
"into_group": "GROUP_ZOMBIE_EVO"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON" ]
Expand All @@ -681,7 +681,7 @@
{ "type": "bite", "cooldown": 5 }
],
"upgrades": {
"half_life": 10,
"half_life": 12,
"into_group": "GROUP_CHILD_ZOMBIE_UPGRADE"
}
},
Expand Down Expand Up @@ -726,7 +726,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_child_scorched",
"upgrades": {
"half_life": 10,
"half_life": 12,
"into_group": "GROUP_CHILD_ZOMBIE_UPGRADE"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "BLEED", "POISON", "GUILT", "NO_BREATHE", "REVIVES", "BONES" ]
Expand Down Expand Up @@ -775,7 +775,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_child_scorched",
"upgrades": {
"half_life": 10,
"half_life": 12,
"into_group": "GROUP_CHILD_ZOMBIE_UPGRADE"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "BLEED", "POISON", "GUILT", "NO_BREATHE", "REVIVES", "BONES" ]
Expand Down Expand Up @@ -1064,7 +1064,7 @@
],
"burn_into": "mon_zombie_crawler_scorched",
"upgrades": {
"half_life": 14,
"half_life": 19,
"into": "mon_zombie_crawler_pk_weak"
}
},
Expand All @@ -1079,7 +1079,7 @@
{ "type": "bite", "cooldown": 5, "min_mul": 0.7 }
],
"upgrades": {
"half_life": 21,
"half_life": 22,
"into": "mon_zombie_hollow"
}
},
Expand Down Expand Up @@ -1118,7 +1118,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_smoker",
"upgrades": {
"half_life": 21,
"half_life": 22,
"into": "mon_zombie_hollow"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON" ]
Expand Down Expand Up @@ -1161,7 +1161,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_smoker",
"upgrades": {
"half_life": 21,
"half_life": 22,
"into": "mon_zombie_hollow"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON" ]
Expand Down Expand Up @@ -1209,7 +1209,7 @@
"speed": 135,
"burn_into": "mon_zombie_fiend_pk",
"upgrades": {
"half_life": 49,
"half_life": 57,
"into": "mon_zombie_hulk_pk"
}
},
Expand Down Expand Up @@ -1438,7 +1438,7 @@
],
"burn_into": "mon_zombie_crawler_pk_weak",
"upgrades": {
"half_life": 11,
"half_life": 13,
"into": "mon_zombie_shady_pk"
}
},
Expand Down Expand Up @@ -1544,7 +1544,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_scorched_pk",
"upgrades": {
"half_life": 35,
"half_life": 39,
"into": "mon_zombie_hollow_pk"
},
"flags": [ "SEES", "HEARS", "REVIVES", "STUMBLES", "SMELLS", "WARM", "BASHES", "GRABS", "GROUP_BASH", "POISON", "NO_BREATHE" ]
Expand Down Expand Up @@ -1688,7 +1688,7 @@
{ "type": "bite", "cooldown": 5 }
],
"upgrades": {
"half_life": 14,
"half_life": 17,
"into": "mon_zombie_mancroc"
}
},
Expand Down Expand Up @@ -1731,7 +1731,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_zombie_scorched",
"upgrades": {
"half_life": 14,
"half_life": 17,
"into": "mon_zombie_scales"
},
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "BLEED", "SWIMS", "REVIVES", "BONES", "PUSH_MON" ]
Expand Down Expand Up @@ -1821,7 +1821,7 @@
"armor_stab": 16,
"special_attacks": [ [ "scratch", 10 ] ],
"upgrades": {
"half_life": 14,
"half_life": 19,
"into": "mon_skeleton_pk"
},
"flags": [ "SEES", "HARDTOSHOOT", "REVIVES", "NO_BREATHE", "BONES", "NO_NECRO", "POISON" ]
Expand Down Expand Up @@ -1865,7 +1865,7 @@
"death_function": [ "NORMAL" ],
"burn_into": "mon_skeleton_scorched",
"upgrades": {
"half_life": 35,
"half_life": 37,
"into": "mon_skeleton_husk"
},
"flags": [ "SEES", "HEARS", "STUMBLES", "HARDTOSHOOT", "REVIVES", "NO_BREATHE", "BONES", "NO_NECRO", "POISON" ]
Expand Down
4 changes: 2 additions & 2 deletions pk_overmap.json
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
"city_sizes": [5, 16],
"occurrences": [1, 2],
"rotate": false,
"spawns": { "group": "GROUP_DOOM", "population":[100, 200], "radius":[12,35] }
"spawns": { "group": "GROUP_DOOM", "population":[50, 130], "radius":[12,35] }
},
{
"type": "overmap_special",
Expand Down Expand Up @@ -464,7 +464,7 @@
"city_sizes": [4, 16],
"occurrences": [0, 1],
"rotate": false,
"spawns": { "group": "GROUP_DOOM", "population":[150, 350], "radius":[25,65] }
"spawns": { "group": "GROUP_DOOM", "population":[125, 350], "radius":[25,65] }
},
{
"type": "overmap_special",
Expand Down
4 changes: 2 additions & 2 deletions pk_overmap_terrain.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"color" : "brown",
"see_cost" : 2,
"extras" : "field",
"spawns" : { "group": "GROUP_FIELD", "population": [0, 1], "chance": 35 },
"spawns" : { "group": "GROUP_FIELD", "population": [0, 1], "chance": 30 },
"flags" : [ "NO_ROTATE" ]
},
{
Expand All @@ -18,7 +18,7 @@
"color" : "green",
"see_cost" : 3,
"extras" : "field",
"spawns" : { "group": "GROUP_FOREST", "population": [0, 3], "chance": 75 },
"spawns" : { "group": "GROUP_FOREST", "population": [0, 3], "chance": 60 },
"flags" : [ "NO_ROTATE" ]
},
{
Expand Down
64 changes: 64 additions & 0 deletions pk_technique.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,69 @@
[ "damage", "cut", 1.0 ],
[ "damage", "stab", 0.8 ]
]
},
{
"id": "stuck_in_1",
"type": "technique",
"name": "lodge-in risk",
"min_melee": 0,
"max_melee": 4,
"weighting": -20,
"unarmed_allowed": false,
"melee_allowed": true,
"stun_dur": 1,
"messages": [
"Your weapon gets well-lodged in the wound and takes time to remove! It strikes for",
"<npcname>%s weapon gets well-lodged in the wound and takes time to remove! It strikes for"
],
"mult_bonuses": [
[ "movecost", 1.67 ],
[ "damage", "bash", 1.67 ],
[ "damage", "cut", 1.2 ],
[ "damage", "stab", 1.3 ]
]
},
{
"id": "stuck_in_2",
"type": "technique",
"name": "stuck-in risk",
"min_melee": 0,
"max_melee": 5,
"weighting": -20,
"crit_tec": true,
"unarmed_allowed": false,
"melee_allowed": true,
"messages": [
"Your weapon gets stuck in the wound and takes some time to remove! It strikes for",
"<npcname>%s weapon gets stuck in the wound and takes some time to remove! It strikes for"
],
"mult_bonuses": [
[ "movecost", 1.33 ],
[ "damage", "bash", 1.1 ],
[ "damage", "cut", 1.2 ],
[ "damage", "stab", 1.1 ]
]
},
{
"id": "stuck_in_3",
"type": "technique",
"name": "wedge-in chance",
"min_melee": 4,
"weighting": -20,
"crit_tec": true,
"unarmed_allowed": false,
"melee_allowed": true,
"down_dur" : 1,
"stun_dur": 1,
"messages": [
"Your weapon leverages your opponent off-balance! It strikes for",
"<npcname>%s leverages their opponent off-balance! It strikes for"
],
"mult_bonuses": [
[ "movecost", 1.25 ],
[ "damage", "bash", 1.2 ],
[ "damage", "cut", 1.25 ],
[ "damage", "stab", 1.2 ]
]
}
]
2 changes: 2 additions & 0 deletions spawns/pk_spawnlist_forest-river.json
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,8 @@
{ "monster": "mon_null", "freq": 200, "cost_multiplier": 1, "conditions": ["WINTER"] },
{ "monster": "mon_null", "freq": 100, "cost_multiplier": 1, "conditions": ["DAWN", "DUSK", "NIGHT", "WINTER"] },

{ "monster": "mon_molebot", "freq": 20, "cost_multiplier": 3, "pack_size": [1,3] },

{ "monster": "mon_fougar", "freq": 1, "cost_multiplier": 8, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] },
{ "monster": "mon_feer", "freq": 1, "cost_multiplier": 9, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"], "pack_size": [2,5] },
{ "monster": "mon_foose", "freq": 1, "cost_multiplier": 10, "conditions": ["SPRING", "SUMMER", "AUTUMN"] },
Expand Down
Loading

0 comments on commit 5640288

Please sign in to comment.