libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-26 22:38:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Fix Crusader explosion damage slightly

Browse Source
This commit is contained in:
Matthew Duggan 2021-03-07 17:57:34 +09:00
parent 20d4380337
commit c3e21d27dd
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/ultima/ultima8/world/damage_info.cpp
View File

@ -57,7 +57,7 @@ bool DamageInfo::applyToItem(Item *item, uint16 points) const {
// Get some data out of the item before we potentially delete
// it by explosion
uint16 q = item->getQuality();
int32 x, y , z;
int32 x, y, z;
item->getLocation(x, y, z);
int32 mapnum = item->getMapNum();

5
engines/ultima/ultima8/world/fire_type.cpp
View File

@ -164,7 +164,8 @@ void FireType::makeBulletSplashShapeAndPlaySound(int32 x, int32 y, int32 z) cons
}
}
void FireType::applySplashDamageAround(const Point3 &pt, int damage, const Item *exclude, const Item *src) const {
void FireType::applySplashDamageAround(const Point3 &pt, int damage, int rangediv, const Item *exclude, const Item *src) const {
assert(rangediv > 0);
if (!getRange())
return;
static const uint32 BULLET_SPLASH_SHAPE = 0x1d9;
@ -178,7 +179,7 @@ void FireType::applySplashDamageAround(const Point3 &pt, int damage, const Item
UCList uclist(2);
LOOPSCRIPT(script, LS_TOKEN_TRUE); // we want all items
currentmap->areaSearch(&uclist, script, sizeof(script), nullptr,
getRange() * 32, true, pt.x, pt.y);
getRange() * 32 / rangediv, true, pt.x, pt.y);
for (unsigned int i = 0; i < uclist.getSize(); ++i) {
Item *splashitem = getItem(uclist.getuint16(i));
if (!splashitem) {

3
engines/ultima/ultima8/world/fire_type.h
View File

@ -84,7 +84,8 @@ public:
uint16 getRandomDamage() const;
void applySplashDamageAround(const Point3 &pt, int damage, const Item *exclude, const Item *src) const;
void applySplashDamageAround(const Point3 &pt, int damage, int rangediv,
const Item *exclude, const Item *src) const;
void makeBulletSplashShapeAndPlaySound(int32 x, int32 y, int32 z) const;

23
engines/ultima/ultima8/world/item.cpp
View File

@ -1201,7 +1201,7 @@ uint16 Item::fireWeapon(int32 x, int32 y, int32 z, Direction dir, int firetype,
block->receiveHit(getObjId(), damagedir, damage, firetype);
if (firetypedat->getRange() != 0) {
int splashdamage = firetypedat->getRandomDamage();
firetypedat->applySplashDamageAround(blockpt, splashdamage, block, this);
firetypedat->applySplashDamageAround(blockpt, splashdamage, 1, block, this);
}
if (firetypedat->getNearSprite())
firetypedat->makeBulletSplashShapeAndPlaySound(ix, iy, iz);
@ -2036,8 +2036,16 @@ void Item::hurl(int xs, int ys, int zs, int grav) {
void Item::explode(int explosion_type, bool destroy_item, bool cause_damage) {
Process *p;
int damage_divisor = 1;
if (GAME_IS_CRUSADER) {
damage_divisor = explosion_type + 1;
if (damage_divisor == 1)
damage_divisor = 3;
else if (damage_divisor == 3)
damage_divisor = 1;
setFlag(FLG_BROKEN);
// TODO: original game puts them at cx/cy/cz, but that looks wrong..
int32 cx, cy, cz;
@ -2113,8 +2121,8 @@ void Item::explode(int explosion_type, bool destroy_item, bool cause_damage) {
// Note: same FireType number used in both Remorse and Regret
const FireType *firetypedat = GameData::get_instance()->getFireType(4);
if (firetypedat) {
int damage = firetypedat->getRandomDamage();
firetypedat->applySplashDamageAround(pt, damage, this, this);
int damage = firetypedat->getRandomDamage() / damage_divisor;
firetypedat->applySplashDamageAround(pt, damage, damage_divisor, this, this);
} else {
warning("couldn't explode properly - no firetype 4 data");
}
@ -2186,16 +2194,15 @@ void Item::receiveHitCru(uint16 other, Direction dir, int damage, uint16 type) {
}
}
if (shapeInfo->is_fixed() || shapeInfo->_weight == 0) {
// can't move
// Fixed items or 0 weight etems can't move.
// Only damage types 3 and 4 move items in Crusader.
if (shapeInfo->is_fixed() || shapeInfo->_weight == 0 || (type != 3 && type != 4)) {
return;
}
int xhurl = 10 + getRandom() % 15;
int yhurl = 10 + getRandom() % 15;
// nothing special, so just hurl the item
hurl(-xhurl * Direction_XFactor(dir), -yhurl * Direction_YFactor(dir), 16, 4); //!! constants
hurl(-xhurl * Direction_XFactor(dir), -yhurl * Direction_YFactor(dir), 0, 2); //!! constants
}

2
engines/ultima/ultima8/world/super_sprite_process.cpp
View File

@ -287,7 +287,7 @@ void SuperSpriteProcess::makeBulletSplash(const Point3 &pt) {
if (firetypedat->getRange()) {
Item *item = getItem(_item0x77);
Item *src = getItem(_source);
firetypedat->applySplashDamageAround(pt, _damage, item, src);
firetypedat->applySplashDamageAround(pt, _damage, 1, item, src);
}
firetypedat->makeBulletSplashShapeAndPlaySound(pt.x, pt.y, pt.z);
}