Give Steve a blocky axe, courtesy of Kebby

MarioSMB · Feb 25, 2025 · 66f5a74 · 66f5a74
1 parent 0c3be9d
commit 66f5a74
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/mod/quake/common/champions/all.qh b/mod/quake/common/champions/all.qh
@@ -86,6 +86,7 @@ CLASS(Champions, Object)
 #ifdef GAMEQC
     ATTRIB(Champions, m_model, Model, MDL_Null);
     ATTRIB(Champions, m_model_head, Model, MDL_Null);
+    ATTRIB(Champions, m_skin, int, 0);
     ATTRIB(Champions, m_soundpath, string, string_null);
     METHOD(Champions, m_sound_pain, string()) { return "player/pain6.wav"; };
     METHOD(Champions, m_sound_death, string()) { return "player/death1.wav"; };

diff --git a/mod/quake/common/champions/champion/steve.qc b/mod/quake/common/champions/champion/steve.qc
@@ -4,6 +4,11 @@
 METHOD(Steve, m_activate, void(Steve this, entity actor))
 {
 	player_sound(actor, CH_VOICE, "start.wav", ATTN_NORM);
+
+	if(!CHAMPION_Mario.m_condition(CHAMPION_Mario, actor))
+		actor.skin = 2;
+	else if(!CHAMPION_Goat.m_condition(CHAMPION_Goat, actor))
+		actor.skin = 1;
 }
 
 void steve_block_break(entity this)

diff --git a/mod/quake/common/champions/champion/steve.qh b/mod/quake/common/champions/champion/steve.qh
@@ -65,6 +65,8 @@ PRECACHE(Steve)
     precache_sound("player_steve/lburn2.wav");     // lava burn
 
     precache_sound("player_steve/start.wav");
+
+    precache_model("progs/v_mcaxe.mdl");
 #endif
 }
 #endif
@@ -81,6 +83,7 @@ CLASS(Steve, Champions)
     ATTRIB(Steve, qcc_pogo, bool, true);
     ATTRIB(Steve, qcc_movespeed, float, 0.85);
     ATTRIB(Steve, qcc_falldamage, float, 5);
+    ATTRIB(Steve, qcc_meleename, string, "mcaxe");
 #ifdef GAMEQC
     ATTRIB(Steve, m_model, Model, MDL_Steve);
     ATTRIB(Steve, m_model_head, Model, MDL_Null);

diff --git a/mod/quake/common/champions/champions.qc b/mod/quake/common/champions/champions.qc
@@ -231,6 +231,7 @@ void QCC_UpdatePlayer(entity this)
 
 		this.view_ofs = champ.m_viewofs;
 		this.scale = champ.m_scale;
+		this.skin = champ.m_skin;
 
 		if(champ != oldchamp)
 		{