LMG and Carbine Quick Melee

Added Carbine and Quick Melee Animations, fixed LMG Air Kicking animation
pa1nki113r · Apr 11, 2022 · 5366271 · 5366271
1 parent a97f1e6
commit 5366271
Show file tree

Hide file tree

Showing 49 changed files with 62 additions and 12 deletions.
diff --git a/BMAP/Carbine.txt b/BMAP/Carbine.txt
@@ -79,6 +79,17 @@ brightmap sprite 4A1KS0 { MAP "Brightmaps/Weapons/Carbine/Kicking/4A1KS0.png"}
 brightmap sprite 4A1KT0 { MAP "Brightmaps/Weapons/Carbine/Kicking/4A1KT0.png"}
 brightmap sprite 4A1KU0 { MAP "Brightmaps/Weapons/Carbine/Kicking/4A1KU0.png"}
 
+//Quick Melee
+brightmap sprite 4A1QA0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QA0.png"}
+brightmap sprite 4A1QB0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QB0.png"}
+brightmap sprite 4A1QC0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QC0.png"}
+brightmap sprite 4A1QD0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QD0.png"}
+brightmap sprite 4A1QE0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QE0.png"}
+brightmap sprite 4A1QF0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QF0.png"}
+brightmap sprite 4A1QG0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QG0.png"}
+brightmap sprite 4A1QH0 { MAP "Brightmaps/Weapons/Carbine/Quick Melee/4A1QH0.png"}
+
+
 //Reload
 brightmap sprite 4A20A0 { MAP "Brightmaps/Weapons/Carbine/Reload/4A20A0.png"}
 brightmap sprite 4A20B0 { MAP "Brightmaps/Weapons/Carbine/Reload/4A20B0.png"}

diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QA0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QA0.png
diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QB0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QB0.png
diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QC0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QC0.png
diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QD0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QD0.png
diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QE0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QE0.png
diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QF0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QF0.png
diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QG0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QG0.png
diff --git a/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QH0.png b/SPRITES/WEAPONS/Slot 4/Carbine/Quick Melee/4A1QH0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/3 rounds/LQB3A0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/3 rounds/LQB3A0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/3 rounds/LQB3B0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/3 rounds/LQB3B0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/4 rounds/LQB4A0 b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/4 rounds/LQB4A0
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/4 rounds/LQB4B0 b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/4 rounds/LQB4B0
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/5 rounds/LQB5A0 b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/5 rounds/LQB5A0
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/5 rounds/LQB5B0 b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/5 rounds/LQB5B0
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/6 rounds/LQB6A0 b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/6 rounds/LQB6A0
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/6 rounds/LQB6B0 b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/6 rounds/LQB6B0
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7A0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7A0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7B0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7B0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7C0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7C0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7D0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7D0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7E0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7E0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7F0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7F0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7G0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7G0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7H0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Bullet/LQB7H0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/12 rounds left/LQM4A0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/12 rounds left/LQM4A0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/12 rounds left/LQM4B0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/12 rounds left/LQM4B0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/15 rounds left/LQM5A0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/15 rounds left/LQM5A0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/15 rounds left/LQM5B0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/15 rounds left/LQM5B0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6A0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6A0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6B0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6B0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6C0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6C0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6D0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6D0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6E0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6E0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6F0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6F0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6G0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6G0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6H0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/LQM6H0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/Less than 12/LQM3A0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/Less than 12/LQM3A0.png
diff --git a/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/Less than 12/LQM3B0.png b/SPRITES/WEAPONS/Slot 4/LMG/Quick Melee/Missile/Less than 12/LQM3B0.png
diff --git a/actors/Weapons/Slot4/Carbine.dec b/actors/Weapons/Slot4/Carbine.dec
@@ -1114,16 +1114,7 @@ ACTOR PB_Carbine : PB_Weapon
 	FlashPunching:
 		TNT1 A 0 A_ClearOverlays(10,11)
 		TNT1 A 0 A_JumpIf(A_CheckAkimbo(), "FlashPunchingDW")
-		4AFG A 1 
-		4AFG B 1 
-		4AFG BB 1 
-		4AFG C 2 
-		4AFG D 3
-		4AFG C 2 
-		4AFG BB 1 
-		4AFG B 1 
-		4AFG A 1 
-		4AFG A 1 
+		4A1Q ABCDEFGHFEDCBA 1
 		Stop
 	FlashPunchingDW:
 		TNT1 A 15

diff --git a/actors/Weapons/Slot4/LMG.dec b/actors/Weapons/Slot4/LMG.dec
@@ -238,9 +238,41 @@ States
 		"####" "#" 0 A_PbvpInterpolate()
 		LOOP*/
 	FlashPunching:
-
+		TNT1 A 0 A_JumpIfInventory("LMGMicroMissiles", 1, "FlashPunchingMissile")
+		LQB6 AB 0
+		LQB5 AB 0
+		LQB4 AB 0
+		LQB3 AB 0
+		LQB7 AB 1 {
+			if(CountInv("LMGAmmo") == 6) {A_SetFlashWeaponSprite("LQB6");}
+			if(CountInv("LMGAmmo") == 5) {A_SetFlashWeaponSprite("LQB5");}
+			if(CountInv("LMGAmmo") == 4) {A_SetFlashWeaponSprite("LQB4");}
+			if(CountInv("LMGAmmo") < 4) {A_SetFlashWeaponSprite("LQB3");}
+		}
+		LQB7 CDEFGHFEDC 1
+		LQB7 BA 1 {
+			if(CountInv("LMGAmmo") == 6) {A_SetFlashWeaponSprite("LQB6");}
+			if(CountInv("LMGAmmo") == 5) {A_SetFlashWeaponSprite("LQB5");}
+			if(CountInv("LMGAmmo") == 4) {A_SetFlashWeaponSprite("LQB4");}
+			if(CountInv("LMGAmmo") < 4) {A_SetFlashWeaponSprite("LQB3");}
+		}
+		Stop
+	FlashPunchingMissile:
+		LQM5 AB 0
+		LQM4 AB 0
+		LQM3 AB 0
+		LQM6 AB 1 {
+			if(CountInv("LMGAmmo") ==15 || CountInv("LMGAmmo") <= 17) {A_SetFlashWeaponSprite("LQM5");}
+			if(CountInv("LMGAmmo") == 12 || CountInv("LMGAmmo") <= 14) {A_SetFlashWeaponSprite("LQM4");}
+			if(CountInv("LMGAmmo") < 12) {A_SetFlashWeaponSprite("LQM3");}
+		}
+		LQM6 CDEFGHFEDC 1
+		LQM6 BA 1 {
+			if(CountInv("LMGAmmo") ==15 || CountInv("LMGAmmo") <= 17) {A_SetFlashWeaponSprite("LQM5");}
+			if(CountInv("LMGAmmo") == 12 || CountInv("LMGAmmo") <= 14) {A_SetFlashWeaponSprite("LQM4");}
+			if(CountInv("LMGAmmo") < 12) {A_SetFlashWeaponSprite("LQM3");}
+		}
 		Stop
-	FlashAirKicking:
 	FlashKicking:
 		TNT1 A 0 A_JumpIfInventory("LMGMicroMissiles", 1, "FlashKickingMissile")
 		LKB7 A 0 A_JumpIfInventory("LMGAmmo",7,5)
@@ -250,13 +282,29 @@ States
 		LKB3 A 0
 		"####" ABCDEFGHGFEDCBA 1
 		Stop
+	FlashAirKicking:
+		TNT1 A 0 A_JumpIfInventory("LMGMicroMissiles", 1, "FlashAirKickingMissile")
+		LKB7 A 0 A_JumpIfInventory("LMGAmmo",7,5)
+		LKB6 A 0 A_JumpIfInventory("LMGAmmo",6,4)
+		LKB5 A 0 A_JumpIfInventory("LMGAmmo",5,3)
+		LKB4 A 0 A_JumpIfInventory("LMGAmmo",4,2)
+		LKB3 A 0
+		"####" ABCDEFGHHGFEDCBA 1
+		Stop
 	FlashKickingMissile:
 		LKM6 A 0 A_JumpIfInventory("LMGAmmo",18,4)
 		LKM5 A 0 A_JumpIfInventory("LMGAmmo",15,3)
 		LKM4 A 0 A_JumpIfInventory("LMGAmmo",12,2)
 		LKM3 A 0
 		"####" ABCDEFGHGFEDCBA 1
 		Stop
+	FlashAirKickingMissile:
+		LKM6 A 0 A_JumpIfInventory("LMGAmmo",18,4)
+		LKM5 A 0 A_JumpIfInventory("LMGAmmo",15,3)
+		LKM4 A 0 A_JumpIfInventory("LMGAmmo",12,2)
+		LKM3 A 0
+		"####" ABCDEFGHHGFEDCBA 1
+		Stop
 	FlashSlideKicking:
 		TNT1 A 0 A_JumpIfInventory("LMGMicroMissiles", 1, "FlashSlideKickingMissile")
 		LKB7 A 0 A_JumpIfInventory("LMGAmmo",7,5)

diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QA0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QA0.png
diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QB0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QB0.png
diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QC0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QC0.png
diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QD0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QD0.png
diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QE0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QE0.png
diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QF0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QF0.png
diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QG0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QG0.png
diff --git a/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QH0.png b/brightmaps/WEAPONS/Carbine/Quick Melee/4A1QH0.png