Merge remote-tracking branch 'origin/master'

bruberu · Sep 14, 2024 · 31aa65d · 31aa65d
2 parents 5c24e34 + aa79aad
commit 31aa65d
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/gregtechfoodoption/CommonProxy.java b/src/main/java/gregtechfoodoption/CommonProxy.java
@@ -72,7 +72,7 @@ public void onPostLoad() {
         MinecraftForge.addGrassSeed(GTFOMetaItem.UNKNOWN_SEED.getStackForm(), 5);
 
         LacingEntry.LACING_REGISTRY.register(0, "cyanide", new LacingEntry(GTFOMaterialHandler.SodiumCyanide.getItemStack(),
-                new PotionEffect(CyanidePoisoningPotion.INSTANCE, 500, 0),
+                new PotionEffect(CyanidePoisoningPotion.INSTANCE, 1300, 0),
                 "5dkcap/2/4/"));
         LacingEntry.LACING_REGISTRY.register(1, "antischizo", new LacingEntry(GTFOMaterialHandler.LithiumCarbonate.getItemStack(),
                 new PotionEffect(AntiSchizoPotion.INSTANCE, 1000, 0),

diff --git a/src/main/java/gregtechfoodoption/potion/CyanidePoisoningPotion.java b/src/main/java/gregtechfoodoption/potion/CyanidePoisoningPotion.java
@@ -28,18 +28,19 @@ public boolean isReady(int duration, int amplifier) {
     public void performEffect(EntityLivingBase entity, int amplifier) {
         int phase = entity.getActivePotionEffect(this).getDuration();
 
-        if (phase == 400) {
+        if (phase == 1200) {
             if (entity.world.isRemote)
                 entity.sendMessage(new TextComponentTranslation("gregtechfoodoption.cyanide.1"));
             entity.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 1000, 9));
+            entity.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 1000, 3));
         } else if (phase == 300) {
             if (entity.world.isRemote)
                 entity.sendMessage(new TextComponentTranslation("gregtechfoodoption.cyanide.2"));
         } else if (phase == 160) {
             entity.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 1000, 0));
         } else if (phase < 200 && phase % 5 == 0) {
             entity.attackEntityFrom(GTFODamageSources.CYANIDE, (float) Math.pow((double) (200 - phase) / 80, 2));
-            entity.hurtResistantTime = 0; // No saving you :)
+            entity.hurtResistantTime = 0; // No saving you :) idk they might you dont know - lrdmtns
         } else if (phase < 100) {
             if (entity.world.isRemote && entity.isEntityAlive())
                 entity.sendMessage(new TextComponentTranslation("gregtechfoodoption.cyanide.3"));

diff --git a/...in/resources/assets/gregtech/textures/items/metaitems/component/banana_peel.png b/...in/resources/assets/gregtech/textures/items/metaitems/component/banana_peel.png
diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component/dough.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component/dough.png
diff --git a/...ain/resources/assets/gregtech/textures/items/metaitems/component/flat_dough.png b/...ain/resources/assets/gregtech/textures/items/metaitems/component/flat_dough.png
diff --git a/...ts/gregtech/textures/items/metaitems/component/fully_cured_gorgonzola_wheel.png b/...ts/gregtech/textures/items/metaitems/component/fully_cured_gorgonzola_wheel.png
diff --git a/...sources/assets/gregtech/textures/items/metaitems/component/gorgonzola_wheel.png b/...sources/assets/gregtech/textures/items/metaitems/component/gorgonzola_wheel.png