Skip to content

Commit

Permalink
quality of life for newbies
Browse files Browse the repository at this point in the history
  • Loading branch information
BrunoSupremo committed Sep 28, 2023
1 parent 8714cfa commit cc4403d
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"role": "alligator",
"location": { "x": 0, "z": 0 },
"min": 2,
"max": 3,
"max": 2,
"range": 5
},
"unit_info": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ local FireflyCombatAmount = class()

function FireflyCombatAmount:start(ctx)
local population = stonehearth.population:get_population(ctx.player_id)
local citizens = population:get_citizens()
local firefly_soldiers_counter = 0
for _, citizen in population:get_citizens():each() do
for _, citizen in citizens:each() do
local jc = citizen:get_component('stonehearth:job')
if jc and jc:has_role('combat') and jc:get_job_uri()~="stonehearth:jobs:worker" then
firefly_soldiers_counter = firefly_soldiers_counter +1
Expand All @@ -14,6 +15,10 @@ function FireflyCombatAmount:start(ctx)
ctx._sv.arc_encounters["footman_attacks"] = this_node_counter -1
ctx.__saved_variables:mark_changed()
end
if citizens:get_size()<6 then
-- wait for the player to atleast figure out babies
return false
end
return true
end

Expand Down
2 changes: 1 addition & 1 deletion entities/goblins/egg/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"max_health": {
"type": "basic",
"value": 1
"value": 5
}
},
"region_collision_shape": {
Expand Down
2 changes: 1 addition & 1 deletion entities/weapons/crude_wooden_club/crude_wooden_club.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"entity_data": {
"stonehearth:combat:weapon_data": {
"base_damage": 4,
"base_damage": 7,
"reach": 0.75
},
"stonehearth:combat:melee_attacks": [
Expand Down
2 changes: 1 addition & 1 deletion entities/weapons/stick/stick.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"entity_data": {
"stonehearth:combat:weapon_data": {
"base_damage": 1,
"base_damage": 5,
"reach": 2
},
"stonehearth:combat:melee_attacks": [
Expand Down
2 changes: 1 addition & 1 deletion jobs/bonesmith/bonesmith_saw/bonesmith_saw.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"entity_data": {
"stonehearth:combat:weapon_data": {
"base_damage": 4,
"base_damage": 6,
"reach": 1.5
},
"stonehearth:combat:melee_attacks": [
Expand Down
22 changes: 11 additions & 11 deletions locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@
"commands":{
"enable_egg_spot":{
"display_name":"Lay Egg",
"description":"Calls a goblin to lay an egg"
"description":"Calls a goblin worker to lay an egg"
},
"cancel_egg_spot":{
"display_name":"Cancel Lay Egg",
"description":"Cancel a goblin order to lay an egg"
"description":"Cancel the order to lay an egg"
},
"goblinpedia":{
"display_name":"Open the Goblinpedia",
Expand Down Expand Up @@ -895,7 +895,7 @@
"saved_objects": {
"building_templates": {
"wip": "💜 Tier 3 Rewards not done yet 🚧",
"barrack": "💜 Barrack",
"barrack": "💜 Shack",
"firefly_house1": "💜 House 1",
"firefly_house2": "💜 House 2",
"firefly_house3": "💜 House 3",
Expand Down Expand Up @@ -1024,32 +1024,32 @@
"blanket": {
"display_name": "Baby Blanket",
"description": "To help with a better sleep",
"flavor":"The baby will require less time sleeping"
"flavor":"(Baby Equip) The baby will require less time sleeping"
},
"blanket2": {
"display_name": "Baby Comfy Blanket",
"description": "Super comfy, can't leave",
"flavor":"The baby will require less time sleeping and can grow with higher spirit stat"
"flavor":"(Baby Equip) The baby will require less time sleeping and can grow with higher spirit stat"
},
"bottle": {
"display_name": "Baby Bottle",
"description": "Complementing the diet",
"flavor":"The baby will require less food"
"flavor":"(Baby Equip) The baby will require less food"
},
"bottle2": {
"display_name": "Baby Healthy Bottle",
"description": "Super healthy, to grow strong",
"flavor":"The baby will require less food and can grow with higher body stat"
"flavor":"(Baby Equip) The baby will require less food and can grow with higher body stat"
},
"toy": {
"display_name": "Baby Toy",
"description": "A world of fantasy in our hands",
"flavor":"The baby will require less conversations and move faster"
"flavor":"(Baby Equip) The baby will require less conversations and move faster"
},
"toy2": {
"display_name": "Baby Advanced Toy",
"description": "Fancy doll, accessories not included",
"flavor":"The baby will require less conversations, move faster and can grow with higher mind stat"
"flavor":"(Baby Equip) The baby will require less conversations, move faster and can grow with higher mind stat"
}
},
"construction": {
Expand Down Expand Up @@ -2185,7 +2185,7 @@
},
"level_2_data": {
"perk_000_name": "Cycle of Life",
"perk_000_description": "With an egg pedestal, goblins can do their most important ritual."
"perk_000_description": "With an egg pedestal, goblins (workers) can do their most important ritual."
},
"level_3_data": {
"perk_000_name": "Journeyman's Knowledge",
Expand Down Expand Up @@ -2407,7 +2407,7 @@
"description1":"A nice ceremonial table for an important occasion",
"topic1":{
"title":"Crafting:",
"desc1":"The egg pedestal is crafted by the shaman of your clan"
"desc1":"The egg pedestal is crafted by the shaman of your clan, and workers can use it"
},
"topic2":{
"title":"How to use:",
Expand Down
20 changes: 10 additions & 10 deletions locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@
"commands": {
"enable_egg_spot": {
"display_name": "Botar Ovo",
"description": "Chama um goblin para botar um ovo"
"description": "Chama um trabalhador goblin para botar um ovo"
},
"cancel_egg_spot": {
"display_name": "Cancelar Ovo",
"description": "Cancelar a ordem de um goblin para botar um ovo"
"description": "Cancelar a ordem para botar um ovo"
},
"goblinpedia": {
"display_name": "Abre a Goblinpedia",
Expand Down Expand Up @@ -1024,32 +1024,32 @@
"blanket": {
"display_name": "Cobertor de bebê",
"description": "Para ajudar a dormir melhor",
"flavor":"O bebê vai precisar de menos tempo para dormir"
"flavor":"(Equipamento de bebê) O bebê vai precisar de menos tempo para dormir"
},
"blanket2": {
"display_name": "Cobertor de bebê confortável",
"description": "Super confortável, não pode sair",
"flavor":"O bebê vai precisar de menos tempo para dormir e pode crescer com um status de espírito mais alto"
"flavor":"(Equipamento de bebê) O bebê vai precisar de menos tempo para dormir e pode crescer com um status de espírito mais alto"
},
"bottle": {
"display_name": "Mamadeira",
"description": "Complementando a dieta",
"flavor":"O bebê vai precisar de menos comida"
"flavor":"(Equipamento de bebê) O bebê vai precisar de menos comida"
},
"bottle2": {
"display_name": "Mamadeira Saudável para Bebês",
"description": "Super saudável, para crescer forte",
"flavor":"O bebê vai precisar de menos comida e pode crescer com maior status corporal"
"flavor":"(Equipamento de bebê) O bebê vai precisar de menos comida e pode crescer com maior status corporal"
},
"toy": {
"display_name": "Brinquedo de bebê",
"description": "Um mundo de fantasia em nossas mãos",
"flavor":"O bebê vai precisar de menos conversas"
"flavor":"(Equipamento de bebê) O bebê vai precisar de menos conversas"
},
"toy2": {
"display_name": "Brinquedo Avançado para Bebês",
"description": "Boneca extravagante, acessórios não incluídos",
"flavor":"O bebê vai precisar de menos conversas e pode crescer com um status mental mais alto"
"flavor":"(Equipamento de bebê) O bebê vai precisar de menos conversas e pode crescer com um status mental mais alto"
}
},
"construction": {
Expand Down Expand Up @@ -2185,7 +2185,7 @@
},
"level_2_data": {
"perk_000_name": "Ciclo da Vida",
"perk_000_description": "Com um pedestal de ovo, os goblins podem realizar seu ritual mais importante."
"perk_000_description": "Com um pedestal de ovo, os goblins (trabalhadores) podem realizar seu ritual mais importante."
},
"level_3_data": {
"perk_000_name": "Conhecimento do Jornaleiro",
Expand Down Expand Up @@ -2407,7 +2407,7 @@
"description1": "Uma bela mesa cerimonial para uma ocasião importante",
"topic1": {
"title": "Construindo:",
"desc1": "O pedestal do ovo é feito pelo xamã do seu clã"
"desc1": "O pedestal do ovo é feito pelo xamã do seu clã e usado pelos trabalhadores"
},
"topic2": {
"title": "Como usar:",
Expand Down
2 changes: 1 addition & 1 deletion swamp_goblins_server.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
swamp_goblins = {}
print("Swamp Goblins Mod version 23.9.1")
print("Swamp Goblins Mod version 23.9.28")

--[[
Expand Down
11 changes: 9 additions & 2 deletions update_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ Additions:


Changes:
Improved descriptions that workers are needed to lay eggs
Decrease varanus pack size from 3 to 2
In the campaign, enemy humans will not spawn until you got at least 6 citizens (have already figured out how to increase pop with eggs/babies)
Attack value from the shamans stick increased from 1 to 5
Attack value from the bonesmith saw increased from 4 to 6
Attack value from the workers club increased from 4 to 7
These 3 buffs should make your town alert more useful, dealing with weaker enemies like bugs
Goblin Egg health increased from 1 to 5


Changes for ACE:
Expand All @@ -10,5 +18,4 @@ Changes for ACE:
Fixes:


Fixes for ACE:
Weather Stone should work correctly with ACE weathers now
Fixes for ACE:

0 comments on commit cc4403d

Please sign in to comment.