Skip to content

Commit

Permalink
Merge pull request #136 from Kenshut/Плюшки-ватрушки!
Browse files Browse the repository at this point in the history
плюшки ватрушки!
  • Loading branch information
AtomicFox556 authored Dec 5, 2023
2 parents d3be7d9 + c84112d commit 21bf745
Show file tree
Hide file tree
Showing 21 changed files with 652 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/msvc-full-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
id: runvcpkg
with:
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'

- name: Integrate vcpkg
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
id: runvcpkg
with:
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
- name: Install dependencies (windows msvc) (3/3)
if: runner.os == 'Windows'
run: |
Expand Down
7 changes: 7 additions & 0 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1925,6 +1925,7 @@
{
"id": "fungaloid",
"type": "harvest",
"message": "<fungaloid_harvest>",
"entries": [
{ "drop": "veggy_tainted", "type": "flesh", "mass_ratio": 0.5 },
{ "drop": "plant_sac", "type": "offal", "mass_ratio": 0.2 },
Expand Down Expand Up @@ -1962,6 +1963,7 @@
{
"id": "biollante",
"type": "harvest",
"message": "<triffid_harvest>",
"//": "todo: add biollante item",
"entries": [
{ "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.5 },
Expand All @@ -1972,6 +1974,7 @@
{
"id": "triffid_small",
"type": "harvest",
"message": "<triffid_harvest>",
"entries": [
{ "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.5 },
{ "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 },
Expand All @@ -1981,6 +1984,7 @@
{
"id": "triffid_paralytic",
"type": "harvest",
"message": "<triffid_harvest>",
"entries": [
{ "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.4 },
{ "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 },
Expand All @@ -1993,6 +1997,7 @@
"id": "triffid_acid",
"//": "acid blood type for plant based creaturs.",
"type": "harvest",
"message": "<triffid_harvest>",
"entries": [
{ "drop": "blood_acid_plant", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.5 },
Expand All @@ -2003,6 +2008,7 @@
{
"id": "triffid_fungal_fighter",
"type": "harvest",
"message": "<triffid_harvest>",
"entries": [
{ "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.4 },
{ "drop": "veggy", "type": "flesh", "mass_ratio": 0.2 },
Expand All @@ -2015,6 +2021,7 @@
{
"id": "triffid_queen",
"type": "harvest",
"message": "<triffid_harvest>",
"entries": [
{ "drop": "log", "type": "bone", "mass_ratio": 0.35 },
{ "drop": "stick_fiber", "type": "bone", "mass_ratio": 0.15 },
Expand Down
74 changes: 74 additions & 0 deletions data/json/mapgen/map_extras/laststand.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
[
{
"type": "monstergroup",
"name": "GROUP_LAST_STAND",
"default": "mon_null",
"monsters": [
{ "monster": "mon_civilian_police", "weight": 1, "cost_multiplier": 1, "ends": "5 days" },
{ "monster": "mon_civilian_zombiefighter", "weight": 4, "cost_multiplier": 1, "ends": "5 days" }
]
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_laststand",
"object": {
"rows": [
" ",
" ",
" ",
" ",
" ################## ",
" ################## ",
" ################## ",
" ### ### ",
" ### ### ",
" ### ### ",
" ### ### ",
" ### ### ",
" ### ### ",
" ### ### ",
" ### ### ",
" ### ### ",
" ################## ",
" ################## ",
" ################## ",
" ",
" ",
" ",
" ",
" "
],
"furniture": {
"#": [
[ "f_barricade_road", 10 ],
[ "f_sandbag_half", 10 ],
[ "f_earthbag_half", 10 ],
[ "f_gravelbag_half", 10 ],
[ "f_table", 10 ],
[ "f_bench", 10 ],
"f_55gal_firebarrel",
"f_30gal_firebarrel",
"f_pallet_brick",
"f_pallet_cement",
"f_stack_plank",
"f_metal_table",
"f_armchair",
"f_chair",
"f_rack",
"f_locker",
"f_displaycase",
"f_recycle_bin",
"f_trashcan",
"f_metal_trashcan",
"f_rubble",
"f_wreckage",
[ "f_null", 150 ]
]
},
"place_monster": [ { "group": "GROUP_LAST_STAND", "x": [ 6, 17 ], "y": [ 6, 16 ], "chance": 100, "repeat": [ 10, 15 ] } ],
"place_loot": [ { "group": "trash", "x": [ 6, 17 ], "y": [ 6, 16 ], "repeat": [ 5, 10 ] } ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
}
}
]
99 changes: 99 additions & 0 deletions data/json/monster_weakpoints/fungaloid_weakpoints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
[
{
"type": "weakpoint_set",
"id": "wps_fungaloid",
"weakpoints": [
{
"id": "arm",
"name": "the arm",
"crit_mult": { "all": 0.75 },
"difficulty": { "ranged": 4, "melee": 3 },
"coverage_mult": { "point": 0.75 },
"effects": [
{ "effect": "staggered", "chance": 15, "message": "The %s is knocked off-balance!", "damage_required": [ 10, 30 ] },
{
"effect": "staggered",
"chance": 25,
"message": "The %s is knocked off-balance!",
"damage_required": [ 31, 100 ]
}
],
"coverage": 6
},
{
"id": "leg",
"name": "the leg",
"crit_mult": { "all": 0.75 },
"difficulty": { "ranged": 3, "melee": 1 },
"coverage_mult": { "point": 0.75 },
"effects": [
{ "effect": "downed", "chance": 5, "message": "The %s is knocked down!", "damage_required": [ 10, 30 ] },
{ "effect": "downed", "chance": 15, "message": "The %s is knocked down!", "damage_required": [ 31, 50 ] },
{ "effect": "downed", "chance": 25, "message": "The %s is knocked down!", "damage_required": [ 51, 100 ] }
],
"coverage": 15
},
{
"id": "head",
"name": "the head",
"coverage": 5,
"crit_mult": { "all": 1.1 },
"armor_mult": { "physical": 0.75 },
"difficulty": { "melee": 2, "ranged": 5 },
"effects": [
{
"effect": "stunned",
"duration": [ 1, 2 ],
"chance": 5,
"message": "The %s is stunned!",
"damage_required": [ 1, 10 ]
},
{
"effect": "stunned",
"duration": [ 1, 2 ],
"chance": 25,
"message": "The %s is stunned!",
"damage_required": [ 11, 50 ]
},
{
"effect": "stunned",
"duration": [ 1, 2 ],
"chance": 45,
"message": "The %s is stunned!",
"damage_required": [ 51, 100 ]
}
]
}
]
},
{
"type": "weakpoint_set",
"id": "wps_fungaloid_structure",
"weakpoints": [
{
"id": "gap",
"name": "a small gap in the thick wall",
"coverage": 5,
"difficulty": { "melee": 4, "ranged": 5 },
"coverage_mult": { "broad": 0.5 },
"armor_mult": { "all": 0.25 }
},
{
"id": "joint",
"name": "a soft fold in the thick wall",
"coverage": 10,
"difficulty": { "melee": 3, "ranged": 5 },
"coverage_mult": { "point": 0.75 },
"armor_mult": { "all": 0.5 }
},
{
"id": "hard_hide",
"name": "a particularly thick patch of the wall",
"armor_mult": { "all": 1.25 },
"crit_mult": { "all": 0.75 },
"coverage_mult": { "melee": 0.75 },
"coverage": 3
}
]
}
]
80 changes: 80 additions & 0 deletions data/json/monster_weakpoints/slime_weakpoints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
[
{
"type": "weakpoint_set",
"id": "wps_slime",
"weakpoints": [
{
"id": "body",
"name": "the body",
"crit_mult": { "all": 0.75 },
"difficulty": { "ranged": 4, "melee": 3 },
"coverage_mult": { "point": 0.75 },
"effects": [
{ "effect": "staggered", "chance": 15, "message": "The %s is knocked off-balance!", "damage_required": [ 10, 30 ] },
{
"effect": "staggered",
"chance": 25,
"message": "The %s is knocked off-balance!",
"damage_required": [ 31, 100 ]
}
],
"coverage": 6
},
{
"id": "insensitive_spot",
"name": "a spot with virtually nothing to damage",
"armor_mult": { "all": 1.25 },
"crit_mult": { "all": 0.75 },
"coverage_mult": { "melee": 0.75 },
"coverage": 3
},
{
"id": "organ",
"name": "an organ inside the slime, causing the slime to freeze up briefly as it reconstitutes it",
"crit_mult": { "all": 0.75 },
"difficulty": { "melee": 3, "ranged": 5 },
"coverage_mult": { "melee": 0.75 },
"effects": [
{
"effect": "stunned",
"duration": [ 1, 2 ],
"chance": 5,
"message": "The %s is stunned!",
"damage_required": [ 1, 10 ]
},
{
"effect": "stunned",
"duration": [ 1, 2 ],
"chance": 25,
"message": "The %s is stunned!",
"damage_required": [ 11, 50 ]
},
{
"effect": "stunned",
"duration": [ 1, 2 ],
"chance": 45,
"message": "The %s is stunned!",
"damage_required": [ 51, 100 ]
}
],
"coverage": 3
},
{
"id": "fragment",
"name": "the body, separating a fragment that you manage to keep from rejoining the slime until the fragment melts away",
"crit_mult": { "all": 0.75 },
"difficulty": { "ranged": 3, "melee": 1 },
"coverage_mult": { "point": 0.75 },
"coverage": 5
},
{
"id": "pseudopod",
"name": "a pseudopod reaching out to strike you when you deftly counter strike it",
"crit_mult": { "all": 0.75 },
"difficulty": { "ranged": 7, "melee": 5 },
"coverage_mult": { "point": 0.75 },
"coverage": 5
}
]
}
]
Loading

0 comments on commit 21bf745

Please sign in to comment.