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

[TropiCata] Flying bird audit #75769

Merged
merged 10 commits into from
Aug 18, 2024
Merged

[TropiCata] Flying bird audit #75769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
009bd5e
obsoletion
Karol1223 Aug 17, 2024
f012eb1
toucan
Karol1223 Aug 17, 2024
1d94481
parakeet
Karol1223 Aug 17, 2024
37d0cb3
macaw
Karol1223 Aug 17, 2024
c912fa5
useless field
Karol1223 Aug 17, 2024
15d2105
saffron finch + egg mongroup cleanup
Karol1223 Aug 17, 2024
a8d03ff
kiskadee
Karol1223 Aug 17, 2024
4ddaab5
hornero
Karol1223 Aug 17, 2024
5d9d43b
description updates
Karol1223 Aug 17, 2024
b85fe8f
Update dictionary.txt
Karol1223 Aug 17, 2024
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
59 changes: 28 additions & 31 deletions data/mods/TropiCataclysm/items/comestibles/egg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,42 +27,47 @@
{
"type": "COMESTIBLE",
"id": "egg_toucan",
"name": "toucan egg",
"copy-from": "egg_bird",
"rot_spawn": "GROUP_EGG_TOUCAN",
"rot_spawn_chance": 70
"name": { "str": "toco toucan egg" },
"spoils_in": "9 days",
"copy-from": "egg_crow",
"rot_spawn": "GROUP_EGG_TOUCAN"
},
{
"type": "COMESTIBLE",
"id": "egg_parrot",
"name": "parrot egg",
"copy-from": "egg_bird",
"rot_spawn": "GROUP_EGG_PARROT",
"rot_spawn_chance": 70
"name": { "str": "white-eyed parakeet egg" },
"spoils_in": "13 days",
"copy-from": "egg_bluejay",
"rot_spawn": "GROUP_EGG_PARROT"
},
{
"type": "COMESTIBLE",
"id": "egg_budgerigar",
"name": "budgerigar egg",
"copy-from": "egg_bird",
"rot_spawn": "GROUP_EGG_BUDGERIGAR",
"rot_spawn_chance": 70
"id": "egg_macaw",
"name": { "str": "blue-and-yellow macaw egg" },
"spoils_in": "13 days",
"copy-from": "egg_crow",
"rot_spawn": "GROUP_EGG_MACAW"
},
{
"type": "COMESTIBLE",
"id": "egg_cockatoo",
"name": "cockatoo egg",
"copy-from": "egg_bird",
"rot_spawn": "GROUP_EGG_COCKATOO",
"rot_spawn_chance": 70
"id": "egg_finch_saffron",
"name": { "str": "saffron finch egg" },
"copy-from": "egg_waxwing",
"rot_spawn": "GROUP_EGG_FINCH_SAFFRON"
},
{
"type": "COMESTIBLE",
"id": "egg_macaw",
"name": "macaw egg",
"copy-from": "egg_bird",
"rot_spawn": "GROUP_EGG_MACAW",
"rot_spawn_chance": 70
"id": "egg_great_kiskadee",
"name": { "str": "great kiskadee egg" },
"copy-from": "egg_bluejay",
"rot_spawn": "GROUP_EGG_GREAT_KISKADEE"
},
{
"type": "COMESTIBLE",
"id": "egg_rufous_hornero",
"name": { "str": "rufous hornero egg" },
"copy-from": "egg_waxwing",
"rot_spawn": "GROUP_EGG_RUFOUS_HORNERO"
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -104,14 +109,6 @@
"rot_spawn": "GROUP_EGG_CURASSOW",
"rot_spawn_chance": 70
},
{
"type": "COMESTIBLE",
"id": "egg_flamingo",
"name": "flamingo egg",
"copy-from": "egg_bird",
"rot_spawn": "GROUP_EGG_FLAMINGO",
"rot_spawn_chance": 70
},
{
"type": "COMESTIBLE",
"id": "egg_constrictor",
Expand Down
95 changes: 36 additions & 59 deletions data/mods/TropiCataclysm/monstergroups/eggs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,158 +4,135 @@
"type": "monstergroup",
"default": "mon_guinea_fowl_chick",
"monsters": [
{ "monster": "mon_guinea_fowl_chick", "weight": 50, "cost_multiplier": 1 },
{ "monster": "mon_quail_chick", "weight": 100, "cost_multiplier": 1 },
{ "monster": "mon_rhea_chick", "weight": 250, "cost_multiplier": 1 }
{ "monster": "mon_guinea_fowl_chick", "weight": 1 },
{ "monster": "mon_quail_chick", "weight": 2 },
{ "monster": "mon_rhea_chick", "weight": 5 }
]
},
{
"name": "GROUP_EGG_GUINEA_FOWL",
"type": "monstergroup",
"default": "mon_guinea_fowl_chick",
"monsters": [ { "monster": "mon_guinea_fowl_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_guinea_fowl_chick" } ]
},
{
"name": "GROUP_EGG_QUAIL",
"type": "monstergroup",
"default": "mon_quail_chick",
"monsters": [ { "monster": "mon_quail_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_quail_chick" } ]
},
{
"name": "GROUP_EGG_RHEA",
"type": "monstergroup",
"default": "mon_rhea_chick",
"monsters": [ { "monster": "mon_rhea_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_rhea_chick" } ]
},
{
"name": "GROUP_EGG_TOUCAN",
"type": "monstergroup",
"default": "mon_toucan_chick",
"monsters": [ { "monster": "mon_toucan_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_toucan_chick" } ]
},
{
"name": "GROUP_EGG_PARROT",
"type": "monstergroup",
"default": "mon_parrot_chick",
"monsters": [ { "monster": "mon_parrot_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_parrot_chick" } ]
},
{
"name": "GROUP_EGG_BUDGERIGAR",
"name": "GROUP_EGG_MACAW",
"type": "monstergroup",
"default": "mon_budgerigar_chick",
"monsters": [ { "monster": "mon_budgerigar_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_macaw_chick" } ]
},
{
"name": "GROUP_EGG_COCKATOO",
"name": "GROUP_EGG_FINCH_SAFFRON",
"type": "monstergroup",
"default": "mon_cockatoo_chick",
"monsters": [ { "monster": "mon_cockatoo_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_finch_saffron_chick" } ]
},
{
"name": "GROUP_EGG_MACAW",
"name": "GROUP_EGG_GREAT_KISKADEE",
"type": "monstergroup",
"default": "mon_macaw_chick",
"monsters": [ { "monster": "mon_macaw_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_great_kiskadee_chick" } ]
},
{
"name": "GROUP_EGG_RUFOUS_HORNERO",
"type": "monstergroup",
"monsters": [ { "monster": "mon_rufous_hornero_chick" } ]
},
{
"name": "GROUP_EGG_TINAMOU",
"type": "monstergroup",
"default": "mon_tinamou_chick",
"monsters": [ { "monster": "mon_tinamou_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_tinamou_chick" } ]
},
{
"name": "GROUP_EGG_SERIEMA",
"type": "monstergroup",
"default": "mon_seriema_chick",
"monsters": [ { "monster": "mon_seriema_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_seriema_chick" } ]
},
{
"name": "GROUP_EGG_CHACHALACA",
"type": "monstergroup",
"default": "mon_chachalaca_chick",
"monsters": [ { "monster": "mon_chachalaca_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_chachalaca_chick" } ]
},
{
"name": "GROUP_EGG_GUAN",
"type": "monstergroup",
"default": "mon_guan_chick",
"monsters": [ { "monster": "mon_guan_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_guan_chick" } ]
},
{
"name": "GROUP_EGG_CURASSOW",
"type": "monstergroup",
"default": "mon_curassow_chick",
"monsters": [ { "monster": "mon_curassow_chick", "weight": 100, "cost_multiplier": 1 } ]
},
{
"name": "GROUP_EGG_FLAMINGO",
"type": "monstergroup",
"default": "mon_flamingo_chick",
"monsters": [ { "monster": "mon_flamingo_chick", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_curassow_chick" } ]
},
{
"name": "GROUP_EGG_CONSTRICTOR",
"type": "monstergroup",
"default": "mon_anaconda",
"monsters": [
{ "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 1 },
{ "monster": "mon_python", "weight": 20, "cost_multiplier": 1 },
{ "monster": "mon_boa", "weight": 40, "cost_multiplier": 1 }
{ "monster": "mon_anaconda", "weight": 2 },
{ "monster": "mon_python", "weight": 1 },
{ "monster": "mon_boa", "weight": 2 }
]
},
{
"name": "GROUP_EGG_LIZARD",
"type": "monstergroup",
"default": "mon_beaded_lizard",
"monsters": [ { "monster": "mon_beaded_lizard", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_beaded_lizard" } ]
},
{
"name": "GROUP_EGG_MONITOR",
"type": "monstergroup",
"default": "mon_monitor_lizard",
"monsters": [ { "monster": "mon_monitor_lizard", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_monitor_lizard" } ]
},
{
"name": "GROUP_EGG_IGUANA",
"type": "monstergroup",
"default": "mon_iguana",
"monsters": [ { "monster": "mon_iguana", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_iguana" } ]
},
{
"name": "GROUP_EGG_TURTLE",
"type": "monstergroup",
"default": "mon_turtle",
"monsters": [ { "monster": "mon_turtle", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_turtle" } ]
},
{
"name": "GROUP_EGG_SNAPPER",
"type": "monstergroup",
"default": "mon_turtle_snapper",
"monsters": [ { "monster": "mon_turtle_snapper", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_turtle_snapper" } ]
},
{
"name": "GROUP_EGG_TORTOISE",
"type": "monstergroup",
"default": "mon_tortoise",
"monsters": [ { "monster": "mon_tortoise", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_tortoise" } ]
},
{
"name": "GROUP_EGG_TERMITE",
"type": "monstergroup",
"default": "mon_termite_nymph",
"monsters": [ { "monster": "mon_termite_nymph", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_termite_nymph" } ]
},
{
"name": "GROUP_EGG_TRIFFID",
"type": "monstergroup",
"default": "mon_triffid_podling",
"monsters": [ { "monster": "mon_triffid_podling", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_triffid_podling" } ]
},
{
"name": "GROUP_EGG_FUNGUS",
"type": "monstergroup",
"default": "mon_fungaloid_saproling",
"monsters": [ { "monster": "mon_fungaloid_saproling", "weight": 100, "cost_multiplier": 1 } ]
"monsters": [ { "monster": "mon_fungaloid_saproling" } ]
},
{
"name": "GROUP_EGG_SALAMANDER",
Expand Down
31 changes: 12 additions & 19 deletions data/mods/TropiCataclysm/monstergroups/wilderness.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@
{ "monster": "mon_tortoise_small", "weight": 3, "pack_size": [ 1, 3 ], "starts": "240 hours" },
{ "monster": "mon_tortoise_giant", "weight": 3, "pack_size": [ 1, 3 ], "starts": "480 hours" },
{ "monster": "mon_parrot", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] },
{ "monster": "mon_budgerigar", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] },
{ "monster": "mon_finch_saffron", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
{ "monster": "mon_great_kiskadee", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
{ "monster": "mon_rufous_hornero", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
{ "monster": "mon_toucan", "weight": 2, "cost_multiplier": 0, "pack_size": [ 1, 10 ] },
{ "monster": "mon_cockatoo", "weight": 2, "cost_multiplier": 0, "pack_size": [ 1, 10 ] },
{ "monster": "mon_macaw", "weight": 3, "cost_multiplier": 0, "pack_size": [ 1, 8 ] },
{ "monster": "mon_seriema", "weight": 15, "cost_multiplier": 10 },
{ "monster": "mon_tinamou", "weight": 12, "cost_multiplier": 2, "pack_size": [ 1, 6 ] },
Expand All @@ -77,7 +78,6 @@
"monsters": [
{ "monster": "mon_coypus", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
{ "monster": "mon_turtle", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
{ "monster": "mon_flamingo", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
{ "monster": "mon_capybara", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
{ "monster": "mon_caiman", "weight": 10, "cost_multiplier": 5 },
{ "monster": "mon_crocodile", "weight": 10, "cost_multiplier": 5 },
Expand Down Expand Up @@ -142,27 +142,27 @@
{
"type": "monstergroup",
"name": "GROUP_PARK_ANIMAL",
"//": "Current SPRING first DAY count is 425. Note that 'freq' units are tenth of a percent, with default filling in the gap.",
"is_animal": true,
"monsters": [
{ "monster": "mon_budgerigar", "weight": 35, "cost_multiplier": 0 },
{ "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_great_kiskadee", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_rufous_hornero", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_iguana", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_macaw", "weight": 15, "cost_multiplier": 0 }
]
},
{
"type": "monstergroup",
"name": "GROUP_ROOF_ANIMAL",
"//": "Current SPRING first DAY count is 350. Note that 'freq' units are tenth of a percent, with default filling in the gap.",
"is_animal": true,
"monsters": [
{ "monster": "mon_budgerigar", "weight": 45, "cost_multiplier": 0 },
{ "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_finch_saffron", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_great_kiskadee", "weight": 20, "cost_multiplier": 0 },
{ "monster": "mon_rufous_hornero", "weight": 20, "cost_multiplier": 0 },
{ "monster": "mon_boa", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_gecko", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 },
{ "monster": "mon_guinea_fowl", "weight": 10, "cost_multiplier": 0 },
{ "monster": "mon_macaw", "weight": 10, "cost_multiplier": 0 },
{
Expand Down Expand Up @@ -191,22 +191,15 @@
{ "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 0 }
]
},
{
"type": "monstergroup",
"name": "GROUP_POND_BIRD",
"default": "mon_null",
"is_animal": true,
"monsters": [ { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 } ]
},
{
"type": "monstergroup",
"name": "GROUP_BIRDFEEDER",
"//": "Current count is 225. Note that 'freq' units are tenth of a percent, with default filling in the gap.",
"is_animal": true,
"monsters": [
{ "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 },
{ "monster": "mon_cockatoo", "weight": 35, "cost_multiplier": 0 },
{ "monster": "mon_budgerigar", "weight": 50, "cost_multiplier": 0 }
{ "monster": "mon_finch_saffron", "weight": 20, "cost_multiplier": 0 },
{ "monster": "mon_great_kiskadee", "weight": 15, "cost_multiplier": 0 },
{ "monster": "mon_rufous_hornero", "weight": 15, "cost_multiplier": 0 }
]
}
]
Loading
Loading