Move new gear system to be default and remove old gear system, add su…

…pport for protonic pack in new gear system
soolar · Feb 5, 2019 · 0d6ba58 · 0d6ba58
1 parent e1623a5
commit 0d6ba58
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 742 deletions.
diff --git a/BUILD/equipment/assemble_equipment.sh b/BUILD/equipment/assemble_equipment.sh
@@ -34,6 +34,10 @@ HEADER="# EDITTING THIS FILE DIRECTLY IS NOT RECOMMENDED
 ## prop
 ### data: <propname>=<value>
 ### Only simple comparison is available at the moment
+## expectghostreport
+### data: Doesn't matter, but put something so I don't have to support dataless conditions
+### True when you expect a protonic ghost report
+### Pretty much just for the protonic accelerator pack
 # An item can be listed multiple times (presumably with different conditionals)
 # First item found that is available, can be equipped, and meets its conditions (if any) will be used
 

diff --git a/BUILD/equipment/back.dat b/BUILD/equipment/back.dat
@@ -1,4 +1,5 @@
 # Back items
+Protonic Accelerator Pack	expectghostreport:true
 LOV Epaulettes	mainstat:Mysticality
 Protonic Accelerator Pack
 Camp Scout Backpack

diff --git a/RELEASE/data/sl_ascend_equipment.txt b/RELEASE/data/sl_ascend_equipment.txt
@@ -32,6 +32,10 @@
 ## prop
 ### data: <propname>=<value>
 ### Only simple comparison is available at the moment
+## expectghostreport
+### data: Doesn't matter, but put something so I don't have to support dataless conditions
+### True when you expect a protonic ghost report
+### Pretty much just for the protonic accelerator pack
 # An item can be listed multiple times (presumably with different conditionals)
 # First item found that is available, can be equipped, and meets its conditions (if any) will be used
 
@@ -94,24 +98,25 @@ acc	52	Vampire Collar
 acc	53	Jaunty Feather
 
 # Back items
-back	0	LOV Epaulettes	mainstat:Mysticality
-back	1	Protonic Accelerator Pack
-back	2	Camp Scout Backpack
-back	3	Buddy Bjorn
-back	4	Polyester Parachute
-back	5	Makeshift Cape
-back	6	Misty Robe
-back	7	Misty Cape
-back	8	Misty Cloak
-back	9	Frozen Turtle Shell
-back	10	Giant Gym Membership Card
-back	11	Fiberglass Frock
-back	12	Gabardine Gunnysack
-back	13	Oil Shell
-back	14	Pillow Shell
-back	15	Black Cloak
-back	16	Whatsit-Covered Turtle Shell
-back	17	Barskin Cloak
+back	0	Protonic Accelerator Pack	expectghostreport:true
+back	1	LOV Epaulettes	mainstat:Mysticality
+back	2	Protonic Accelerator Pack
+back	3	Camp Scout Backpack
+back	4	Buddy Bjorn
+back	5	Polyester Parachute
+back	6	Makeshift Cape
+back	7	Misty Robe
+back	8	Misty Cape
+back	9	Misty Cloak
+back	10	Frozen Turtle Shell
+back	11	Giant Gym Membership Card
+back	12	Fiberglass Frock
+back	13	Gabardine Gunnysack
+back	14	Oil Shell
+back	15	Pillow Shell
+back	16	Black Cloak
+back	17	Whatsit-Covered Turtle Shell
+back	18	Barskin Cloak
 
 # Familiar gear
 familiar	0	miniature life preserver	path:Heavy Rains

diff --git a/RELEASE/scripts/sl_ascend/sl_ascend_header.ash b/RELEASE/scripts/sl_ascend/sl_ascend_header.ash
@@ -206,6 +206,7 @@ boolean dailyEvents();
 
 //Do we have a some item either equipped or in inventory (not closet or hagnk\'s.
 boolean possessEquipment(item equipment);		//Defined in sl_ascend/sl_equipment.ash
+int equipmentAmount(item equipment); // Defined in sl_ascend/sl_equipment.ash
 
 //Do Bjorn stuff
 boolean handleBjornify(familiar fam);			//Defined in sl_ascend/sl_equipment.ash
@@ -513,17 +514,6 @@ int elemental_resist(element goal);							//Defined in sl_ascend/sl_util.ash
 float elemental_resist_value(int resistance);				//Defined in sl_ascend/sl_util.ash
 void ensureSealClubs();										//Defined in sl_ascend/sl_equipment.ash
 void equipBaseline();										//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineAccessories();							//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineAcc1();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineAcc2();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineAcc3();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineBack();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineFam();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineHat();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineHolster();								//Defined in sl_ascend/sl_equipment.ash
-void equipBaselinePants();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineShirt();									//Defined in sl_ascend/sl_equipment.ash
-void equipBaselineWeapon();									//Defined in sl_ascend/sl_equipment.ash
 void equipRollover();										//Defined in sl_ascend/sl_equipment.ash
 boolean eudora_available();									//Defined in sl_ascend/sl_eudora.ash
 item eudora_current();										//Defined in sl_ascend/sl_eudora.ash
@@ -621,7 +611,6 @@ boolean handleFaxMonster(monster enemy, boolean fightIt);	//Defined in sl_ascend
 boolean handleFaxMonster(monster enemy, boolean fightIt, string option);//Defined in sl_ascend/sl_clan.ash
 boolean handleFaxMonster(monster enemy, string option);		//Defined in sl_ascend/sl_clan.ash
 void handleJar();											//Defined in sl_ascend.ash
-void handleOffHand();										//Defined in sl_ascend/sl_equipment.ash
 int handlePulls(int day);									//Defined in sl_ascend.ash
 boolean handleSealAncient();								//Defined in sl_ascend/sl_util.ash
 boolean handleSealAncient(string option);					//Defined in sl_ascend/sl_util.ash