[Scummvm-git-logs] scummvm master -> 7136d569f101641a52d608a3c52ef566aca769ec

[mduggan]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
99935cebbd ULTIMA8: JANITORIAL: Remove incorrect comment
2e67081985 ULTIMA8: Add more No Regret weapon data
7136d569f1 ULTIMA8: Add frame data for No Regret firetypes


Commit: 99935cebbd49f99b7dd6f67c2a0400dc7101af40
    https://github.com/scummvm/scummvm/commit/99935cebbd49f99b7dd6f67c2a0400dc7101af40
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-06-07T10:26:23+09:00

Commit Message:
ULTIMA8: JANITORIAL: Remove incorrect comment

Changed paths:
    engines/ultima/ultima8/world/actors/actor.h


diff --git a/engines/ultima/ultima8/world/actors/actor.h b/engines/ultima/ultima8/world/actors/actor.h
index dd3a75fbe8..05d72961f2 100644
--- a/engines/ultima/ultima8/world/actors/actor.h
+++ b/engines/ultima/ultima8/world/actors/actor.h
@@ -310,7 +310,6 @@ public:
 	void tookHitCru();
 
 	//! Add the x/y/z fire offsets given the current state of the actor
-	//! Return whether or not a "fire" frame was found.
 	void addFireAnimOffsets(int32 &x, int32 &y, int32 &z);
 
 	uint32 getAttackMoveTimeoutFinish() const {


Commit: 2e67081985bd9ebd0019a9248ab140ea484c3a08
    https://github.com/scummvm/scummvm/commit/2e67081985bd9ebd0019a9248ab140ea484c3a08
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-06-07T10:26:23+09:00

Commit Message:
ULTIMA8: Add more No Regret weapon data

Changed paths:
    devtools/create_ultima/files/ultima8/regretweapons.ini


diff --git a/devtools/create_ultima/files/ultima8/regretweapons.ini b/devtools/create_ultima/files/ultima8/regretweapons.ini
index 8c805a756b..a04ac589fd 100644
--- a/devtools/create_ultima/files/ultima8/regretweapons.ini
+++ b/devtools/create_ultima/files/ultima8/regretweapons.ini
@@ -176,36 +176,47 @@ display_shape=3
 display_frame=0xB
 overlay_shape=0x036E
 overlay=3
+shot_delay=0x023
+energy=0x0D2
 
 [BK-16]
 shape=0x05F6
-sound=0x89
-ammo_type=0
+sound=0x162
+ammo_type=6
 damage_type=0x0E
 display_shape=3
-display_frame=0xB
+display_frame=0xE
 overlay_shape=0x036E
 overlay=3
+shot_delay=20
+ammo_shape=0x0615
+ammo_frame=0x1B
 
 [LNR-81]
 shape=0x05F5
 sound=0x165
-ammo_type=0
+ammo_type=7
 damage_type=0x11
 display_shape=3
-display_frame=0xB
+display_frame=0xF
 overlay_shape=0x036E
 overlay=3
+shot_delay=15
+ammo_shape=0x0614
+ammo_frame=0x1A
 
 [XP-5]
 shape=0x0198
 sound=0x167
 damage_type=0x14
+ammo_type=0
 display_shape=3
-display_frame=0x10h
+display_frame=0x10
 overlay_shape=0x033B
 # TODO: check this
 overlay=4
+shot_delay=6
+energy=0x8C
 
 # Ammo
 [BA-41 CLIP]
@@ -233,6 +244,16 @@ shape=0x0341
 display_shape=5
 display_frame=0xC
 
+[BK-16 CLIP]
+shape=0x0615
+display_shape=5
+display_frame=0x1B
+
+[LNR-81 CLIP]
+shape=0x0614
+display_shape=5
+display_frame=0x1A
+
 
 # Bombs, grenades, etc..
 [GRENADE]


Commit: 7136d569f101641a52d608a3c52ef566aca769ec
    https://github.com/scummvm/scummvm/commit/7136d569f101641a52d608a3c52ef566aca769ec
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-06-07T10:26:23+09:00

Commit Message:
ULTIMA8: Add frame data for No Regret firetypes

Changed paths:
    engines/ultima/ultima8/world/item.cpp


diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 92dba3e5e4..19604eb190 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1194,9 +1194,6 @@ uint16 Item::fireWeapon(int32 x, int32 y, int32 z, Direction dir, int firetype,
 	if (!GAME_IS_CRUSADER)
 		return 0;
 
-	if (GAME_IS_REGRET)
-		warning("Item::fireWeapon: TODO: Update for Regret (different firetypes)");
-
 	ix += x;
 	iy += y;
 	iz += z;
@@ -1229,7 +1226,7 @@ uint16 Item::fireWeapon(int32 x, int32 y, int32 z, Direction dir, int firetype,
 		return 0;
 	}
 
-	int spriteframe = 0; // fire types 1, 2, 0xb, 0xd
+	int spriteframe = 0; // fire types 1, 2, 7, 8, 0xb, 0xd
 	switch (firetype) {
 	case 3:
 	case 9:
@@ -1246,8 +1243,14 @@ uint16 Item::fireWeapon(int32 x, int32 y, int32 z, Direction dir, int firetype,
 		spriteframe = 0x47 + getRandom() % 5;
 		break;
 	case 0xf:
+	case 0x12: // No Regret only
+	case 0x13: // No Regret only
 		spriteframe = 0x4c;
 		break;
+	case 0x10: // No Regret only
+		spriteframe = dir + 0x50;
+	case 0x11: // No Regret only
+		spriteframe = dir * 6 + 0x78;
 	default:
 		break;
 	}