diff --git a/src/main/java/com/comandante/creeper/items/ItemUseHandler.java b/src/main/java/com/comandante/creeper/items/ItemUseHandler.java index e2bd92aa7ba12d5f85cd923d18de1096a3d31ef9..b32308de1866c562697de78c045c16d54ecd53df 100644 --- a/src/main/java/com/comandante/creeper/items/ItemUseHandler.java +++ b/src/main/java/com/comandante/creeper/items/ItemUseHandler.java @@ -3,7 +3,7 @@ package com.comandante.creeper.items; import com.comandante.creeper.command.commands.UseCommand; import com.comandante.creeper.core_game.GameManager; -import com.comandante.creeper.items.use.DefaultApplyEffectAction; +import com.comandante.creeper.items.use.DefaultApplyEffectsStats; import com.comandante.creeper.items.use.LightningSpellBookUseAction; import com.comandante.creeper.items.use.StickOfJusticeUseAction; import com.comandante.creeper.player.Player; @@ -36,7 +36,7 @@ public class ItemUseHandler { break; default: if ((item.getEffects() != null && item.getEffects().size() > 0) || (item.getItemApplyStats() != null)) { - itemUseAction = new DefaultApplyEffectAction(itemMetadata); + itemUseAction = new DefaultApplyEffectsStats(itemMetadata); } break; } diff --git a/src/main/java/com/comandante/creeper/items/use/DefaultApplyEffectAction.java b/src/main/java/com/comandante/creeper/items/use/DefaultApplyEffectsStats.java similarity index 95% rename from src/main/java/com/comandante/creeper/items/use/DefaultApplyEffectAction.java rename to src/main/java/com/comandante/creeper/items/use/DefaultApplyEffectsStats.java index e9c3903dd8442a9b9d8b18ccaeb1e732b70f9644..292a70b892c19b6545535a443c89631e91dc42c0 100644 --- a/src/main/java/com/comandante/creeper/items/use/DefaultApplyEffectAction.java +++ b/src/main/java/com/comandante/creeper/items/use/DefaultApplyEffectsStats.java @@ -9,14 +9,14 @@ import org.apache.log4j.Logger; import java.util.Set; -public class DefaultApplyEffectAction implements ItemUseAction { +public class DefaultApplyEffectsStats implements ItemUseAction { private final String internalItemName; private final Set<Effect> effectSet; private final Stats itemApplyStats; - private static final Logger log = Logger.getLogger(DefaultApplyEffectAction.class); + private static final Logger log = Logger.getLogger(DefaultApplyEffectsStats.class); - public DefaultApplyEffectAction(ItemMetadata itemMetadata) { + public DefaultApplyEffectsStats(ItemMetadata itemMetadata) { this.internalItemName = itemMetadata.getInternalItemName(); this.effectSet = itemMetadata.getEffects(); this.itemApplyStats = itemMetadata.getItemApplyStats(); diff --git a/world/items/marijuana.json b/world/items/marijuana.json index 59a82bcdf70919fc6d590fc92066b6cb2dd736fd..12353731e870c541513d684f8e30e8e8520c675f 100644 --- a/world/items/marijuana.json +++ b/world/items/marijuana.json @@ -33,5 +33,25 @@ "NORTH3_ZONE" ] } - ] + ], + "itemApplyStats": { + "strength": 0, + "intelligence": 0, + "willpower": 0, + "aim": 0, + "agile": 0, + "armorRating": 0, + "meleSkill": 0, + "currentHealth": 75, + "maxHealth": 0, + "weaponRatingMax": 0, + "weaponRatingMin": 0, + "numberOfWeaponRolls": 0, + "experience": 0, + "currentMana": 75, + "maxMana": 0, + "foraging": 0, + "inventorySize": 0, + "maxEffects": 0 + } } \ No newline at end of file