Skip to content

Commit

Permalink
Merge pull request #16 from CleverRaven/master
Browse files Browse the repository at this point in the history
Update #16
  • Loading branch information
Xenomorph-III authored Jul 20, 2020
2 parents 56974c5 + 3c67e80 commit c1d0d5b
Show file tree
Hide file tree
Showing 619 changed files with 68,536 additions and 26,020 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ build:
parallel: true
verbosity: minimal
test_script:
- cmd: Cataclysm-test-vcpkg-static-Release-x64.exe --rng-seed time
- cmd: Cataclysm-test-vcpkg-static-Release-x64.exe --rng-seed time --min-duration 0.2
4 changes: 2 additions & 2 deletions build-scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ num_jobs=3

function run_tests
{
# The grep suppresses lines that begin with "0.0## s:", which are timing lines for tests with a very short duration.
$WINE "$@" -d yes --use-colour yes --rng-seed time $EXTRA_TEST_OPTS | grep -Ev "^0\.0[0-9]{2} s:"
# --min-duration shows timing lines for tests with a duration of at least that many seconds.
$WINE "$@" --min-duration 0.2 --use-colour yes --rng-seed time $EXTRA_TEST_OPTS
}

# We might need binaries installed via pip, so ensure that our personal bin dir is on the PATH
Expand Down
15 changes: 15 additions & 0 deletions data/json/artifact/premade_artifacts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"id": "architect_cube",
"type": "TOOL",
"name": { "str": "The Architect's Cube" },
"description": "This is a solid cube that is much heavier than its size suggests. When you look at it, it pulls your gaze inward until you fall through the sky, showing you a top-down view of your position with the surroundings revealed.",
"weight": "2 kg",
"volume": "100 ml",
"material": [ "iron" ],
"symbol": "]",
"relic_data": { "passive_effects": [ { "mutations": [ "DEBUG_CLAIRVOYANCE" ] } ] },
"color": "light_gray",
"flags": [ "TRADER_AVOID" ]
}
]
125 changes: 125 additions & 0 deletions data/json/artifact/relic_procgen_data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
[
{
"type": "relic_procgen_data",
"id": "cult",
"passive_add_procgen_values": [
{ "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "DEXTERITY",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "PERCEPTION",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "INTELLIGENCE",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -100,
"max_value": 25,
"type": "SPEED",
"increment": 5,
"power_per_increment": 200
}
],
"type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
"items": [ { "weight": 100, "item": "spoon" } ]
},
{
"type": "relic_procgen_data",
"id": "netherum_tunnels",
"passive_add_procgen_values": [
{ "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "DEXTERITY",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "PERCEPTION",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "INTELLIGENCE",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -100,
"max_value": 25,
"type": "SPEED",
"increment": 5,
"power_per_increment": 200
}
],
"type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
"items": [ { "weight": 100, "item": "spoon" } ]
},
{
"type": "relic_procgen_data",
"id": "alien_reality",
"passive_add_procgen_values": [
{ "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "DEXTERITY",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "PERCEPTION",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -1,
"max_value": 1,
"type": "INTELLIGENCE",
"increment": 1,
"power_per_increment": 250
},
{
"weight": 100,
"min_value": -100,
"max_value": 25,
"type": "SPEED",
"increment": 5,
"power_per_increment": 200
}
],
"type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
"items": [ { "weight": 100, "item": "spoon" } ]
}
]
13 changes: 13 additions & 0 deletions data/json/body_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"cold_morale_mod": 2,
"squeamish_penalty": 6,
"base_hp": 60,
"drench_capacity": 40,
"bionic_slots": 80
},
{
Expand All @@ -43,6 +44,7 @@
"cold_morale_mod": 2,
"squeamish_penalty": 7,
"base_hp": 60,
"drench_capacity": 7,
"bionic_slots": 18
},
{
Expand All @@ -63,6 +65,7 @@
"stylish_bonus": 2,
"squeamish_penalty": 8,
"base_hp": 60,
"drench_capacity": 1,
"bionic_slots": 4
},
{
Expand All @@ -85,6 +88,7 @@
"cold_morale_mod": 2,
"squeamish_penalty": 9,
"base_hp": 60,
"drench_capacity": 1,
"bionic_slots": 4
},
{
Expand All @@ -111,6 +115,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 10,
"bionic_slots": 20
},
{
Expand All @@ -136,6 +141,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 10,
"bionic_slots": 20
},
{
Expand All @@ -160,6 +166,7 @@
"cold_morale_mod": 0.5,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"bionic_slots": 5
},
{
Expand All @@ -184,6 +191,7 @@
"cold_morale_mod": 0.5,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"bionic_slots": 5
},
{
Expand All @@ -210,6 +218,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 11,
"bionic_slots": 30
},
{
Expand All @@ -236,6 +245,7 @@
"squeamish_penalty": 5,
"is_limb": true,
"base_hp": 60,
"drench_capacity": 11,
"bionic_slots": 30
},
{
Expand All @@ -260,6 +270,7 @@
"cold_morale_mod": 0.5,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"bionic_slots": 7
},
{
Expand All @@ -284,6 +295,7 @@
"cold_morale_mod": 0.5,
"squeamish_penalty": 3,
"base_hp": 60,
"drench_capacity": 3,
"bionic_slots": 7
},
{
Expand All @@ -301,6 +313,7 @@
"hit_difficulty": 0,
"side": "both",
"base_hp": 60,
"drench_capacity": 1,
"legacy_id": "NUM_BP"
}
]
Loading

0 comments on commit c1d0d5b

Please sign in to comment.