X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems.qc;h=1282d428af96e139049298a6bd2630cf9437d5e8;hb=d957e789b57a046f8456b5e88ed4abfa5a34f6f1;hp=0f1237d859478a5021ad9603008a39a2fdfe176f;hpb=24c0e211b8a839afe6bb5fc5c603d450a72b9160;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/items.qc b/qcsrc/common/items.qc
index 0f1237d85..1282d428a 100644
--- a/qcsrc/common/items.qc
+++ b/qcsrc/common/items.qc
@@ -1,5 +1,5 @@
 // WEAPON PLUGIN SYSTEM
-entity weapon_info[24];
+entity weapon_info[WEP_MAXCOUNT];
 entity dummy_weapon_info;
 
 void register_weapon(float id, float(float) func, float ammotype, float i, float weapontype, float pickupbasevalue, string modelname, string shortname, string wname)
@@ -8,7 +8,7 @@ void register_weapon(float id, float(float) func, float ammotype, float i, float
 	weapon_info[id - 1] = e = spawn();
 	e.classname = "weapon_info";
 	e.weapon = id;
-	e.weapons = power2of(id - WEP_FIRST);
+	WEPSET_COPY_EW(e, id);
 	e.netname = shortname;
 	e.message = wname;
 	e.items = ammotype;
@@ -19,6 +19,18 @@ void register_weapon(float id, float(float) func, float ammotype, float i, float
 	e.model2 = strzone(strcat("wpn-", e.mdl));
 	e.impulse = i;
 	e.bot_pickupbasevalue = pickupbasevalue;
+	if(ammotype & IT_SHELLS)
+		e.ammo_field = ammo_shells;
+	else if(ammotype & IT_NAILS)
+		e.ammo_field = ammo_nails;
+	else if(ammotype & IT_ROCKETS)
+		e.ammo_field = ammo_rockets;
+	else if(ammotype & IT_CELLS)
+		e.ammo_field = ammo_cells;
+	else if(ammotype & IT_FUEL)
+		e.ammo_field = ammo_fuel;
+	else
+		e.ammo_field = ammo_batteries;
 }
 float w_null(float dummy)
 {
@@ -26,46 +38,27 @@ float w_null(float dummy)
 }
 void register_weapons_done()
 {
-	entity wi;
-
 	dummy_weapon_info = spawn();
 	dummy_weapon_info.classname = "weapon_info";
 	dummy_weapon_info.weapon = 0; // you can recognize dummies by this
-	dummy_weapon_info.weapons = 0; // you can recognize dummies by this too
-	dummy_weapon_info.netname = "@!#%'n Tuba";
+	WEPSET_CLEAR_E(dummy_weapon_info);
+	dummy_weapon_info.netname = "";
+	dummy_weapon_info.message = "@!#%'n Tuba";
 	dummy_weapon_info.items = 0;
 	dummy_weapon_info.weapon_func = w_null;
 	dummy_weapon_info.mdl = "";
 	dummy_weapon_info.model = "";
 	dummy_weapon_info.spawnflags = 0;
+	dummy_weapon_info.model2 = "";
 	dummy_weapon_info.impulse = -1;
 	dummy_weapon_info.bot_pickupbasevalue = 0;
-	dummy_weapon_info.model2 = "";
 
 	float i;
 	weaponorder_byid = "";
-	for(i = 24; i >= 1; --i)
+	for(i = WEP_MAXCOUNT; i >= 1; --i)
 		if(weapon_info[i-1])
 			weaponorder_byid = strcat(weaponorder_byid, " ", ftos(i));
-
-	float imp;
-	weaponorder_byimpulse = "";
-	for(i = 1; i <= 24; ++i)
-	{
-		wi = weapon_info[i-1];
-		if(wi && wi.impulse == 0)
-			weaponorder_byimpulse = strcat(weaponorder_byimpulse, " ", ftos(i));
-	}
-	for(imp = 9; imp > 0; --imp)
-		for(i = 1; i <= 24; ++i)
-		{
-			wi = weapon_info[i-1];
-			if(wi && wi.impulse == imp)
-				weaponorder_byimpulse = strcat(weaponorder_byimpulse, " ", ftos(i));
-		}
-
 	weaponorder_byid = strzone(substring(weaponorder_byid, 1, strlen(weaponorder_byid) - 1));
-	weaponorder_byimpulse = strzone(substring(weaponorder_byimpulse, 1, strlen(weaponorder_byimpulse) - 1));
 }
 entity get_weaponinfo(float id)
 {
@@ -110,3 +103,72 @@ string W_NumberWeaponOrder(string order)
 {
 	return mapPriorityList(order, W_NumberWeaponOrder_MapFunc);
 }
+
+float W_FixWeaponOrder_BuildImpulseList_buf[WEP_MAXCOUNT];
+string W_FixWeaponOrder_BuildImpulseList_order;
+void W_FixWeaponOrder_BuildImpulseList_swap(float i, float j, entity pass)
+{
+	float h;
+	h = W_FixWeaponOrder_BuildImpulseList_buf[i];
+	W_FixWeaponOrder_BuildImpulseList_buf[i] = W_FixWeaponOrder_BuildImpulseList_buf[j];
+	W_FixWeaponOrder_BuildImpulseList_buf[j] = h;
+}
+float W_FixWeaponOrder_BuildImpulseList_cmp(float i, float j, entity pass)
+{
+	entity e1, e2;
+	float d;
+	e1 = get_weaponinfo(W_FixWeaponOrder_BuildImpulseList_buf[i]);
+	e2 = get_weaponinfo(W_FixWeaponOrder_BuildImpulseList_buf[j]);
+	d = mod(e1.impulse + 9, 10) - mod(e2.impulse + 9, 10);
+	if(d != 0)
+		return -d; // high impulse first!
+	return
+		strstrofs(strcat(" ", W_FixWeaponOrder_BuildImpulseList_order, " "), sprintf(" %d ", W_FixWeaponOrder_BuildImpulseList_buf[i]), 0)
+		-
+		strstrofs(strcat(" ", W_FixWeaponOrder_BuildImpulseList_order, " "), sprintf(" %d ", W_FixWeaponOrder_BuildImpulseList_buf[j]), 0)
+		; // low char index first!
+}
+string W_FixWeaponOrder_BuildImpulseList(string o)
+{
+	float i;
+	W_FixWeaponOrder_BuildImpulseList_order = o;
+	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+		W_FixWeaponOrder_BuildImpulseList_buf[i - WEP_FIRST] = i;
+	heapsort(WEP_LAST - WEP_FIRST + 1, W_FixWeaponOrder_BuildImpulseList_swap, W_FixWeaponOrder_BuildImpulseList_cmp, world);
+	o = "";
+	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+		o = strcat(o, " ", ftos(W_FixWeaponOrder_BuildImpulseList_buf[i - WEP_FIRST]));
+	W_FixWeaponOrder_BuildImpulseList_order = string_null;
+	return substring(o, 1, -1);
+}
+
+string W_FixWeaponOrder_AllowIncomplete(string order)
+{
+	return W_FixWeaponOrder(order, 0);
+}
+
+string W_FixWeaponOrder_ForceComplete(string order)
+{
+	if(order == "")
+		order = W_NumberWeaponOrder(cvar_defstring("cl_weaponpriority"));
+	return W_FixWeaponOrder(order, 1);
+}
+
+void W_RandomWeapons(entity e, float n)
+{
+	float i, j;
+	WEPSET_DECLARE_A(remaining);
+	WEPSET_DECLARE_A(result);
+	WEPSET_COPY_AE(remaining, e);
+	WEPSET_CLEAR_A(result);
+	for(i = 0; i < n; ++i)
+	{
+		RandomSelection_Init();
+		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+			if(WEPSET_CONTAINS_AW(remaining, j))
+				RandomSelection_Add(world, j, string_null, 1, 1);
+		WEPSET_OR_AW(result, RandomSelection_chosen_float);
+		WEPSET_ANDNOT_AW(remaining, RandomSelection_chosen_float);
+	}
+	WEPSET_COPY_EA(e, result);
+}