Skip to content

Commit

Permalink
Merge pull request #11 from CleverRaven/master
Browse files Browse the repository at this point in the history 
NameTheMutantsJuly
  • Loading branch information
@xanderrootslayer
xanderrootslayer authored Jun 28, 2019
2 parents 64b0ae1 + 7f06d55 commit f2cc380
Show file tree
Hide file tree
Showing 367 changed files with 11,901 additions and 7,153 deletions.
4 changes: 3 additions & 1 deletion COMPILING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,9 @@ Visual Studio 2017 (or later) is required to build Cataclysm: Dark Days Ahead. S

We've prepared an archive containing all the headers and libraries required to build Cataclysm: [http://dev.narc.ro/cataclysm/WinDepend-MSVC.zip](http://dev.narc.ro/cataclysm/WinDepend-MSVC.zip) or [http://dev.narc.ro/cataclysm/WinDepend-MSVC.7z](http://dev.narc.ro/cataclysm/WinDepend-MSVC.7z). The latter is smaller, but if you don't have a 7-zip archive extracter, the former one is easier to deal with.

Extract the 'WinDepend' folder and put it in the root folder of Cataclysm project. Run the "copy_dll_to_bin" batch file and then move the dll files from the bin folder into the root folder the Cataclysm project.
Extract the 'WinDepend' folder from the zip and put the 'WinDepend' folder in the root folder of Cataclysm project. Your folder structure should look like this: `.../Cataclysm-DDA/WinDepend/...`

Run the "copy_dll_to_bin" batch file and then move the dll files from the bin folder inside 'WinDepend' into the root folder the Cataclysm project. You'll probably want to use the dlls that are in `WinDepend/bin/x64/`.

### Building

Expand Down
11 changes: 7 additions & 4 deletions data/json/construction.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,8 @@
"components": [ [ [ "nail", 6 ] ] ],
"qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
"pre_terrain": "f_coffin_o",
"post_terrain": "f_coffin_c"
"post_terrain": "f_coffin_c",
"post_flags": [ "keep_items" ]
},
{
"type": "construction",
Expand Down Expand Up @@ -1536,7 +1537,7 @@
"category": "FURN",
"required_skills": [ [ "fabrication", 1 ] ],
"time": "30 m",
"components": [ [ [ "2x4", 4 ] ], [ [ "straw_pile", 8 ] ] ],
"components": [ [ [ "2x4", 4 ], [ "stick", 4 ] ], [ [ "straw_pile", 8 ], [ "withered", 8 ], [ "pine_bough", 8 ] ] ],
"pre_note": "Can be deconstructed without tools.",
"pre_special": "check_empty",
"post_terrain": "f_straw_bed"
Expand Down Expand Up @@ -2581,7 +2582,8 @@
"time": "0 m",
"pre_note": "Firewood or other flammable materials on a nearby tile marked in this way may be used to automatically refuel fires. This will be done to maintain light during long-running tasks that require it such as crafting or reading, but not (for example) if you are simply waiting nearby.",
"pre_special": "check_no_trap",
"post_special": "done_mark_firewood"
"post_special": "done_mark_firewood",
"post_flags": [ "keep_items" ]
},
{
"type": "construction",
Expand All @@ -2591,7 +2593,8 @@
"time": "0 m",
"pre_note": "Mark a spot for target practice. Firing will automatically target the first practice target location found in gun range, if no enemies are around.",
"pre_special": "check_no_trap",
"post_special": "done_mark_practice_target"
"post_special": "done_mark_practice_target",
"post_flags": [ "keep_items" ]
},
{
"type": "construction",
Expand Down
51 changes: 23 additions & 28 deletions data/json/effects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,16 +265,11 @@
"base_mods": {
"per_mod": [ -1 ],
"dex_mod": [ -1 ],
"str_mod": [ -4, -1 ],
"speed_mod": [ -20 ],
"str_mod": [ -3 ],
"speed_mod": [ -30 ],
"pain_min": [ 1 ],
"pain_chance": [ 1, 30 ],
"fatigue_min": [ 1 ],
"fatigue_chance": [ 1, 4 ],
"hunger_min": [ 1 ],
"hunger_chance": [ 1, 6 ],
"thirst_min": [ 1 ],
"thirst_chance": [ 1, 4 ]
"pain_chance": [ 1 ],
"pain_max_val": [ 20 ]
}
},
{
Expand Down Expand Up @@ -481,7 +476,7 @@
"max_intensity": 20,
"resist_traits": [ "POISRESIST" ],
"int_add_val": 1,
"int_decay_tick": 100,
"int_decay_tick": 600,
"base_mods": { "dex_mod": [ -0.34, -0.17 ], "speed_mod": [ -5, -3 ] },
"scaling_mods": { "dex_mod": [ -0.34, -0.17 ], "speed_mod": [ -5, -3 ] },
"show_in_info": true
Expand Down Expand Up @@ -595,7 +590,7 @@
"type": "effect_type",
"id": "took_xanax",
"dur_add_perc": 22,
"base_mods": { "stim_tick": [ 25 ], "stim_min": [ -1 ], "stim_min_val": [ -1 ] }
"base_mods": { "stim_tick": [ 150 ], "stim_min": [ -1 ], "stim_min_val": [ -1 ] }
},
{
"type": "effect_type",
Expand Down Expand Up @@ -636,25 +631,25 @@
"type": "effect_type",
"id": "pkill1",
"max_duration": 240,
"base_mods": { "pkill_tick": [ 7 ], "pkill_min": [ 1 ], "pkill_max_val": [ 15 ] }
"base_mods": { "pkill_tick": [ 42 ], "pkill_min": [ 1 ], "pkill_max_val": [ 15 ] }
},
{
"type": "effect_type",
"id": "pkill2",
"pkill_addict_reduces": true,
"base_mods": { "pkill_tick": [ 7 ], "pkill_min": [ 2 ] }
"base_mods": { "pkill_tick": [ 42 ], "pkill_min": [ 2 ] }
},
{
"type": "effect_type",
"id": "pkill3",
"pkill_addict_reduces": true,
"base_mods": { "pkill_tick": [ 2 ], "pkill_min": [ 1 ] }
"base_mods": { "pkill_tick": [ 12 ], "pkill_min": [ 1 ] }
},
{
"type": "effect_type",
"id": "pkill_l",
"pkill_addict_reduces": true,
"base_mods": { "pkill_max_val": [ 40 ], "pkill_tick": [ 20 ], "pkill_min": [ 1 ] }
"base_mods": { "pkill_max_val": [ 40 ], "pkill_tick": [ 120 ], "pkill_min": [ 1 ] }
},
{
"type": "effect_type",
Expand Down Expand Up @@ -777,7 +772,7 @@
"speed_name": "Spore covered",
"desc": [ "You can feel the tiny spores sinking directly into your flesh." ],
"max_intensity": 3,
"int_decay_tick": 120,
"int_decay_tick": 720,
"int_add_val": 1,
"main_parts_only": true,
"base_mods": { "speed_mod": [ -7 ] },
Expand Down Expand Up @@ -874,7 +869,7 @@
"dex_mod": [ -0.5 ],
"hurt_min": [ 1 ],
"hurt_chance": [ 200 ],
"pkill_tick": [ 10 ],
"pkill_tick": [ 60 ],
"pkill_min": [ 1 ],
"pkill_max_val": [ 30 ],
"stamina_chance": [ 2 ],
Expand All @@ -891,7 +886,7 @@
"part_descs": true,
"base_mods": {
"speed_mod": [ -2 ],
"thirst_tick": [ 400 ],
"thirst_tick": [ 2400 ],
"thirst_chance": [ 2 ],
"pain_min": [ 1 ],
"pain_chance": [ 2 ],
Expand All @@ -903,7 +898,7 @@
"scaling_mods": {
"speed_mod": [ -4 ],
"thirst_min": [ 1 ],
"thirst_tick": [ -100 ],
"thirst_tick": [ -600 ],
"pain_max_val": [ 10 ],
"hurt_chance": [ 200 ],
"stamina_min": [ -1 ]
Expand Down Expand Up @@ -985,9 +980,9 @@
"resist_effects": [ "took_flumed" ],
"miss_messages": [ [ "You're too stuffed up to fight effectively.", 1 ] ],
"base_mods": {
"thirst_tick": [ 300 ],
"thirst_tick": [ 1800 ],
"thirst_min": [ 1 ],
"fatigue_tick": [ 50 ],
"fatigue_tick": [ 300 ],
"fatigue_min": [ 1 ],
"str_mod": [ -3, -1 ],
"dex_mod": [ -1, 0 ],
Expand All @@ -1009,9 +1004,9 @@
"rating": "bad",
"resist_effects": [ "took_flumed" ],
"base_mods": {
"thirst_tick": [ 300 ],
"thirst_tick": [ 1800 ],
"thirst_min": [ 1 ],
"fatigue_tick": [ 50 ],
"fatigue_tick": [ 300 ],
"fatigue_min": [ 1 ],
"str_mod": [ -4, -2 ],
"dex_mod": [ -2, 0 ],
Expand Down Expand Up @@ -1273,7 +1268,7 @@
"type": "effect_type",
"id": "valium",
"removes_effects": [ "shakes" ],
"base_mods": { "stim_tick": [ 25 ], "stim_chance": [ 2 ], "stim_min": [ 1 ], "stim_min_val": [ -1 ] }
"base_mods": { "stim_tick": [ 150 ], "stim_chance": [ 2 ], "stim_min": [ 1 ], "stim_min_val": [ -1 ] }
},
{
"type": "effect_type",
Expand Down Expand Up @@ -1308,7 +1303,7 @@
"id": "bloodworms",
"rating": "bad",
"base_mods": {
"thirst_tick": [ 100 ],
"thirst_tick": [ 600 ],
"thirst_min": [ 1 ],
"h_mod_chance": [ 512 ],
"h_mod_min": [ -10 ],
Expand Down Expand Up @@ -1551,7 +1546,7 @@
"id": "milked",
"name": [ "Milked" ],
"desc": [ "The creature has been partially or fully milked." ],
"max_duration": 14400
"max_duration": 86400
},
{
"type": "effect_type",
Expand Down Expand Up @@ -1685,8 +1680,8 @@
"desc": [ "You are under the effects of a stomach soother." ],
"int_add_val": 1,
"max_intensity": 3,
"base_mods": { "vomit_tick": [ 10 ], "health_chance": [ 1500 ], "health_min": [ 1 ] },
"scaling_mods": { "health_min": [ -1.5 ], "health_min_val": [ -2 ], "vomit_tick": [ 20 ] }
"base_mods": { "vomit_tick": [ 60 ], "health_chance": [ 1500 ], "health_min": [ 1 ] },
"scaling_mods": { "health_min": [ -1.5 ], "health_min_val": [ -2 ], "vomit_tick": [ 120 ] }
},
{
"//": "This effect is a dummy effect for disabling certain things for a few turns after an electromagnetic pulse and does nothing on its own",
Expand Down
18 changes: 14 additions & 4 deletions data/json/emit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,29 +93,39 @@
{
"id": "emit_cold_air2_stream",
"type": "emit",
"//": "Medium cold air emitter",
"field": "fd_cold_air2",
"qty": 50
},
{
"id": "emit_cold_air2_blast",
"type": "emit",
"//": "Large cold air emitter",
"field": "fd_cold_air2",
"qty": 100
},
{
"id": "emit_hot_air2_stream",
"type": "emit",
"//": "Medium hot air emitter",
"field": "fd_hot_air2",
"qty": 50
},
{
"id": "emit_hot_air2_blast",
"type": "emit",
"//": "Large hot air emitter",
"field": "fd_hot_air2",
"qty": 100
},
{
"id": "emit_heater_vehicle",
"type": "emit",
"field": "fd_hot_air3",
"qty": 3,
"chance": 100
},
{
"id": "emit_cooler_vehicle",
"type": "emit",
"field": "fd_cold_air3",
"qty": 3,
"chance": 100
}
]
Loading

0 comments on commit f2cc380

Please sign in to comment.