Browse Source

Finished SSG

Alison Watson 5 years ago
parent
commit
6d1e0ca7e7

+ 3
- 0
pk7/DECORATE.dec View File

@@ -31,6 +31,7 @@ actor CWeapon : Weapon
31 31
 	+WEAPON.NOALERT
32 32
 	Weapon.KickBack 40
33 33
 	Weapon.AmmoUse1 1
34
+	Weapon.AmmoUse2 1
34 35
 	Weapon.AmmoGive1 4
35 36
 }
36 37
 
@@ -87,6 +88,8 @@ actor BackpackWithAttachment : CustomInventory replaces Backpack
87 88
 
88 89
 actor dummy : Inventory {Inventory.MaxAmount 1}
89 90
 
91
+actor SSGLoaded : dummy {Inventory.MaxAmount 2}
92
+
90 93
 actor PistolSil : dummy {}
91 94
 actor ShotgunSil : dummy {}
92 95
 

+ 22
- 1
pk7/actors/CSuperShotgun.dec View File

@@ -20,7 +20,9 @@
20 20
 actor CSuperShotgun : CWeapon replaces SuperShotgun
21 21
 {
22 22
 	Weapon.SlotNumber 3
23
+	Weapon.AmmoUse1 2
23 24
 	Weapon.AmmoType1 "Shell"
25
+	Weapon.AmmoType2 "Shell"
24 26
 	Weapon.AmmoGive1 8
25 27
 	Obituary "$CW_SHOTGN_OBIT"
26 28
 	Tag "$CW_SHOTGN_WTAG"
@@ -49,6 +51,7 @@ actor CSuperShotgun : CWeapon replaces SuperShotgun
49 51
 	
50 52
 	// Fire //
51 53
 	Fire:
54
+		TNT1 A 0 A_JumpIf(CallACS("CW_GETVAL",GV_SSGM1)==1, "Fire2")
52 55
 		SHT2 A 9 A_SetTics(CallACS("CW_GETVAL",GV_SSGF1))
53 56
 		TNT1 A 0 A_AlertMonsters
54 57
 		TNT1 A 0 A_GunFlash
@@ -63,7 +66,25 @@ actor CSuperShotgun : CWeapon replaces SuperShotgun
63 66
 		SHT2 H 6 A_CloseShotgun2
64 67
 		SHT2 A 5 A_ReFire
65 68
 		goto Ready
66
-	
69
+	Fire2:
70
+		SHT2 A 9 A_SetTics(CallACS("CW_GETVAL",GV_SSGF1))
71
+		TNT1 A 0 A_AlertMonsters
72
+		TNT1 A 0 A_GunFlash
73
+		TNT1 A 0 A_PlaySound("weapons/sshotf",1)
74
+		SHT2 A 7 BRIGHT A_FireBullets(5.6,3.55,10,2.5,"BulletPuff")
75
+		TNT1 A 0 A_GiveInventory("SSGLoaded",1)
76
+		TNT1 A 0 A_JumpIfInventory("SSGLoaded",0,"Reload")
77
+		goto Ready
78
+	Reload:
79
+		SHT2 B 7 A_TakeInventory("SSGLoaded", 999)
80
+		SHT2 C 7 A_CheckReload
81
+		SHT2 D 7 A_OpenShotgun2
82
+		SHT2 E 7
83
+		SHT2 F 7 A_LoadShotgun2
84
+		SHT2 G 6
85
+		SHT2 H 6 A_CloseShotgun2
86
+		SHT2 A 5 A_ReFire
87
+		goto Ready
67 88
 	Flash:
68 89
 		TNT1 A 0 A_Quake(4, 5, 0, 16, "")
69 90
 		SHT2 I 1 BRIGHT A_SetPitch(pitch-0.7)

BIN
pk7/graphics/CMENUFMD.png View File


BIN
pk7/graphics/CMFMDTIP.png View File


+ 1
- 1
pk7/script/CWGetAttachment.ds View File

@@ -61,7 +61,7 @@ script void CW_GETATTACHMENT(void)
61 61
 
62 62
 script int CW_CHECKATTACHMENT(void)
63 63
 {
64
-	if(Laz.inInventory&&LTrig.inInventory&&PumpMech.inInventory)
64
+	if(Laz.inInventory&&LTrig.inInventory&&PumpMech.inInventory&&FMode.inInventory)
65 65
 		return 0;
66 66
 	return 1;
67 67
 };

Loading…
Cancel
Save