Add ultimate weapon

This commit is contained in:
Miloslav Číž 2020-01-01 16:35:20 +01:00
parent 7e4e3a2de0
commit 0adacf4371
4 changed files with 30 additions and 5 deletions

View File

@ -560,6 +560,29 @@ SFG_PROGRAM_MEMORY uint8_t SFG_weaponImages[][SFG_TEXTURE_STORE_SIZE] =
0,0,3,119,119,51,113,17,17,17,17,68,0,0,0,0,0,0,0,55,115,3,119,51,17,17,17,17,0, 0,0,3,119,119,51,113,17,17,17,17,68,0,0,0,0,0,0,0,55,115,3,119,51,17,17,17,17,0,
0,0,0,0,0,0,51,48,3,119,48,51,49,17,17,0,0,0,0,0,0,0,0,0,3,51,0,0,3,51,17,0,0,0, 0,0,0,0,0,0,51,48,3,119,48,51,49,17,17,0,0,0,0,0,0,0,0,0,3,51,0,0,3,51,17,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,51 0,0,0,0,0,0,0,0,0,0,0,0,51
},
{ // 5, solution
6,76,175,26,48,5,4,7,57,77,75,27,58,68,2,28,34,34,34,34,34,34,34,34,40,235,180,
34,36,68,66,68,34,34,34,68,68,34,34,34,71,119,119,66,67,51,52,17,34,34,68,53,86,
68,68,46,112,87,119,4,56,136,51,170,34,34,69,102,54,102,102,135,0,87,7,99,132,
174,131,170,34,34,64,182,51,54,103,112,0,87,0,99,134,108,234,170,34,34,64,96,
181,51,112,0,0,87,0,83,134,119,58,170,34,34,69,176,96,183,0,0,5,21,80,3,62,7,
124,170,34,68,69,54,102,112,0,5,105,145,21,0,54,0,7,202,68,85,104,136,55,0,0,97,
17,153,17,85,0,0,0,124,64,54,102,104,135,0,6,17,29,25,17,17,85,0,0,7,64,179,51,
54,103,0,81,17,17,17,153,17,25,80,0,0,64,101,182,51,55,0,81,17,26,17,217,145,17,
23,0,5,64,240,96,246,55,0,101,17,17,17,25,145,17,23,0,92,69,176,240,96,55,0,105,
81,218,209,209,153,17,23,0,202,68,70,54,181,48,0,97,150,144,154,13,153,17,23,0,
198,34,36,136,56,48,85,97,29,125,122,122,25,145,16,85,134,34,36,72,131,128,0,97,
29,1,13,10,17,145,23,0,134,68,70,51,51,48,80,97,26,145,144,157,17,25,23,0,138,
69,102,54,53,176,80,97,17,169,170,209,17,25,151,0,138,69,176,176,240,183,85,97,
17,25,145,17,17,17,151,0,88,64,240,96,101,183,5,81,17,26,153,209,17,17,112,0,5,
69,101,245,179,135,0,85,17,17,25,145,17,80,0,0,0,69,51,238,136,135,0,5,81,26,25,
97,7,5,0,0,6,68,136,136,131,55,0,0,85,81,17,151,0,0,80,0,60,34,68,133,54,54,112,
0,85,5,16,112,0,102,5,99,204,34,34,69,176,245,55,0,5,80,87,0,5,51,102,60,204,34,
34,64,240,182,51,112,0,85,87,0,6,56,51,204,202,34,34,64,182,51,56,135,112,5,87,
0,99,56,142,236,170,34,34,69,51,136,136,136,71,5,96,5,99,52,174,131,170,34,34,
68,136,136,68,68,36,112,102,99,136,51,56,131,170,34,34,34,68,68,34,34,34,70,102,
51,66,72,51,52,17,34,34,34,34,34,34,34,34,36,68,68,34,36,68,66,68
} }
}; };

BIN
assets/weapon_solution.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -325,8 +325,9 @@ uint16_t SFG_monsterAttributeTable[SFG_MONSTERS_TOTAL] =
#define SFG_WEAPON_MACHINE_GUN 2 #define SFG_WEAPON_MACHINE_GUN 2
#define SFG_WEAPON_ROCKET_LAUNCHER 3 #define SFG_WEAPON_ROCKET_LAUNCHER 3
#define SFG_WEAPON_PLASMAGUN 4 #define SFG_WEAPON_PLASMAGUN 4
#define SFG_WEAPON_SOLUTION 5
#define SFG_WEAPONS_TOTAL 5 #define SFG_WEAPONS_TOTAL 6
#define SFG_WEAPON_ATTRIBUTE(fireType,fireCooldownMs) \ #define SFG_WEAPON_ATTRIBUTE(fireType,fireCooldownMs) \
((uint8_t) (fireType | ((fireCooldownMs / (SFG_MS_PER_FRAME * 4)) << 3))) ((uint8_t) (fireType | ((fireCooldownMs / (SFG_MS_PER_FRAME * 4)) << 3)))
@ -354,11 +355,12 @@ uint16_t SFG_monsterAttributeTable[SFG_MONSTERS_TOTAL] =
*/ */
SFG_PROGRAM_MEMORY uint8_t SFG_weaponAttributeTable[SFG_WEAPONS_TOTAL] = SFG_PROGRAM_MEMORY uint8_t SFG_weaponAttributeTable[SFG_WEAPONS_TOTAL] =
{ {
/* knife */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_MELEE,400), /* knife */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_MELEE,400),
/* shotgun */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_SPREAD_BULLETS,800), /* shotgun */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_SPREAD_BULLETS,800),
/* m. gun */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,300), /* m. gun */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,300),
/* r. laun. */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_FIREBALL,900), /* r. laun. */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_FIREBALL,900),
/* plasma */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,350) /* plasma */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,350),
/* solution */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,350)
}; };
#define SFG_PROJECTILE_EXPLOSION 0 #define SFG_PROJECTILE_EXPLOSION 0

0
sher2.cpp Normal file
View File