Skip to content

Commit

Permalink
Merge branch 'main' into sling-damage-stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
chaosvolt committed Oct 4, 2024
2 parents bca0d3f + 606c81e commit 8cb2634
Show file tree
Hide file tree
Showing 115 changed files with 1,053 additions and 943 deletions.
45 changes: 27 additions & 18 deletions .github/workflows/pull-translations.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,48 @@
name: "Pull translations from Transifex"

on:
workflow_dispatch:
schedule:
- cron: "42 1 * * 6"

jobs:
pull-translations:
if: github.repository == 'cataclysmbnteam/Cataclysm-BN'
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

permissions:
contents: write

steps:
- name: "Install Transifex CLI"
run: |
curl -sL https://github.com/transifex/cli/releases/download/v1.6.7/tx-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/bin tx
- name: "Checkout"
uses: actions/checkout@v4
with:
# https://github.com/stefanzweifel/git-auto-commit-action?tab=readme-ov-file#push-to-protected-branches
token: ${{ secrets.AUTO_COMMIT_PAT }}

- name: "Get current date"
uses: nanzm/get-time-action@v1.1
id: get-timestamp
with:
timeZone: 0
format: "YYYY-MM-DD"
run: echo "time=$(date -u "+%F")" >> $GITHUB_OUTPUT

- name: "Pull translations"
run: tx pull --force
env:
TX_TOKEN: ${{ secrets.TX_TOKEN }}
run: tx pull --force
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3.10.0

- name: Show Changes
run: |
git status
git diff --numstat
- name: Create Commit
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit-message: "feat(i18n): routine i18n updates on ${{ steps.get-timestamp.outputs.time }}"
committer: Coolthulhu (BOT) <Coolthulhu@gmail.com>
author: Coolthulhu (BOT) <Coolthulhu@gmail.com>
token: ${{ secrets.TX_PR_CREATOR }}
branch: i18n
delete-branch: true
base: main
title: "feat(i18n): routine i18n updates on ${{ steps.get-timestamp.outputs.time }}"
body: ""
labels: Translation
branch: main
commit_message: "feat(i18n): routine i18n updates on ${{ steps.get-timestamp.outputs.time }}"
commit_user_name: "github-actions[bot]"
commit_user_email: "github-actions[bot]@users.noreply.github.com"
commit_author: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
15 changes: 14 additions & 1 deletion data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@
"act_cost": "10 kJ",
"react_cost": "10 kJ",
"time": 1,
"required_bionic": "bio_weight"
"required_bionics": [ "bio_weight" ]
},
{
"id": "bio_infolink",
Expand Down Expand Up @@ -1130,6 +1130,19 @@
"time": 1,
"flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_fuel_cell_hydrogen",
"type": "bionic",
"name": { "str": "Hydrogen Fuel Cell CBM" },
"description": "A small hydrogen fuel cell fixed to your scapula. Fairly efficient and produces minimal heat, though the low density of even compressed hydrogen is a hindrance. A network of compressors and fuel tanks has been distributed throughout your body to store fuel.",
"occupied_bodyparts": [ [ "torso", 10 ] ],
"fuel_options": [ "c_hydrogen_gas" ],
"fuel_capacity": 500,
"fuel_efficiency": 0.5,
"exothermic_power_gen": true,
"time": 1,
"flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
},
{
"id": "bio_reactor",
"type": "bionic",
Expand Down
6 changes: 6 additions & 0 deletions data/json/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -2023,6 +2023,12 @@
"type": "json_flag",
"context": [ ]
},
{
"id": "WATER_DISABLE",
"type": "json_flag",
"context": [ "TOOL" ],
"info": "This item <bad>stops working</bad> when <info>submerged in water</info>."
},
{
"id": "WHIP",
"type": "json_flag",
Expand Down
146 changes: 137 additions & 9 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,18 @@
"entries": [
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.38 },
{ "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
{ "drop": "bone", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "scute_piece", "type": "skin", "mass_ratio": 0.04 }
]
},
{
"id": "mutant_fish_large",
"type": "harvest",
"entries": [
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.38 },
{ "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "scute_piece", "type": "skin", "mass_ratio": 0.04 }
]
},
{
Expand Down Expand Up @@ -199,7 +210,7 @@
{ "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 },
{ "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
{ "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 }
]
Expand All @@ -213,7 +224,8 @@
{ "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 },
{ "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone_human", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
{ "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
{ "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 }
]
Expand Down Expand Up @@ -325,6 +337,24 @@
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
]
},
{
"id": "mutant_mammal_toothy_fur",
"//": "drops regular stomach",
"type": "harvest",
"entries": [
{ "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 },
{ "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.03 },
{ "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
{ "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
{ "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
]
},
{
"id": "mutant_mammal_large_leather",
"//": "drops large stomach",
Expand All @@ -346,7 +376,28 @@
]
},
{
"id": "mutant_mammal_large_scute",
"id": "animal_toothy_large_scute",
"//": "drops large stomach, has scutes and teeth but normal non-mutant bones",
"type": "harvest",
"entries": [
{ "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "meat", "type": "flesh", "mass_ratio": 0.32 },
{ "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
{ "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
{ "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
{ "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 },
{ "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
{ "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
{ "drop": "scute_piece", "type": "skin", "mass_ratio": 0.04 },
{ "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
]
},
{
"id": "mutant_animal_large_scute",
"//": "drops large stomach",
"type": "harvest",
"entries": [
Expand All @@ -366,6 +417,27 @@
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
]
},
{
"id": "mutant_mammal_toothy_large_scute",
"//": "drops large stomach",
"type": "harvest",
"entries": [
{ "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.32 },
{ "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
{ "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
{ "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
{ "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 },
{ "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
{ "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
{ "drop": "scute_piece", "type": "skin", "mass_ratio": 0.04 },
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
]
},
{
"id": "mammal_small_wool",
"//": "does not drop stomach or other small organs",
Expand Down Expand Up @@ -414,7 +486,7 @@
{ "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone", "type": "bone", "mass_ratio": 0.2 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.2 },
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 },
{ "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 }
]
Expand All @@ -436,6 +508,24 @@
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
]
},
{
"id": "mutant_mammal_large_toothy_fur",
"//": "drops large stomach",
"type": "harvest",
"entries": [
{ "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.32 },
{ "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
{ "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
{ "drop": "mutant_offal", "type": "offal", "mass_ratio": 0.01 },
{ "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.15 },
{ "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
{ "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 }
]
},
{
"id": "animal_noskin",
"//": "for those vertebrates that don't have something you can skin off of them",
Expand Down Expand Up @@ -553,6 +643,7 @@
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.1 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "flesh_golem_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" }
]
},
Expand All @@ -564,6 +655,7 @@
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.1 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "jabberwock_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" }
],
"//": "what, you thought jabberwocks only had one heart?"
Expand Down Expand Up @@ -774,7 +866,7 @@
},
{
"id": "zombie_fur",
"//": "any zombie that might drop leather. mostly animals.",
"//": "any zombie that might drop fur. mostly animals.",
"type": "harvest",
"entries": [
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
Expand All @@ -785,9 +877,22 @@
{ "drop": "pheromone", "type": "bionic", "max": 1 }
]
},
{
"id": "zombie_fur_large",
"//": "big zombies that drop fur. mostly animals.",
"type": "harvest",
"entries": [
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "raw_tainted_fur", "type": "skin", "mass_ratio": 0.04 },
{ "drop": "pheromone", "type": "bionic", "max": 1 }
]
},
{
"id": "zombie_tooth_fur",
"//": "any zombie that might drop leather and teeth. mostly animals.",
"//": "any zombie that might drop fur and teeth. mostly animals.",
"type": "harvest",
"entries": [
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
Expand All @@ -799,6 +904,20 @@
{ "drop": "pheromone", "type": "bionic", "max": 1 }
]
},
{
"id": "zombie_tooth_fur_large",
"//": "big zombies that drop fur and teeth. mostly animals.",
"type": "harvest",
"entries": [
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "teeth_serrated", "type": "bone", "mass_ratio": 0.02 },
{ "drop": "raw_tainted_fur", "type": "skin", "mass_ratio": 0.04 },
{ "drop": "pheromone", "type": "bionic", "max": 1 }
]
},
{
"id": "zombie_tooth_leather",
"//": "any zombie that might drop leather and teeth. mostly animals.",
Expand Down Expand Up @@ -895,7 +1014,7 @@
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "kevlar_plate", "type": "skin", "mass_ratio": 0.035 },
{ "drop": "pheromone", "type": "bionic", "max": 1 }
]
Expand All @@ -904,6 +1023,15 @@
"id": "mr_bones",
"//": "spooky scary skeletons",
"type": "harvest",
"entries": [
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }
]
},
{
"id": "mr_bones_heavy",
"//": "12 foot tall hardware store skeletons",
"type": "harvest",
"entries": [
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
{ "drop": "bone_heavy", "type": "flesh", "mass_ratio": 0.5 }
Expand Down Expand Up @@ -1169,7 +1297,7 @@
{ "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
{ "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
{ "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }
{ "drop": "bone_heavy", "type": "bone", "mass_ratio": 0.1 }
]
},
{
Expand Down
Loading

0 comments on commit 8cb2634

Please sign in to comment.