Merge pull request #578 from akaAgar/exact-rts-condition-prefix

Added "EXACT_" optional prefix to RTS's ON_CONDITION flag
edge-classic · Oct 5, 2023 · 994bf15 · 994bf15
2 parents 591bb65 + 4e0e4f7
commit 994bf15
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/source_files/ddf/thing.cc b/source_files/ddf/thing.cc
@@ -2164,6 +2164,7 @@ bool DDF_MainParseCondition(const char *info, condition_check_t *cond)
 	const char *pos;
 
 	cond->negate = false;
+	cond->exact = false;
 	cond->cond_type = COND_NONE;
 	cond->amount = 1;
 
@@ -2200,6 +2201,12 @@ bool DDF_MainParseCondition(const char *info, condition_check_t *cond)
 		t_off = 4;
 	}
 
+	if (epi::prefix_case_cmp(typebuf, "EXACT_") == 0)
+	{
+		cond->exact = true;
+		t_off = 6;
+	}
+
 	if (ConditionTryAmmo(typebuf + t_off, sub_buf, cond) ||
 	    ConditionTryInventory(typebuf + t_off, sub_buf, cond) ||
 		ConditionTryCounter(typebuf + t_off, sub_buf, cond) ||

diff --git a/source_files/ddf/thing.h b/source_files/ddf/thing.h
@@ -644,6 +644,9 @@ typedef struct condition_check_s
 	// negate the condition
 	bool negate = false;
 
+	// condition is looking for an exact value (not "greater than" or "smaller than")
+	bool exact = false;
+
 	// condition typing. -ACB- 2003/05/15: Made an integer to hold condition_check_type_e enumeration
 	int cond_type = 0;
 

diff --git a/source_files/edge/e_player.cc b/source_files/edge/e_player.cc
@@ -599,6 +599,9 @@ bool G_CheckConditions(mobj_t *mo, condition_check_t *cond)
 		switch (cond->cond_type)
 		{
 			case COND_Health:
+				if (cond->exact)
+					return (mo->health == cond->amount);
+
 				temp = (mo->health >= cond->amount);
 
 				if ((!cond->negate && !temp) || (cond->negate && temp))
@@ -610,6 +613,14 @@ bool G_CheckConditions(mobj_t *mo, condition_check_t *cond)
 				if (!p)
 					return false;
 
+				if (cond->exact)
+				{
+					if (cond->sub.type == ARMOUR_Total)
+						return (p->totalarmour == i_amount);
+					else
+						return (p->armours[cond->sub.type] == i_amount);
+				}
+
 				if (cond->sub.type == ARMOUR_Total)
 					temp = (p->totalarmour >= i_amount);
 				else
@@ -656,6 +667,9 @@ bool G_CheckConditions(mobj_t *mo, condition_check_t *cond)
 				if (!p)
 					return false;
 
+				if (cond->exact)
+					return (p->powers[cond->sub.type] == cond->amount);
+
 				temp = (p->powers[cond->sub.type] > cond->amount);
 
 				if ((!cond->negate && !temp) || (cond->negate && temp))
@@ -667,6 +681,9 @@ bool G_CheckConditions(mobj_t *mo, condition_check_t *cond)
 				if (!p)
 					return false;
 
+				if (cond->exact)
+					return (p->ammo[cond->sub.type].num == i_amount);
+
 				temp = (p->ammo[cond->sub.type].num >= i_amount);
 
 				if ((!cond->negate && !temp) || (cond->negate && temp))
@@ -678,6 +695,9 @@ bool G_CheckConditions(mobj_t *mo, condition_check_t *cond)
 				if (!p)
 					return false;
 
+				if (cond->exact)
+					return (p->inventory[cond->sub.type].num == i_amount);
+
 				temp = (p->inventory[cond->sub.type].num >= i_amount);
 
 				if ((!cond->negate && !temp) || (cond->negate && temp))
@@ -689,6 +709,9 @@ bool G_CheckConditions(mobj_t *mo, condition_check_t *cond)
 				if (!p)
 					return false;
 
+				if (cond->exact)
+					return (p->counters[cond->sub.type].num == i_amount);
+
 				temp = (p->counters[cond->sub.type].num >= i_amount);
 
 				if ((!cond->negate && !temp) || (cond->negate && temp))