Skip to content

Commit

Permalink
more bearable & gradual hazard effects (#1329)
Browse files Browse the repository at this point in the history
* remake hazard logic to be more bearable (needs someone else to tweak it, I just made the framework)
oops, I forgot to commit at all.

* it works, needs balancing still

* update REI

* make Nq, Nt radioactive

* rename GT poison to weak_poison

* optimize fluid -> material mapping

* make UnificationEntry able to have a nullable TagPrefix for stuff that might somehow need it??

* fix fluid buckets not applying hazard effects

* make QuarkTech eating take the offhand items into account when doing the automatic eating

* remove unused code in TagPrefixItem

* nerf the default poison hazard (it was way too strong)

* make parent hazards only apply if this material doesn't already have a hazard property set

* add lower-tier variants of hazmat for head (face mask) & chest (rubber gloves)

* run datagen

* actually save the amounts of hazards the player is carrying instead of just forgetting them

* damage hazmat if you're carrying hazardous materials

* I forgot to add the tag to the tag

* apply spotless

* omfg it forgot the annotation

* how did spotless miss this the first time??

* add paracetamol pills as a temporary antidote for all ailments, more coming soon

* run datagen, spotless

* oops. wrong lang key. also paracetamol wasn't edible.

* add evaporation plant for: iodine process, bromine process (from brine)

* add Prussian blue, part 2 of RadAway:tm:

* add Diethylenetriaminepentaacetic acid, the 3rd and final part of RadAway

* holy shit RadAway™

* datagen

* remove some unused files

* reviews

* run datagen + spotless
  • Loading branch information
screret authored May 29, 2024
1 parent 5f59025 commit c306210
Show file tree
Hide file tree
Showing 78 changed files with 2,451 additions and 275 deletions.
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencyResolutionManagement {
// Mod Dependencies Versions
// Common
def jeiVersion = "15.2.0.27"
def reiVersion = "12.0.684"
def reiVersion = "12.1.725"
def emiVersion = "1.0.30"
def ae2Version = "15.0.18"
def kjsVersion = "2001.6.4-build.120"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
{
"button_texture": {
"type": "item",
"res": "gtceu:blackstone_aluminium_ore"
},
"items": [
"gtceu:blackstone_aluminium_ore",
"gtceu:blackstone_beryllium_ore",
"gtceu:blackstone_cobalt_ore",
"gtceu:blackstone_copper_ore",
"gtceu:blackstone_gold_ore",
"gtceu:blackstone_iron_ore",
"gtceu:blackstone_lead_ore",
"gtceu:blackstone_lithium_ore",
"gtceu:blackstone_molybdenum_ore",
"gtceu:blackstone_neodymium_ore",
"gtceu:blackstone_nickel_ore",
"gtceu:blackstone_palladium_ore",
"gtceu:blackstone_platinum_ore",
"gtceu:blackstone_plutonium_ore",
"gtceu:blackstone_silver_ore",
"gtceu:blackstone_sulfur_ore",
"gtceu:blackstone_thorium_ore",
"gtceu:blackstone_tin_ore",
"gtceu:blackstone_naquadah_ore",
"gtceu:blackstone_almandine_ore",
"gtceu:blackstone_asbestos_ore",
"gtceu:blackstone_hematite_ore",
"gtceu:blackstone_blue_topaz_ore",
"gtceu:blackstone_goethite_ore",
"gtceu:blackstone_calcite_ore",
"gtceu:blackstone_cassiterite_ore",
"gtceu:blackstone_cassiterite_sand_ore",
"gtceu:blackstone_chalcopyrite_ore",
"gtceu:blackstone_chromite_ore",
"gtceu:blackstone_cinnabar_ore",
"gtceu:blackstone_coal_ore",
"gtceu:blackstone_cobaltite_ore",
"gtceu:blackstone_cooperite_ore",
"gtceu:blackstone_diamond_ore",
"gtceu:blackstone_emerald_ore",
"gtceu:blackstone_galena_ore",
"gtceu:blackstone_garnierite_ore",
"gtceu:blackstone_green_sapphire_ore",
"gtceu:blackstone_grossular_ore",
"gtceu:blackstone_ilmenite_ore",
"gtceu:blackstone_bauxite_ore",
"gtceu:blackstone_lazurite_ore",
"gtceu:blackstone_magnesite_ore",
"gtceu:blackstone_magnetite_ore",
"gtceu:blackstone_molybdenite_ore",
"gtceu:blackstone_powellite_ore",
"gtceu:blackstone_pyrite_ore",
"gtceu:blackstone_pyrolusite_ore",
"gtceu:blackstone_pyrope_ore",
"gtceu:blackstone_rock_salt_ore",
"gtceu:blackstone_ruby_ore",
"gtceu:blackstone_salt_ore",
"gtceu:blackstone_saltpeter_ore",
"gtceu:blackstone_sapphire_ore",
"gtceu:blackstone_scheelite_ore",
"gtceu:blackstone_sodalite_ore",
"gtceu:blackstone_tantalite_ore",
"gtceu:blackstone_spessartine_ore",
"gtceu:blackstone_sphalerite_ore",
"gtceu:blackstone_stibnite_ore",
"gtceu:blackstone_tetrahedrite_ore",
"gtceu:blackstone_topaz_ore",
"gtceu:blackstone_tungstate_ore",
"gtceu:blackstone_uraninite_ore",
"gtceu:blackstone_wulfenite_ore",
"gtceu:blackstone_yellow_limonite_ore",
"gtceu:blackstone_nether_quartz_ore",
"gtceu:blackstone_certus_quartz_ore",
"gtceu:blackstone_quartzite_ore",
"gtceu:blackstone_graphite_ore",
"gtceu:blackstone_bornite_ore",
"gtceu:blackstone_chalcocite_ore",
"gtceu:blackstone_realgar_ore",
"gtceu:blackstone_bastnasite_ore",
"gtceu:blackstone_pentlandite_ore",
"gtceu:blackstone_spodumene_ore",
"gtceu:blackstone_lepidolite_ore",
"gtceu:blackstone_glauconite_sand_ore",
"gtceu:blackstone_malachite_ore",
"gtceu:blackstone_mica_ore",
"gtceu:blackstone_barite_ore",
"gtceu:blackstone_alunite_ore",
"gtceu:blackstone_talc_ore",
"gtceu:blackstone_soapstone_ore",
"gtceu:blackstone_kyanite_ore",
"gtceu:blackstone_pyrochlore_ore",
"gtceu:blackstone_oilsands_ore",
"gtceu:blackstone_olivine_ore",
"gtceu:blackstone_opal_ore",
"gtceu:blackstone_amethyst_ore",
"gtceu:blackstone_lapis_ore",
"gtceu:blackstone_apatite_ore",
"gtceu:blackstone_tricalcium_phosphate_ore",
"gtceu:blackstone_red_garnet_ore",
"gtceu:blackstone_yellow_garnet_ore",
"gtceu:blackstone_vanadium_magnetite_ore",
"gtceu:blackstone_pollucite_ore",
"gtceu:blackstone_bentonite_ore",
"gtceu:blackstone_fullers_earth_ore",
"gtceu:blackstone_pitchblende_ore",
"gtceu:blackstone_monazite_ore",
"gtceu:blackstone_trona_ore",
"gtceu:blackstone_gypsum_ore",
"gtceu:blackstone_zeolite_ore",
"gtceu:blackstone_redstone_ore",
"gtceu:blackstone_electrotine_ore",
"gtceu:blackstone_diatomite_ore",
"gtceu:blackstone_granitic_mineral_sand_ore",
"gtceu:blackstone_garnet_sand_ore",
"gtceu:blackstone_basaltic_mineral_sand_ore"
],
"page": "gtceu:generation/blackstone",
"position": [
-50,
150
],
"pre_nodes": [
"gtceu:generation/ore"
],
"section": "gtceu:generation"
}
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
],
"page": "gtceu:generation/endstone",
"position": [
-50,
100
-250,
200
],
"pre_nodes": [
"gtceu:generation/ore"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"gtceu:anvil_casting_mold",
"gtceu:name_casting_mold",
"gtceu:small_gear_casting_mold",
"gtceu:rotor_casting_mold"
"gtceu:rotor_casting_mold",
"gtceu:pill_casting_mold"
],
"page": "gtceu:misc/mold",
"position": [
Expand Down
Loading

0 comments on commit c306210

Please sign in to comment.