Merge pull request #17 from lordee/master

bring shock/plasma up to date with master

Author: lordee

.gitignore

@@ -5,3 +5,4 @@
 *.patch
 fteqcc64
 .vscode/tasks.json
+.gitignore

actions.qc

@@ -6,45 +6,43 @@ void () TeamFortress_ClipTick;
 
 void () TeamFortress_Discard = {
     newmis = spawn();
-    switch (self.playerclass)
-    {
+
+    switch (self.playerclass) {
         case PC_SCOUT:
         case PC_ENGINEER:
+            newmis.ammo_rockets = self.ammo_rockets;
+            break;
         case PC_MEDIC:
             newmis.ammo_rockets = self.ammo_rockets;
-        break;
+            if (!medicaura && old_medikit) {
+                newmis.ammo_cells = self.ammo_cells;
+            }
+            break;
         case PC_SNIPER:
         case PC_SPY:
             newmis.ammo_rockets = self.ammo_rockets;
             newmis.ammo_cells = self.ammo_cells;
-        break;
+            break;
         case PC_SOLDIER:
         case PC_DEMOMAN:
             newmis.ammo_cells = self.ammo_cells;
             newmis.ammo_nails = self.ammo_nails;
-        break;
+            break;
         case PC_HVYWEAP:
             newmis.ammo_rockets = self.ammo_rockets;
             newmis.ammo_nails = self.ammo_nails;
-        break;
+            break;
         case PC_PYRO:
         case PC_PLASMA:
             if (plasmaclass) {
                 newmis.ammo_rockets = self.ammo_rockets;
             }
             newmis.ammo_nails = self.ammo_nails;
+            break;
+        default:
     }
-
-    if (self.playerclass == PC_MEDIC && !medicaura && old_medikit)
-        newmis.ammo_cells = self.ammo_cells;
-
-    if (!(newmis.ammo_shells + newmis.ammo_nails + newmis.ammo_rockets + newmis.ammo_cells)) {
-        dremove(newmis);
-        if (self.menu_input != Menu_Drop_Input)
-        	Menu_Drop();
-        else
-        	Menu_Close(self);
-        return;
+    if ((newmis.ammo_rockets + newmis.ammo_cells + newmis.ammo_nails + newmis.ammo_shells) == 0) {
+      return;
     }
 
     if (newmis.ammo_shells) {
@@ -85,6 +83,50 @@ void () TeamFortress_Discard = {
     setmodel(newmis, "progs/backpack.mdl");
 };
 
+void () TeamFortress_Discard_DropAmmo = {
+    // if nothing to discard, do dropammo instead
+    float disc;
+    disc = 0;
+
+    switch (self.playerclass) {
+        case PC_SCOUT:
+        case PC_ENGINEER:
+            disc = self.ammo_rockets;
+            break;
+        case PC_MEDIC:
+            disc = self.ammo_rockets;
+            if (!medicaura && old_medikit) {
+                disc += self.ammo_cells;
+            }
+            break;
+        case PC_SNIPER:
+        case PC_SPY:
+            disc = self.ammo_rockets + self.ammo_cells;
+            break;
+        case PC_SOLDIER:
+        case PC_DEMOMAN:
+            disc = self.ammo_cells + self.ammo_nails;
+            break;
+        case PC_HVYWEAP:
+            disc = self.ammo_rockets + self.ammo_nails;
+            break;
+        case PC_PYRO:
+            disc = self.ammo_nails;
+            break;
+        default:
+    }
+
+    if (disc == 0) {
+        if (self.menu_input != Menu_Drop_Input)
+        	Menu_Drop();
+        else
+        	Menu_Close(self);
+        return;
+    } else {
+        TeamFortress_Discard();
+    }
+};
+
 void () TeamFortress_SaveMe = {
     local entity te, tl;
 

buttons.qc

@@ -18,6 +18,14 @@ void () button_done = {
 };
 
 void () button_return = {
+    // q3f support
+    string targname;
+    entity targ;
+    targ = world;
+    targname = self.target;
+    targ = find(targ, targetname, targname);
+    targ.active = TFGS_INACTIVE;
+
     self.goal_state = TFGS_INACTIVE;
     self.state = STATE_DOWN;
     SUB_CalcMove(self.pos1, self.speed, button_done);
@@ -34,6 +42,14 @@ void () button_fire = {
     if ((self.state == STATE_UP) || (self.state == STATE_TOP))
         return;
 
+    // q3f support
+    string targname;
+    entity targ;
+    targ = world;
+    targname = self.target;
+    targ = find(targ, targetname, targname);   
+    targ.active = TFGS_ACTIVE;
+
     sound(self, CHAN_VOICE, self.noise, 1, ATTN_NORM);
 
     self.state = STATE_UP;

defs.h

@@ -403,8 +403,8 @@
 #define TF_ENGINEER_BUILD       77  // Engineer: Bring up build menu for Engineer
 #define TF_ENGINEER_DETDISP     78  // Engineer: Detonate dispenser for Engineer
 #define TF_ENGINEER_DETSENTRY   79  // Engineer: Detonate sentry gun for Engineer
-#define TF_DISGUISE_PLASMA      80  // Spy: Disguise as Plasma
-// unused                       81
+#define TF_DISCARD_DROP_AMMO    80
+#define TF_DISGUISE_PLASMA      81  // Spy: Disguise as Plasma
 // unused                       82
 // unused                       83
 // unused                       84

q3defs.qc

@@ -13,4 +13,5 @@
 .string carried_all_sound;
 .string inactive_all_message;
 .string activetarget;
-.string checkstate;
+.string checkstate;
+.float active;

qw.qc

@@ -510,8 +510,11 @@ float intermission_exittime;
 // add clientkill ent defs
 .float clientkillforce;
 .float clientkillfree;
+
+// plasma class
 .float lifenum;
 
+
 //============================================================================
 
 void (float psize, entity p) KickPlayer = {

tforthlp.qc

@@ -109,6 +109,7 @@ void () TeamFortress_MOTD = {
         TeamFortress_Alias("special", TF_SPECIAL_SKILL, 0);
         TeamFortress_Alias("saveme", TF_MEDIC_HELPME, 0);
         TeamFortress_Alias("discard", TF_DISCARD, 0);
+        TeamFortress_Alias("discard_drop_ammo", TF_DISCARD_DROP_AMMO, 0);
     } else if (self.motd == 60) {
         TeamFortress_Alias("weapnext", TF_WEAPNEXT, 0);
         TeamFortress_Alias("weapprev", TF_WEAPPREV, 0);

tfortmap.qc

@@ -1333,6 +1333,33 @@ void (entity Goal, entity AP, entity ActivatingGoal) AttemptToActivate = {
     if (cb_prematch_time > time)
         return;
 
+    
+    // q3f support
+    if (Goal.checkstate != string_null) {
+        string cname, cstate;
+        float slen, idx;
+        entity targ;
+        targ = world;
+       
+        idx = strstrofs(Goal.checkstate, "=");
+        slen = strlen(Goal.checkstate);
+        cname = substring(Goal.checkstate, 0, idx);
+        targ = find(targ, targetname, cname);
+        cstate = substring(Goal.checkstate, idx + 1, slen);
+        switch (cstate)
+        {
+            case "inactive":
+                if (targ.active == TFGS_ACTIVE) {
+                    return;
+                }
+            break;
+            case "active":
+                if (targ.active == TFGS_INACTIVE) {
+                    return;
+                }
+        }
+    }
+
     if (Activated(Goal, AP)) {
         if (ActivatingGoal == Goal)
             DoResults(Goal, AP, 1);
@@ -1638,6 +1665,7 @@ void (entity Goal, entity AP, float addb) DoResults = {
         te.weapon = addb;
         return;
     }
+
     UpdateAbbreviations(Goal);
     Goal.goal_state = 2;
     if ((Goal.classname == "info_tfgoal") && (Goal.mdl != string_null)) {
@@ -1946,6 +1974,7 @@ void () tfgoal_touch = {
 };
 
 void () info_tfgoal_use = {
+    dprint("info_tfgoal_use\n");
     AttemptToActivate(self, activator, self);
 };
 
@@ -2835,5 +2864,6 @@ void (entity player) DropGoalItems = {
         te = find(te, classname, "item_tfgoal");
     }
     dremove(newmis);
+
     TeamFortress_SetSpeed(player);
 };

weapons.qc

@@ -60,6 +60,7 @@ void () TeamFortress_EngineerBuild;
 void () TeamFortress_EngineerBuildStop;
 void () TeamFortress_Scan;
 void () TeamFortress_Discard;
+void () TeamFortress_Discard_DropAmmo;
 void (float force) TeamFortress_DetonatePipebombs;
 void (float timer) TeamFortress_SetDetpack;
 void () TeamFortress_DetpackStop;
@@ -2403,6 +2404,8 @@ void () ImpulseCommands = {
         DropGoalItems(self);
     else if (self.impulse == TF_DISCARD)
         TeamFortress_Discard();
+    else if (self.impulse == TF_DISCARD_DROP_AMMO)
+        TeamFortress_Discard_DropAmmo();
     else if (self.impulse == TF_DASH)
         CF_Scout_Dash();
     else if (self.impulse == TF_PB_DETONATE)
@@ -2763,8 +2766,9 @@ void () W_WeaponFrame = {
         }
     }
 
-    // class specials and grenade impulses always possible
-    if (self.impulse == TF_SPECIAL_SKILL ||(self.impulse >= TF_GRENADE_1 && self.impulse <= TF_GRENADE_SWITCH)) {
+    // class specials and grenade impulses always possible, also detpipe
+    if (self.impulse == TF_SPECIAL_SKILL ||(self.impulse >= TF_GRENADE_1 && self.impulse <= TF_GRENADE_SWITCH)
+            || self.impulse == TF_PB_DETONATE) {
         ImpulseCommands();
         return;
     }