Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Minecraft.World/WeaponItem.cpp
View File

@@ -1,49 +1,58 @@
#include "stdafx.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.entity.h"
#include "net.minecraft.world.entity.ai.attributes.h"
#include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.entity.monster.h"
#include "net.minecraft.world.level.tile.h"
#include "WeaponItem.h"
WeaponItem::WeaponItem(int id, const Tier *tier) : Item(id), tier( tier )
{
maxStackSize = 1;
setMaxDamage(tier->getUses());
maxStackSize = 1;
setMaxDamage(tier->getUses());
damage = 4 + tier->getAttackDamageBonus();
damage = 4 + tier->getAttackDamageBonus();
}
float WeaponItem::getTierDamage()
{
return tier->getAttackDamageBonus();
}
float WeaponItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
{
if (tile->id == Tile::web_Id)
if (tile->id == Tile::web_Id)
{
// swords can quickly cut web
return 15;
}
return 1.5f;
// swords can quickly cut web
return 15;
}
// this change modifies which tiles the swords can destroy in creative
// mode (>1 == yes)
Material *material = tile->material;
if (material == Material::plant || material == Material::replaceable_plant || material == Material::coral || material == Material::leaves || material == Material::vegetable)
{
return 1.5f;
}
return 1.0f;
}
bool WeaponItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob, shared_ptr<Mob> attacker)
bool WeaponItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<LivingEntity> mob, shared_ptr<LivingEntity> attacker)
{
itemInstance->hurt(1, attacker);
return true;
}
bool WeaponItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<Mob> owner)
{
// Don't damage weapons if the tile can be destroyed in one hit.
if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) itemInstance->hurt(2, owner);
itemInstance->hurtAndBreak(1, attacker);
return true;
}
int WeaponItem::getAttackDamage(shared_ptr<Entity> entity)
bool WeaponItem::mineBlock(shared_ptr<ItemInstance> itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr<LivingEntity> owner)
{
return damage;
// Don't damage weapons if the tile can be destroyed in one hit.
if (Tile::tiles[tile]->getDestroySpeed(level, x, y, z) != 0.0) itemInstance->hurtAndBreak(2, owner);
return true;
}
bool WeaponItem::isHandEquipped()
{
return true;
return true;
}
UseAnim WeaponItem::getUseAnimation(shared_ptr<ItemInstance> itemInstance)
@@ -64,7 +73,7 @@ shared_ptr<ItemInstance> WeaponItem::use(shared_ptr<ItemInstance> instance, Leve
bool WeaponItem::canDestroySpecial(Tile *tile)
{
return tile->id == Tile::web_Id;
return tile->id == Tile::web_Id;
}
int WeaponItem::getEnchantmentValue()
@@ -84,4 +93,13 @@ bool WeaponItem::isValidRepairItem(shared_ptr<ItemInstance> source, shared_ptr<I
return true;
}
return Item::isValidRepairItem(source, repairItem);
}
attrAttrModMap *WeaponItem::getDefaultAttributeModifiers()
{
attrAttrModMap *result = Item::getDefaultAttributeModifiers();
result->insert(attrAttrModMap::value_type( SharedMonsterAttributes::ATTACK_DAMAGE->getId(), new AttributeModifier(eModifierId_ITEM_BASEDAMAGE, damage, AttributeModifier::OPERATION_ADDITION) ) );
return result;
}