Merge branch 'eggs_fix' into small-fixes

SuddenEyePuncture · Jul 22, 2021 · 37bea30 · 37bea30
2 parents 17d3241 + d1b95a6
commit 37bea30
Show file tree

Hide file tree

Showing 39 changed files with 567 additions and 55 deletions.
diff --git a/.github/workflows/pull-translations.yml b/.github/workflows/pull-translations.yml
@@ -0,0 +1,48 @@
+name: "Pull translations from Transifex"
+
+on:
+  schedule:
+    - cron: "42 1 * * 6"
+
+jobs:
+  pull-translations:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: "Install dependencies"
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext python3-pip
+          sudo pip3 install transifex-client
+      - name: "Checkout"
+        uses: actions/checkout@v2
+        with:
+          ref: master
+          fetch-depth: 0
+      - name: "Get current date"
+        uses: 1466587594/get-current-time@v2
+        id: current-date
+        with:
+          format: 'DD MMMM YYYY'
+      - name: "Pull translations"
+        env:
+          TOKEN: ${{ secrets.TX_TOKEN }}
+        run: |
+          export TX_TOKEN=$TOKEN
+          rm lang/po/*.po
+          until tx pull -a
+          do
+            echo "Retry in 10 seconds..."
+            sleep 10
+          done
+      - name: Create Pull Request
+        uses: peter-evans/[email protected]
+        with:
+          commit-message: Routine i18n updates on ${{ steps.current-date.outputs.formattedTime }}
+          committer: Brett Dong (BOT) <[email protected]>
+          author: Brett Dong (BOT) <[email protected]>
+          branch: i18n
+          delete-branch: true
+          base: master
+          title: Routine i18n updates on ${{ steps.current-date.outputs.formattedTime }}
+          body: "#### Summary\nNone"
+          labels: Translation
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -1073,5 +1073,10 @@
     "type": "item_action",
     "id": "effect_on_conditions",
     "name": { "str": "Activate item" }
+  },
+  {
+    "type": "item_action",
+    "id": "SEXTANT",
+    "name": { "str": "Measure Sun altitude" }
   }
 ]
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1780,6 +1780,7 @@
       [ "thermometer", 3 ],
       [ "hygrometer", 3 ],
       [ "barometer", 3 ],
+      [ "sextant", 2 ],
       [ "badge_doctor", 5 ],
       [ "dnd_handbook", 2 ],
       [ "bodypillow", 1 ],

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -545,6 +545,7 @@
       { "item": "geiger_off", "prob": 3, "charges": [ 0, 100 ] },
       [ "hygrometer", 3 ],
       [ "barometer", 3 ],
+      [ "sextant", 1 ],
       { "item": "camera", "prob": 3, "charges": [ 0, 150 ] },
       [ "flask_glass", 10 ],
       [ "bottle_glass", 10 ],

diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
@@ -125,15 +125,38 @@
     "price_postapoc": 2000,
     "to_hit": -3,
     "bashing": 3,
-    "material": [ "wood", "plastic" ],
+    "material": [ "plastic" ],
     "symbol": ";",
     "color": "light_gray",
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "charcoal": 150 } } ],
-    "initial_charges": 150,
-    "max_charges": 150,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "charcoal": 75 } } ],
+    "initial_charges": 75,
+    "max_charges": 75,
     "charges_per_use": 1,
     "use_action": [ "WATER_PURIFIER" ],
-    "flags": [ "ALLOWS_REMOTE_USE" ]
+    "flags": [ "ALLOWS_REMOTE_USE", "NO_UNLOAD", "NO_RELOAD" ]
+  },
+  {
+    "id": "char_purifier_clay",
+    "type": "TOOL",
+    "name": { "str": "large charcoal water purifier" },
+    "looks_like": "clay_hydria",
+    "description": "Using this item on a container full of water will purify the water using layered charcoal.  Once the charcoal has purified enough water, it will become unusable and can be disassembled and recycled.  Water taken from uncertain sources like a river may be dirty.",
+    "weight": "2300 g",
+    "volume": "15004 ml",
+    "longest_side": "45 cm",
+    "price": 4000,
+    "price_postapoc": 2000,
+    "to_hit": -1,
+    "bashing": 1,
+    "material": [ "clay" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "charcoal": 300 } } ],
+    "initial_charges": 300,
+    "max_charges": 300,
+    "charges_per_use": 1,
+    "use_action": [ "WATER_PURIFIER" ],
+    "flags": [ "ALLOWS_REMOTE_USE", "NO_UNLOAD", "NO_RELOAD" ]
   },
   {
     "id": "char_smoker",

diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
@@ -1326,5 +1326,21 @@
     "looks_like": "scrap",
     "symbol": "[",
     "color": "light_gray"
+  },
+  {
+    "id": "sextant",
+    "type": "TOOL",
+    "category": "tools",
+    "name": { "str": "sextant" },
+    "description": "A tool for measuring angles of distant objects.  It can be used for measuring the altitude of the Sun.",
+    "weight": "500 g",
+    "volume": "500 ml",
+    "price": 100,
+    "price_postapoc": 10,
+    "to_hit": -3,
+    "material": [ "plastic" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "use_action": [ "SEXTANT" ]
   }
 ]
diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
@@ -375,7 +375,7 @@
     "name": "aphid",
     "base_faction": "insect",
     "neutral": [ "ant", "acid_ant" ]
-  }
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "crayfish",

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
@@ -2152,7 +2152,14 @@
     "color": "red_green",
     "weight": "815 kg",
     "melee_dice": 2,
-    "melee_cut": 20,
+    "melee_damage":
+  [ 
+  {
+    "damage_type": "cut",
+    "amount": 15.0,
+    "armor_penetration": 16
+  }
+  ],
     "dodge": 2,
     "attack_cost": 25,
     "special_attacks": [

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -1282,7 +1282,9 @@
       "prof_fibers_rope",
       "prof_leatherworking_basic",
       "prof_metalworking",
-      "prof_lockpicking"
+      "prof_lockpicking",
+      "prof_bow_basic",
+      "prof_bow_expert"
     ],
     "skills": [
       { "level": 4, "name": "survival" },
@@ -1694,7 +1696,7 @@
     "name": "Bow Hunter",
     "description": "Ever since you were a child you loved hunting, and quickly developed a talent for archery.  Why, if the world ended, there's nothing you'd want at your side more than your trusty bow.  So, when it did, you made sure to bring it along.",
     "points": 2,
-    "proficiencies": [ "prof_bowyery" ],
+    "proficiencies": [ "prof_bow_basic", "prof_bow_expert", "prof_bowyery" ],
     "skills": [ { "level": 2, "name": "archery" } ],
     "items": {
       "both": {
@@ -1725,7 +1727,7 @@
     "name": "Crossbow Hunter",
     "description": "Ever since you were a child you loved hunting, and crossbow hunting was always your favorite.  Why, if the world ended, there's nothing you'd want at your side more than your trusty crossbow.  So, when it did, you made sure to bring it along.",
     "points": 2,
-    "proficiencies": [ "prof_gunsmithing_spring" ],
+    "proficiencies": [ "prof_bow_basic", "prof_gunsmithing_spring" ],
     "skills": [ { "level": 2, "name": "rifle" } ],
     "items": {
       "both": {
@@ -3102,7 +3104,7 @@
       { "level": 2, "name": "chemistry" },
       { "level": 3, "name": "cooking" }
     ],
-    "proficiencies": [ "prof_fibers", "prof_fibers_rope", "prof_knapping", "prof_leatherworking_basic" ],
+    "proficiencies": [ "prof_fibers", "prof_fibers_rope", "prof_knapping", "prof_leatherworking_basic", "prof_bow_basic" ],
     "items": {
       "both": {
         "items": [

diff --git a/data/json/proficiencies/wilderness.json b/data/json/proficiencies/wilderness.json
@@ -40,5 +40,40 @@
     "time_to_learn": "8 h",
     "default_time_multiplier": 2,
     "default_fail_multiplier": 1.2
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_bow_basic",
+    "name": { "str": "Basic Archer's Form" },
+    "description": "You have grasped some basic understanding on archery, and find handling bows easier.",
+    "can_learn": true,
+    "time_to_learn": "5 h",
+    "default_time_multiplier": 1.5,
+    "default_fail_multiplier": 1.2,
+    "bonuses": { "archery": [ { "type": "strength", "value": 1 } ] }
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_bow_expert",
+    "name": { "str": "Expert Archer's Form" },
+    "description": "After significant practice, you have become an expert in the movements used in drawing and firing a bow, and have strengthened those muscles considerably.",
+    "can_learn": true,
+    "time_to_learn": "10 h",
+    "default_time_multiplier": 1.5,
+    "default_fail_multiplier": 1.2,
+    "required_proficiencies": [ "prof_bow_basic" ],
+    "bonuses": { "archery": [ { "type": "strength", "value": 1 } ] }
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_bow_master",
+    "name": { "str": "Master Archer's Form" },
+    "description": "You have drawn and fired a bow so many times, you probably have a bit of a twist in your spine from it. You've developed what would once have been a world class understanding of the pose and motion of effective archery..",
+    "can_learn": true,
+    "time_to_learn": "20 h",
+    "default_time_multiplier": 1.5,
+    "default_fail_multiplier": 1.2,
+    "required_proficiencies": [ "prof_bow_expert" ],
+    "bonuses": { "archery": [ { "type": "strength", "value": 1 } ] }
   }
 ]
diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -1933,6 +1933,13 @@
     "activity_level": "LIGHT_EXERCISE",
     "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ] ]
   },
+  {
+    "result": "char_purifier_clay",
+    "type": "uncraft",
+    "time": "5 m",
+    "activity_level": "LIGHT_EXERCISE",
+    "components": [ [ [ "clay_hydria", 1 ] ], [ [ "rag", 4 ] ] ]
+  },
   {
     "result": "clock",
     "type": "uncraft",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -66,7 +66,15 @@
     "skill_used": "cooking",
     "time": "9 s",
     "autolearn": true,
-    "tools": [ [ [ "water_purifier", 1 ], [ "fake_water_purifier", 1 ], [ "pur_tablets", 1 ], [ "char_purifier", 1 ] ] ],
+    "tools": [
+      [
+        [ "water_purifier", 1 ],
+        [ "fake_water_purifier", 1 ],
+        [ "pur_tablets", 1 ],
+        [ "char_purifier", 1 ],
+        [ "char_purifier_clay", 1 ]
+      ]
+    ],
     "components": [ [ [ "water", 1 ] ] ]
   },
   {

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1266,6 +1266,20 @@
     "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ], [ [ "charcoal", 75 ] ] ],
     "flags": [ "FULL_MAGAZINE" ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "char_purifier_clay",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "survival",
+    "difficulty": 2,
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "clay_hydria", 1 ] ], [ [ "rag", 4 ] ], [ [ "charcoal", 300 ] ] ],
+    "flags": [ "FULL_MAGAZINE" ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

diff --git a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json
@@ -139,6 +139,7 @@
     "max_charges": 300,
     "initial_charges": 300,
     "turns_per_charge": 1,
+    "charges_per_use": 1,
     "revert_to": "crt_em_vest",
     "use_action": { "type": "transform", "menu_text": "Turn off armor", "msg": "CRIT EM powering off…", "target": "crt_em_vest" },
     "relic_data": {

diff --git a/data/mods/DinoMod/harvest.json b/data/mods/DinoMod/harvest.json
@@ -108,7 +108,7 @@
         "faults": [ "fault_bionic_salvaged" ]
       },
       {
-        "drop": "bionics_op",
+        "drop": "Zomborg_CBM_harvest",
         "type": "bionic_group",
         "flags": [ "NO_STERILE", "NO_PACKED" ],
         "faults": [ "fault_bionic_salvaged" ]
@@ -139,7 +139,7 @@
         "faults": [ "fault_bionic_salvaged" ]
       },
       {
-        "drop": "bionics_op",
+        "drop": "Zomborg_CBM_harvest",
         "type": "bionic_group",
         "flags": [ "NO_STERILE", "NO_PACKED" ],
         "faults": [ "fault_bionic_salvaged" ]
@@ -170,7 +170,7 @@
         "faults": [ "fault_bionic_salvaged" ]
       },
       {
-        "drop": "bionics_op",
+        "drop": "Zomborg_CBM_harvest",
         "type": "bionic_group",
         "flags": [ "NO_STERILE", "NO_PACKED" ],
         "faults": [ "fault_bionic_salvaged" ]
@@ -201,7 +201,7 @@
         "faults": [ "fault_bionic_salvaged" ]
       },
       {
-        "drop": "bionics_op",
+        "drop": "Zomborg_CBM_harvest",
         "type": "bionic_group",
         "flags": [ "NO_STERILE", "NO_PACKED" ],
         "faults": [ "fault_bionic_salvaged" ]
@@ -254,7 +254,7 @@
         "faults": [ "fault_bionic_salvaged" ]
       },
       {
-        "drop": "bionics_op",
+        "drop": "Zomborg_CBM_harvest",
         "type": "bionic_group",
         "flags": [ "NO_STERILE", "NO_PACKED" ],
         "faults": [ "fault_bionic_salvaged" ]
@@ -279,7 +279,7 @@
         "faults": [ "fault_bionic_salvaged" ]
       },
       {
-        "drop": "bionics_op",
+        "drop": "Zomborg_CBM_harvest",
         "type": "bionic_group",
         "flags": [ "NO_STERILE", "NO_PACKED" ],
         "faults": [ "fault_bionic_salvaged" ]

diff --git a/data/mods/Magiclysm/Spells/attunements/Boreal_Mage.json b/data/mods/Magiclysm/Spells/attunements/Boreal_Mage.json
@@ -48,5 +48,25 @@
     "energy_source": "MANA",
     "damage_type": "cold",
     "max_level": 35
+  },
+  {
+    "id": "borealmage_auroral_guard",
+    "type": "SPELL",
+    "name": { "str": "Auroral Guard" },
+    "description": "Create a sturdy shell that wraps around your body, gaining a sturdy defense.",
+    "valid_targets": [ "self" ],
+    "effect": "spawn_item",
+    "effect_str": "aura_auroral_guard",
+    "shape": "blast",
+    "energy_source": "MANA",
+    "flags": [ "CONCENTRATE", "VERBAL", "NO_LEGS" ],
+    "difficulty": 9,
+    "max_level": 40,
+    "base_casting_time": 350,
+    "base_energy_cost": 750,
+    "min_duration": 100000,
+    "max_duration": 2000000,
+    "duration_increment": 47500,
+    "spell_class": "BOREAL_MAGE"
   }
 ]