Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace time as int with time_duration #59079

Merged
merged 12 commits into from
Jul 16, 2022
Merged

Replace time as int with time_duration #59079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9a3c719
Replace time as int with time_duration for bionics
Jul 8, 2022
d5e1e90
update mods
Jul 9, 2022
a5c9dcc
time in mutation data
Jul 9, 2022
1b820fb
Construction time is string only
Jul 9, 2022
b9937e2
recipe time is string only
Jul 9, 2022
2b4018d
Book time is string only
Jul 9, 2022
2b1bb1b
fix book changes
Jul 10, 2022
f733d5c
more test fix
Jul 10, 2022
638165d
Update src/character.cpp
Fris0uman Jul 10, 2022
6be08c3
Fix test
Jul 11, 2022
2e000f7
Merge branch 'time_for_time' of https://github.com/Fris0uman/Cataclys…
Jul 11, 2022
209dcff
fix missing level penalty for NPCs too
Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions data/json/bionics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"act_cost": 10,
"react_cost": 10,
"trigger_cost": "25kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_alarm",
Expand All @@ -29,7 +29,7 @@
"act_cost": "1 J",
"react_cost": "1 J",
"trigger_cost": "25 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_ankles",
Expand Down Expand Up @@ -470,7 +470,7 @@
"fuel_options": [ "battery" ],
"fuel_efficiency": 1,
"fuel_capacity": 2000,
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
Expand Down Expand Up @@ -527,7 +527,7 @@
"description": "You have a complex port surgically mounted above your hip. While active, it will recharge bionic power when connected to a power source via jumper cable.",
"occupied_bodyparts": [ [ "torso", 7 ] ],
"is_remote_fueled": true,
"time": 1,
"time": "1 s",
"fuel_efficiency": 1,
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
},
Expand Down Expand Up @@ -638,7 +638,7 @@
],
"act_cost": "100 J",
"react_cost": "100 J",
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_TOGGLED" ],
"active_flags": [ "CLIMATE_CONTROL" ]
},
Expand All @@ -661,7 +661,7 @@
],
"act_cost": "30 kJ",
"react_cost": "30 kJ",
"time": 1,
"time": "1 s",
"enchantments": [ { "condition": "ACTIVE", "ench_effects": [ { "effect": "invisibility", "intensity": 1 } ] } ],
"flags": [ "BIONIC_TOGGLED" ]
},
Expand All @@ -673,7 +673,7 @@
"occupied_bodyparts": [ [ "head", 3 ] ],
"act_cost": "20 J",
"react_cost": "20 J",
"time": 1,
"time": "1 s",
"known_ma_styles": [
"style_aikido",
"style_barbaran",
Expand Down Expand Up @@ -825,7 +825,7 @@
"fuel_capacity": 400,
"fuel_efficiency": 0.5,
"exothermic_power_gen": true,
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
},
{
Expand All @@ -838,7 +838,7 @@
"fuel_capacity": 750,
"fuel_efficiency": 0.35,
"exothermic_power_gen": true,
"time": 5,
"time": "5 s",
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
},
{
Expand All @@ -848,7 +848,7 @@
"description": "This unit draws moisture from the surrounding air, which slowly trickles directly into your blood stream. It may fail in very dry environments.",
"occupied_bodyparts": [ [ "torso", 5 ] ],
"react_cost": "60 J",
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_TOGGLED" ]
},
{
Expand Down Expand Up @@ -921,7 +921,7 @@
"active_flags": [ "ELECTRIC_IMMUNE" ],
"act_cost": "5 J",
"react_cost": "5 J",
"time": 1
"time": "1 s"
},
{
"id": "bio_fingerhack",
Expand All @@ -948,7 +948,7 @@
"occupied_bodyparts": [ [ "head", 1 ] ],
"act_cost": "3 J",
"react_cost": "3 J",
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_TOGGLED" ],
"enchantments": [ { "condition": "ACTIVE", "values": [ { "value": "LUMINATION", "add": 60 } ] } ]
},
Expand All @@ -959,7 +959,7 @@
"description": "A small LED display just beneath your dermal layer can be illuminated on command to show patterns of your choice at dim or bright luminosity. It doesn't provide enough light to comfortably read or craft, but it can suffice if you have nothing else.",
"act_cost": "1 J",
"react_cost": "1 J",
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_TOGGLED" ],
"enchantments": [ { "condition": "ACTIVE", "values": [ { "value": "LUMINATION", "add": 5 } ] } ]
},
Expand Down Expand Up @@ -997,7 +997,7 @@
"flags": [ "BIONIC_TOGGLED" ],
"act_cost": "200 J",
"react_cost": "200 J",
"time": 1
"time": "1 s"
},
{
"id": "bio_heat_absorb",
Expand Down Expand Up @@ -1040,7 +1040,7 @@
"active_flags": [ "HEATSINK" ],
"act_cost": "1 kJ",
"react_cost": "1 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_hydraulics",
Expand All @@ -1051,7 +1051,7 @@
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": "10 kJ",
"react_cost": "10 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_infrared",
Expand All @@ -1063,7 +1063,7 @@
"active_flags": [ "INFRARED" ],
"act_cost": "5 J",
"react_cost": "5 J",
"time": 1
"time": "1 s"
},
{
"id": "bio_int_enhancer",
Expand Down Expand Up @@ -1109,7 +1109,7 @@
"flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
"act_cost": "5 J",
"react_cost": "5 J",
"time": 1,
"time": "1 s",
"enchantments": [
{
"condition": "ACTIVE",
Expand Down Expand Up @@ -1166,7 +1166,7 @@
"act_cost": "2 J",
"react_cost": "2 J",
"trigger_cost": "25 J",
"time": 1,
"time": "1 s",
"enchantments": [
{
"condition": "ACTIVE",
Expand All @@ -1187,7 +1187,7 @@
"occupied_bodyparts": [ [ "torso", 20 ] ],
"fuel_options": [ "metabolism" ],
"fuel_efficiency": 0.25,
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
},
{
Expand All @@ -1208,7 +1208,7 @@
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE", "BIONIC_SLEEP_FRIENDLY" ],
"act_cost": "80 J",
"react_cost": "40 J",
"time": 1
"time": "1 s"
},
{
"id": "bio_night",
Expand All @@ -1226,7 +1226,7 @@
],
"act_cost": "9 kJ",
"react_cost": "9 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_night_vision",
Expand All @@ -1238,7 +1238,7 @@
"active_flags": [ "NIGHT_VISION" ],
"act_cost": "10 J",
"react_cost": "10 J",
"time": 1
"time": "1 s"
},
{
"id": "bio_noise",
Expand Down Expand Up @@ -1267,7 +1267,7 @@
"act_cost": "10 kJ",
"react_cost": "10 kJ",
"trigger_cost": "1 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_painkiller",
Expand Down Expand Up @@ -1295,7 +1295,7 @@
"occupied_bodyparts": [ [ "torso", 4 ], [ "head", 1 ] ],
"flags": [ "BIONIC_ARMOR_INTERFACE", "BIONIC_TOGGLED" ],
"react_cost": 1,
"time": 1
"time": "1 s"
},
{
"id": "bio_power_armor_interface_mkII",
Expand All @@ -1305,7 +1305,7 @@
"occupied_bodyparts": [ [ "torso", 3 ], [ "head", 2 ] ],
"flags": [ "BIONIC_ARMOR_INTERFACE", "BIONIC_TOGGLED" ],
"react_cost": 1,
"time": 2
"time": "2 s"
},
{
"id": "bio_power_storage",
Expand Down Expand Up @@ -1343,7 +1343,7 @@
"act_cost": "3 J",
"react_cost": "3 J",
"trigger_cost": "250 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_purifier",
Expand Down Expand Up @@ -1373,7 +1373,7 @@
"act_cost": "1 kJ",
"react_cost": "100 J",
"trigger_cost": "10 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_razors",
Expand Down Expand Up @@ -1410,7 +1410,7 @@
"occupied_bodyparts": [ [ "head", 2 ] ],
"flags": [ "BIONIC_TOGGLED" ],
"react_cost": 1,
"time": 24
"time": "24 s"
},
{
"id": "bio_resonator",
Expand All @@ -1430,7 +1430,7 @@
"active_flags": [ "NO_SCENT" ],
"act_cost": 1,
"react_cost": 1,
"time": 60
"time": "1 m"
},
{
"id": "bio_shakes",
Expand All @@ -1451,7 +1451,7 @@
"occupied_bodyparts": [ [ "head", 1 ], [ "torso", 1 ] ],
"act_cost": 0,
"react_cost": "1 kJ",
"time": 100
"time": "100 s"
},
{
"id": "bio_shock",
Expand Down Expand Up @@ -1671,7 +1671,7 @@
"act_cost": "6 J",
"react_cost": "6 J",
"trigger_cost": "75 kJ",
"time": 1
"time": "1 s"
},
{
"id": "bio_ups",
Expand Down Expand Up @@ -1718,7 +1718,7 @@
"fuel_capacity": 500,
"fuel_efficiency": 0.25,
"exothermic_power_gen": true,
"time": 1,
"time": "1 s",
"flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
},
{
Expand Down
16 changes: 8 additions & 8 deletions data/json/mutations/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"points": -1,
"description": "A photophore has grown from your head. You can't consciously control it, and it might start to shine in response to your emotions or your physiological state.",
"cost": 9,
"time": 810000,
"time": "225 h",
"kcal": true,
"encumbrance_covered": [ [ "head", 5 ] ],
"changes_to": [ "BIOLUM1" ],
Expand Down Expand Up @@ -206,7 +206,7 @@
"description": "A photophore has grown from your head; you can make it glow softly. This will make you very visible in the dark, ideal for attracting a partner during mating season.",
"active": true,
"cost": 9,
"time": 810000,
"time": "225 h",
"kcal": true,
"encumbrance_covered": [ [ "head", 5 ] ],
"types": [ "BIOLUM" ],
Expand All @@ -233,7 +233,7 @@
"description": "You can make your photophore glow brightly.",
"active": true,
"cost": 9,
"time": 405000,
"time": "112 h 30 m",
"kcal": true,
"encumbrance_covered": [ [ "head", 5 ] ],
"types": [ "BIOLUM" ],
Expand Down Expand Up @@ -894,7 +894,7 @@
"category": [ "BEAST" ],
"active": true,
"cost": 90,
"time": 10,
"time": "10 s",
"fatigue": true,
"kcal": true,
"thirst": true,
Expand Down Expand Up @@ -3853,7 +3853,7 @@
"copy-from": "EATHEALTH",
"valid": false,
"cost": 9,
"time": 1,
"time": "1 s",
"kcal": true,
"healing_awake": 300.0,
"healing_resting": 350.0,
Expand Down Expand Up @@ -4475,7 +4475,7 @@
"category": [ "INSECT" ],
"active": true,
"cost": 3,
"time": 1,
"time": "1 s",
"fatigue": true,
"kcal": true,
"thirst": true,
Expand Down Expand Up @@ -4620,7 +4620,7 @@
"category": [ "GASTROPOD" ],
"active": true,
"cost": 174,
"time": 100,
"time": "100 s",
"thirst": true,
"kcal": true
},
Expand Down Expand Up @@ -4730,7 +4730,7 @@
"leads_to": [ "WEB_RAPPEL", "WEB_ROPE" ],
"active": true,
"cost": 69,
"time": 100,
"time": "100 s",
"kcal": true,
"thirst": true
},
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/food/brewing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"subcategory": "CSC_FOOD_BREW",
"skill_used": "cooking",
"difficulty": 3,
"time": 40000,
"time": "6 m 40 s",
"autolearn": true,
"//": "Should be taught by a flag/mutation rather than autolearned",
"batch_time_factors": [ 80, 4 ],
Expand All @@ -23,7 +23,7 @@
"subcategory": "CSC_FOOD_BREW",
"skill_used": "cooking",
"difficulty": 3,
"time": 40000,
"time": "6 m 40 s",
"autolearn": true,
"//": "Should be taught by a flag/mutation rather than autolearned",
"batch_time_factors": [ 80, 4 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/food/distill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"subcategory": "CSC_FOOD_BREW",
"skill_used": "cooking",
"difficulty": 4,
"time": 30000,
"time": "5 m",
"batch_time_factors": [ 50, 4 ],
"book_learn": [ [ "distilling_cookbook", 4 ] ],
"qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ],
Expand Down
Loading