Skip to content

Commit

Permalink
Merge branch 'master' into antlion-fractions
Browse files Browse the repository at this point in the history
  • Loading branch information
SuddenEyePuncture authored Jun 17, 2021
2 parents 6a2d381 + ac4d144 commit 41209a3
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 89 deletions.
12 changes: 12 additions & 0 deletions data/json/items/comestibles/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,18 @@
"rot_spawn": "GROUP_EGG_CENTIPEDE",
"rot_spawn_chance": 50
},
{
"type": "COMESTIBLE",
"id": "egg_antlion",
"name": { "str": "antlion egg" },
"copy-from": "egg_insect",
"color": "yellow",
"symbol": "o",
"spoils_in": "5 days",
"description": "A large white antlion egg. There is something hard inside.",
"rot_spawn": "GROUP_EGG_ANTLION",
"rot_spawn_chance": 50
},
{
"type": "COMESTIBLE",
"id": "razorclaw_roe",
Expand Down
18 changes: 8 additions & 10 deletions data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,19 @@
"type": "COMESTIBLE",
"id": "honeydew",
"name": { "str": "honeydew" },
"description": "It's a sugar-rich sticky substance, produced by aphids from plant's sap. Ants and bees love it.",
"description": "A sugar-rich sticky substance, produced by aphids from plant sap. Ants and bees love it.",
"weight": "22 g",
"color": "green",
"symbol": "~",
"material": [ "honey" ],
"quench": 4,
"healthy": 0,
"quench": 4,
"calories": 67,
"charges": 16,
"stim": 0,
"fun": 2 ,
"comestible_type": "FOOD" ,
"flags": ["NUTRIENT_OVERRIDE"],
"volume": "250 ml"
},
"charges": 16,
"fun": 2,
"comestible_type": "FOOD",
"flags": [ "NUTRIENT_OVERRIDE" ],
"volume": "250 ml"
},
{
"type": "COMESTIBLE",
"id": "marloss_berry",
Expand Down
4 changes: 1 addition & 3 deletions data/json/monstergroups/bugs.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@
"default": "mon_ant_small",
"is_animal": true,
"monsters": [
{ "monster": "mon_ant_larva", "freq": 40, "cost_multiplier": 0 },
{ "monster": "mon_ant_soldier", "freq": 90, "cost_multiplier": 5 },
{ "monster": "mon_ant_queen", "freq": 0, "cost_multiplier": 0 },
{ "monster": "mon_aphid", "freq": 40, "pack_size": [ 3, 10 ], "cost_multiplier": 0 },
{ "monster": "mon_lady_bug_giant", "freq": 10, "pack_size": [ 1, 3 ], "cost_multiplier": 10},
{ "monster": "mon_lady_bug_giant", "freq": 10, "pack_size": [ 1, 3 ], "cost_multiplier": 10 },
{ "monster": "mon_antlion_larva", "freq": 5, "cost_multiplier": 10 },
{ "monster": "mon_antlion_giant", "freq": 3, "cost_multiplier": 10 }
]
Expand Down
6 changes: 6 additions & 0 deletions data/json/monstergroups/eggs.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,11 @@
{ "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
{ "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SUMMER" ] }
]
},
{
"name": "GROUP_EGG_ANTLION",
"type": "monstergroup",
"default": "mon_antlion_larva",
"monsters": [ { "monster": "mon_antlion_larva", "freq": 1000, "cost_multiplier": 1 } ]
}
]
5 changes: 2 additions & 3 deletions data/json/monstergroups/lab.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
{ "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 },
{ "monster": "mon_zombie_necro", "freq": 15, "cost_multiplier": 15 },
{ "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 },
{"monster": "mon_lady_bug_giant", "freq": 15, "cost_multiplier": 2},
{"monster": "mon_mole_cricket", "freq": 20, "cost_multiplier": 3}
{ "monster": "mon_mole_cricket", "freq": 20, "cost_multiplier": 3 }
],
"freq_total": 2592
},
Expand Down Expand Up @@ -165,7 +164,7 @@
{ "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 3 },
{ "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 15 },
{ "monster": "mon_zombie_brute_shocker", "freq": 1, "cost_multiplier": 5 },
{"monster": "mon_mole_cricket", "freq": 20, "cost_multiplier": 3}
{ "monster": "mon_mole_cricket", "freq": 2, "cost_multiplier": 3 }
]
}
]
3 changes: 1 addition & 2 deletions data/json/monstergroups/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,7 @@
{ "monster": "mon_albino_penguin", "freq": 10, "cost_multiplier": 5, "pack_size": [ 3, 9 ] },
{ "monster": "mon_gator", "freq": 40, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
{ "monster": "mon_nakedmolerat_giant", "freq": 25, "cost_multiplier": 3 },
{ "monster": "mon_frog_mother", "freq": 10, "cost_multiplier": 3 },
{"monster": "mon_mole_cricket", "freq": 30, "cost_multiplier": 3}
{ "monster": "mon_frog_mother", "freq": 10, "cost_multiplier": 3 }
]
},
{
Expand Down
14 changes: 6 additions & 8 deletions data/json/monstergroups/wilderness.json
Original file line number Diff line number Diff line change
Expand Up @@ -1873,9 +1873,9 @@
{ "monster": "mon_nakedmolerat_giant", "freq": 1, "cost_multiplier": 3, "conditions": [ "DUSK", "NIGHT" ] },
{ "monster": "mon_mutant_experimental", "freq": 3, "cost_multiplier": 0, "conditions": [ "DUSK", "NIGHT" ] },
{ "monster": "mon_mantis_small", "freq": 8, "cost_multiplier": 10 },
{ "monster": "mon_lady_bug_giant", "freq": 5, "cost_multiplier": 10},
{ "monster": "mon_lady_bug_giant", "freq": 5, "cost_multiplier": 10 },
{ "monster": "mon_aphid", "freq": 15, "pack_size": [ 1, 5 ], "cost_multiplier": 0 },
{ "monster": "mon_grasshopper_small", "freq": 15, "pack_size": [1, 3], "cost_multiplier": 0 },
{ "monster": "mon_grasshopper_small", "freq": 15, "pack_size": [ 1, 3 ], "cost_multiplier": 0 },
{ "monster": "mon_antlion_larva", "freq": 7, "cost_multiplier": 10 },
{ "monster": "mon_antlion_giant", "freq": 2, "cost_multiplier": 10 }
]
Expand Down Expand Up @@ -2870,10 +2870,8 @@
"conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
},
{ "monster": "mon_mutant_experimental", "freq": 2, "cost_multiplier": 6 },
{"monster": "mon_mantis_small", "freq": 2, "cost_multiplier": 8},
{"monster": "mon_aphid", "freq": 10, "cost_multiplier": 0},
{ "monster": "mon_antlion_giant", "freq": 4, "cost_multiplier": 10 },
{ "monster": "mon_strider_small", "freq": 15, "cost_multiplier": 3, "pack_size": [ 4, 8 ] }
{ "monster": "mon_mantis_small", "freq": 2, "cost_multiplier": 8 },
{ "monster": "mon_antlion_giant", "freq": 4, "cost_multiplier": 10 }
]
},
{
Expand Down Expand Up @@ -2905,8 +2903,8 @@
{ "monster": "mon_squirrel", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_squirrel_red", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_mantis_small", "freq": 5, "cost_multiplier": 10 },
{ "monster": "mon_lady_bug_giant", "freq": 8, "cost_multiplier": 10},
{ "monster": "mon_aphid", "freq": 20, "cost_multiplier": 0 },
{ "monster": "mon_lady_bug_giant", "freq": 8, "cost_multiplier": 10 },
{ "monster": "mon_aphid", "freq": 20, "cost_multiplier": 0 },
{ "monster": "mon_grasshopper_small", "freq": 30, "cost_multiplier": 0 },
{ "monster": "mon_antlion_larva", "freq": 7, "cost_multiplier": 10 },
{ "monster": "mon_antlion_giant", "freq": 5, "cost_multiplier": 10 }
Expand Down
Loading

0 comments on commit 41209a3

Please sign in to comment.