Skip to content

Commit

Permalink
New island prison layout (CleverRaven#46726)
Browse files Browse the repository at this point in the history
* Tweaked some things in mapgen palette
* Added "prisoner" variants for three zombie types
* Added a new "get_lost" talk tag
* Added a new "prisoners" faction
* Added new NPC class, NPC types with this new class, and a whole lot of talking
* Added a new island prison layout and the required stuff for it
* Added a new start location in a new prison
* Added a case when player already has the id card at the time when he meets the leader of prisoners
* Added a small church with a named zombie
Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: matskuman5 <selinmatias5@gmail.com>
  • Loading branch information
Night-Pryanik authored and feinorgh committed Feb 8, 2021
1 parent 8b0e40a commit 04270c9
Show file tree
Hide file tree
Showing 10 changed files with 1,538 additions and 14 deletions.
725 changes: 722 additions & 3 deletions data/json/mapgen/prison_1.json

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions data/json/mapgen_palettes/prison.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,16 @@
},
"toilets": { "T": { } },
"items": {
"D": [ { "item": "prison_textile", "chance": 100, "repeat": [ 1, 20 ] } ],
"W": [ { "item": "prison_textile", "chance": 100, "repeat": [ 1, 20 ] } ],
"D": [ { "item": "prison_textile", "chance": 100, "repeat": [ 1, 5 ] } ],
"W": [ { "item": "prison_textile", "chance": 100, "repeat": [ 1, 5 ] } ],
"b": [ { "item": "novels", "chance": 30 }, { "item": "contraband", "chance": 10 }, { "item": "bed", "chance": 50 } ],
"d": [ { "item": "magazines", "chance": 30, "repeat": [ 1, 5 ] }, { "item": "office", "chance": 30, "repeat": [ 1, 2 ] } ],
"d": [
{ "item": "magazines", "chance": 30, "repeat": [ 1, 5 ] },
{ "item": "SUS_office_desk", "chance": 30, "repeat": [ 1, 2 ] }
],
"e": { "item": "fridge", "chance": 60, "repeat": [ 1, 8 ] },
"i": [ { "item": "science", "chance": 30 }, { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ],
"m": [ { "item": "softdrugs", "chance": 40 }, { "item": "harddrugs", "chance": 40 } ],
"m": [ { "item": "softdrugs", "chance": 40, "repeat": [ 1, 3 ] }, { "item": "harddrugs", "chance": 40, "repeat": [ 1, 3 ] } ],
"o": { "item": "novels", "chance": 70, "repeat": [ 1, 3 ] },
"r": [ { "item": "science", "chance": 30 }, { "item": "cleaning", "chance": 30, "repeat": [ 1, 4 ] } ],
"y": { "item": "cleaning", "chance": 60 },
Expand Down
27 changes: 27 additions & 0 deletions data/json/monsters/zed_prisoner.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,32 @@
"color": "green",
"melee_dice_sides": 4,
"death_drops": "mon_zombie_prisoner_death_drops"
},
{
"id": "mon_zombie_prisoner_brute",
"type": "MONSTER",
"name": { "str": "prisoner brute" },
"description": "This muscular zombie wears black and white striped prisoner clothes.",
"copy-from": "mon_zombie_brute",
"looks_like": "mon_zombie_brute",
"death_drops": "mon_zombie_prisoner_death_drops"
},
{
"id": "mon_zombie_prisoner_fat",
"type": "MONSTER",
"name": { "str": "fat prisoner" },
"description": "This fat zombie wears black and white striped prisoner clothes.",
"copy-from": "mon_zombie_fat",
"looks_like": "mon_zombie_fat",
"death_drops": "mon_zombie_prisoner_death_drops"
},
{
"id": "mon_zombie_prisoner_tough",
"type": "MONSTER",
"name": { "str": "tough prisoner" },
"description": "This tough-looking zombie wears black and white striped prisoner clothes.",
"copy-from": "mon_zombie_tough",
"looks_like": "mon_zombie_tough",
"death_drops": "mon_zombie_prisoner_death_drops"
}
]
27 changes: 27 additions & 0 deletions data/json/npcs/factions.json
Original file line number Diff line number Diff line change
Expand Up @@ -677,5 +677,32 @@
"no_faction": { "knows your voice": true }
},
"description": "A small family trying to survive in this new world."
},
{
"type": "faction",
"id": "prisoners",
"name": "Prisoners",
"likes_u": 0,
"respects_u": 0,
"known_by_u": true,
"size": 100,
"power": 100,
"food_supply": 230400,
"wealth": 45000000,
"relations": {
"hells_raiders": {
"kill on sight": false,
"watch your back": true,
"share my stuff": true,
"guard your stuff": true,
"lets you in": true,
"defends your space": true,
"knows your voice": true
},
"free_merchants": { "kill on sight": true },
"old_guard": { "kill on sight": true },
"your_followers": { "kill on sight": false }
},
"description": "Former prisoners who got their freedom during the apocalypse."
}
]
Loading

0 comments on commit 04270c9

Please sign in to comment.