From e1097e6b37a5b13d65d07609fe5eab0a85f8aa7a Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 5 Jun 2020 21:21:57 +0200
Subject: [PATCH] Tween all player animations.

---
 TODO.md                 |  4 ++--
 language.version        |  2 +-
 zscript/swwm_player.zsc | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/TODO.md b/TODO.md
index f74035a90..9084edf46 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,8 +5,7 @@ Fundamental things:
 
 Not so fundamental things:
  - Chanceboxes
- - Extra Demolitionist animations (swim, weapon melee/reload/idle)
- - Adjust Demolitionist crouch height to match anims
+ - Extra Demolitionist animations (swimming, additional gestures)
 
 Extra things:
  - Art for custom intermission
@@ -17,6 +16,7 @@ Extra things:
    - Some sort of flyby featuring the Demolitionist booting up, closeups of
      weapons/items etc.
  - Dual wielding Explodium Gun
+ - Quick grenade function (Explodium Mag)
  - Randomized vanilla monster retagging with multiple options
  - Japanese localization
  - Keen replacement (need ideas)
diff --git a/language.version b/language.version
index d88eaf365..51b18fa67 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\cxSWWM GZ\c- r311 (Fri  5 Jun 14:22:24 CEST 2020)";
+SWWM_MODVER="\cxSWWM GZ\c- r312 (Fri  5 Jun 21:21:57 CEST 2020)";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 286d4fae3..caac2d40f 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -1574,31 +1574,32 @@ Class Demolitionist : PlayerPawn
 		Goto Spawn+1;
 	Missile:
 		// attacking
-		XZW1 A 2;
+		#### # 2;
 		XZW6 XYZ 2;
 		XZW7 ABC 2;
 		Goto Spawn+1;
 	Melee:
 		// ponch
-		XZW1 A 2;
+		#### # 2;
 		XZW8 TUVWXYZ 2;
 		XZW9 ABCDEF 2;
 		Goto Spawn+1;
 	FastMelee:
 		// ponch (fast)
-		XZW1 A 1;
+		#### # 2;
 		XZW8 TUVWXYZ 1;
-		XZW9 ABCDEF 1;
+		XZW9 ABCDE 1;
+		XZW9 F 2;
 		Goto Spawn+1;
 	Reload:
 		// reload
-		XZW1 A 2;
+		#### # 2;
 		XZW9 GHIJKLMNOPQRSTUVWXYZ 2;
 		XZWA ABCDE 2;
 		Goto Spawn+1;
 	CheckGun:
 		// speen
-		XZW1 A 2;
+		#### # 2;
 		XZWA FGHIJKLMNOPQRSTUVWXY 2;
 		Goto Spawn+1;
 	StartCrouch:
@@ -1629,9 +1630,10 @@ Class Demolitionist : PlayerPawn
 		XZWB ABCDEFGHIJKL 2;
 		Goto Crouch+1;
 	CrouchFastMelee:
-		XZW7 M 1;
+		XZW7 M 2;
 		XZWA Z 1;
-		XZWB ABCDEFGHIJKL 1;
+		XZWB ABCDEFGHIJK 1;
+		XZWB L 2;
 		Goto Crouch+1;
 	CrouchReload:
 		XZW7 M 2;