Browse Source

made the attachment pickup work better

Alison Watson 5 years ago
parent
commit
e6cb245643
2 changed files with 26 additions and 11 deletions
  1. 20
    6
      pk7/DECORATE.dec
  2. 6
    5
      pk7/LANGUAGE.en

+ 20
- 6
pk7/DECORATE.dec View File

@@ -26,14 +26,28 @@ actor mod : dummy {Inventory.MaxAmount 2}
26 26
  * Better silencer for the shotgun
27 27
  */
28 28
 // Attachments
29
-actor atch : dummy {States {Spawn: BOXX A -1 A_RailWait wait}}
30
-actor Laz : atch {Inventory.PickupMessage "Picked up a Laser Sight"}
31
-actor LTrig : atch {Inventory.PickupMessage "Picked up a Light Trigger"}
29
+actor Laz : dummy {}
30
+actor LTrig : dummy {}
32 31
 
33
-actor BlurReplacer : RandomSpawner replaces BlurSphere
32
+actor Attachment : CustomInventory replaces BlurSphere
34 33
 {
35
-	DropItem Laz
36
-	DropItem LTrig
34
+	Inventory.PickupMessage "$CW_ATTACH_PKUP"
35
+	States
36
+	{
37
+	Spawn:
38
+		BOXX A -1
39
+		wait
40
+	Pickup:
41
+		TNT1 A 0 A_JumpIfInventory("LTrig", 1, "Pickup1")
42
+		TNT1 A 0 A_JumpIfInventory("Laz", 1, "Pickup2")
43
+		TNT1 A 0 A_Jump(128, "Pickup2")
44
+	Pickup1:
45
+		TNT1 A 0 A_GiveInventory("Laz", 1)
46
+		stop
47
+	Pickup2:
48
+		TNT1 A 0 A_GiveInventory("LTrig", 1)
49
+		stop
50
+	}
37 51
 }
38 52
 
39 53
 actor PistolSil : dummy {}

+ 6
- 5
pk7/LANGUAGE.en View File

@@ -1,8 +1,9 @@
1 1
 [en default]
2 2
 // Pistol
3
-CW_PISTOL_WTAG = "Beretta";
4
-CW_PISTOL_OBIT = "%o was shot by %k's lovely Beretta.";
5
-
3
+CW_PISTOL_WTAG	= "Beretta";
4
+CW_PISTOL_OBIT	= "%o was shot by %k's lovely Beretta";
6 5
 // Shotgun
7
-CW_SHOTGN_WTAG = "Shotgun";
8
-CW_SHOTGN_OBIT = "%k showed %o their cool shotgun.";
6
+CW_SHOTGN_WTAG	= "Shotgun";
7
+CW_SHOTGN_OBIT	= "%k showed %o their cool shotgun";
8
+// Attachments
9
+CW_ATTACH_PKUP	= "Picked up an attachment box";

Loading…
Cancel
Save