diff --git a/lang/af.ini b/lang/af.ini index 74f793b..393d4ff 100644 --- a/lang/af.ini +++ b/lang/af.ini @@ -1014,6 +1014,7 @@ system.goals.goal.craft_quiver.name=Craft a quiver. system.goals.goal.craft_arrows.name=Craft arrows. system.goals.goal.survive_day_9.name=Survive until day 9. system.goals.goal.tame_pet.name=Tame a pet. +system.goals.goal.reinforce_barricade.name=Reinforce the barricade. system.goals.goal.light_fire.name=Steek 'n vuur aan. system.goals.goal.unknown.name=Onbekende doelwit. system.goals.goal.win_adventure.name=Wen 'n avontuur. diff --git a/lang/en.ini b/lang/en.ini index cbd9a9c..7479055 100644 --- a/lang/en.ini +++ b/lang/en.ini @@ -268,6 +268,7 @@ goals.goal.craft_quiver.name=Craft a quiver. goals.goal.craft_arrows.name=Craft arrows. goals.goal.survive_day_9.name=Survive until day 9. goals.goal.tame_pet.name=Tame a pet. +goals.goal.reinforce_barricade.name=Reinforce the barricade. goals.goal.unknown.name=Unknown goal. goals.menu.prompt=Goals. {option} goals.menu.current=Current goal: {goal} diff --git a/lang/en.template.ini b/lang/en.template.ini index cbd9a9c..7479055 100644 --- a/lang/en.template.ini +++ b/lang/en.template.ini @@ -268,6 +268,7 @@ goals.goal.craft_quiver.name=Craft a quiver. goals.goal.craft_arrows.name=Craft arrows. goals.goal.survive_day_9.name=Survive until day 9. goals.goal.tame_pet.name=Tame a pet. +goals.goal.reinforce_barricade.name=Reinforce the barricade. goals.goal.unknown.name=Unknown goal. goals.menu.prompt=Goals. {option} goals.menu.current=Current goal: {goal} diff --git a/lang/es.ini b/lang/es.ini index 26d2f83..c25437e 100644 --- a/lang/es.ini +++ b/lang/es.ini @@ -1014,6 +1014,7 @@ system.goals.goal.craft_quiver.name=Craft a quiver. system.goals.goal.craft_arrows.name=Craft arrows. system.goals.goal.survive_day_9.name=Survive until day 9. system.goals.goal.tame_pet.name=Tame a pet. +system.goals.goal.reinforce_barricade.name=Reinforce the barricade. system.goals.goal.light_fire.name=Enciende un fuego. system.goals.goal.unknown.name=Objetivo desconocido. system.goals.goal.win_adventure.name=Gana una aventura. diff --git a/scripts/generate_i18n_catalog.py b/scripts/generate_i18n_catalog.py index 88047c1..d608ead 100644 --- a/scripts/generate_i18n_catalog.py +++ b/scripts/generate_i18n_catalog.py @@ -772,6 +772,7 @@ def write_catalog(entries: Dict[str, Dict[str, object]], output_path: Path) -> N ("system.goals.goal.craft_arrows.name", "Craft arrows."), ("system.goals.goal.survive_day_9.name", "Survive until day 9."), ("system.goals.goal.tame_pet.name", "Tame a pet."), + ("system.goals.goal.reinforce_barricade.name", "Reinforce the barricade."), ("system.goals.goal.unknown.name", "Unknown goal."), ("system.goals.menu.prompt", "Goals. {option}"), ("system.goals.menu.current", "Current goal: {goal}"), diff --git a/src/crafting/craft_barricade.nvgt b/src/crafting/craft_barricade.nvgt index 9e9c357..72b73ba 100644 --- a/src/crafting/craft_barricade.nvgt +++ b/src/crafting/craft_barricade.nvgt @@ -128,6 +128,7 @@ void reinforce_barricade_with_sticks() { simulate_crafting(BARRICADE_STICK_COST); add_personal_count(ITEM_STICKS, -BARRICADE_STICK_COST); int gained = add_barricade_health(BARRICADE_STICK_HEALTH); + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_status("system.crafting.barricade.reinforced.sticks", gained); } @@ -144,6 +145,7 @@ void reinforce_barricade_with_vines() { simulate_crafting(BARRICADE_VINE_COST); add_personal_count(ITEM_VINES, -BARRICADE_VINE_COST); int gained = add_barricade_health(BARRICADE_VINE_HEALTH); + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_status("system.crafting.barricade.reinforced.vines", gained); } @@ -160,6 +162,7 @@ void reinforce_barricade_with_log() { simulate_crafting(BARRICADE_LOG_COST); add_personal_count(ITEM_LOGS, -BARRICADE_LOG_COST); int gained = add_barricade_health(BARRICADE_LOG_HEALTH); + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_status("system.crafting.barricade.reinforced.log", gained); } @@ -176,6 +179,7 @@ void reinforce_barricade_with_stones() { simulate_crafting(BARRICADE_STONE_COST); add_personal_count(ITEM_STONES, -BARRICADE_STONE_COST); int gained = add_barricade_health(BARRICADE_STONE_HEALTH); + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_status("system.crafting.barricade.reinforced.stones", gained); } @@ -204,6 +208,7 @@ void reinforce_barricade_max_with_sticks() { if (barricade_health > BARRICADE_MAX_HEALTH) barricade_health = BARRICADE_MAX_HEALTH; + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_max_status("system.crafting.barricade.reinforced_max.sticks", to_do); } @@ -232,6 +237,7 @@ void reinforce_barricade_max_with_vines() { if (barricade_health > BARRICADE_MAX_HEALTH) barricade_health = BARRICADE_MAX_HEALTH; + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_max_status("system.crafting.barricade.reinforced_max.vines", to_do); } @@ -260,6 +266,7 @@ void reinforce_barricade_max_with_log() { if (barricade_health > BARRICADE_MAX_HEALTH) barricade_health = BARRICADE_MAX_HEALTH; + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_max_status("system.crafting.barricade.reinforced_max.log", to_do); } @@ -288,5 +295,6 @@ void reinforce_barricade_max_with_stones() { if (barricade_health > BARRICADE_MAX_HEALTH) barricade_health = BARRICADE_MAX_HEALTH; + complete_goal(GOAL_REINFORCE_BARRICADE); speak_barricade_reinforced_max_status("system.crafting.barricade.reinforced_max.stones", to_do); } diff --git a/src/goals.nvgt b/src/goals.nvgt index 22eda4c..3bcb443 100644 --- a/src/goals.nvgt +++ b/src/goals.nvgt @@ -29,7 +29,8 @@ const int GOAL_CRAFT_QUIVER = 23; const int GOAL_CRAFT_ARROWS = 24; const int GOAL_SURVIVE_DAY_9 = 25; const int GOAL_TAME_PET = 26; -const int GOAL_COUNT = 27; +const int GOAL_REINFORCE_BARRICADE = 27; +const int GOAL_COUNT = 28; // Mastery spend categories. const int MASTERY_CRAFTING = 0; @@ -89,6 +90,7 @@ string goal_name_key(int goalId) { if (goalId == GOAL_CRAFT_ARROWS) return "system.goals.goal.craft_arrows.name"; if (goalId == GOAL_SURVIVE_DAY_9) return "system.goals.goal.survive_day_9.name"; if (goalId == GOAL_TAME_PET) return "system.goals.goal.tame_pet.name"; + if (goalId == GOAL_REINFORCE_BARRICADE) return "system.goals.goal.reinforce_barricade.name"; return "system.goals.goal.unknown.name"; } @@ -126,6 +128,7 @@ string goal_summary(int goalId) { else if (goalId == GOAL_CRAFT_ARROWS) name = "Craft arrows."; else if (goalId == GOAL_SURVIVE_DAY_9) name = "Survive until day 9."; else if (goalId == GOAL_TAME_PET) name = "Tame a pet."; + else if (goalId == GOAL_REINFORCE_BARRICADE) name = "Reinforce the barricade."; } int points = goal_reward_points(goalId); if (points == 1) { @@ -171,10 +174,10 @@ bool is_goal_completed(int goalId) { } int get_current_goal_id() { - int[] goalOrder = {GOAL_CRAFT_KNIFE, GOAL_CRAFT_AXE, GOAL_CHOP_TREE_1, GOAL_CRAFT_SPEAR, - GOAL_CRAFT_SNARE, GOAL_CATCH_SNARE, GOAL_BUILD_FIREPIT, GOAL_LIGHT_FIRE, - GOAL_BUTCHER_GAME, GOAL_CRAFT_SLING, GOAL_BUILD_ALTAR, GOAL_COMPLETE_QUEST, - GOAL_CRAFT_BOW, GOAL_WIN_ADVENTURE, GOAL_ENGRAVE_RUNE}; + int[] goalOrder = {GOAL_CRAFT_KNIFE, GOAL_CRAFT_AXE, GOAL_CHOP_TREE_1, GOAL_REINFORCE_BARRICADE, + GOAL_CRAFT_SPEAR, GOAL_CRAFT_SNARE, GOAL_CATCH_SNARE, GOAL_BUILD_FIREPIT, + GOAL_LIGHT_FIRE, GOAL_BUTCHER_GAME, GOAL_CRAFT_SLING, GOAL_BUILD_ALTAR, + GOAL_COMPLETE_QUEST, GOAL_CRAFT_BOW, GOAL_WIN_ADVENTURE, GOAL_ENGRAVE_RUNE}; for (uint i = 0; i < goalOrder.length(); i++) { if (!goalsCompleted[goalOrder[i]]) { return goalOrder[i];