Don't double-use waffles #1365

dsimich · 2023-09-19T21:22:56Z

Description

Currently double-use waffles. Trying to update code so that it doesn't do that.

How Has This Been Tested?

Running through normal Standard Sauceror for as quick a run as possible.

Checklist:

My code follows the style guidelines of this project.
I have performed a self-review of my own code.
I have commented my code, particularly in hard-to-understand areas.
I have based my pull request against the main branch or have a good reason not to.

dsimich · 2023-09-19T21:24:00Z

Latest Waffle.txt

gausie

Looks good to me

Alium58 · 2023-09-20T18:59:26Z

There is some weirdness going on in your log there

> [INFO] auto_combat initialized fighting [beefy bodyguard bat]: atk = 78. def = 74. HP = 77. LA = 52
Preference _auto_combatState changed from  to (it11311)
Preference auto_replaces changed from  to (1:beefy bodyguard bat:none:14)
Round 1: erct657 uses the waffle and uses the waffle!
Round 2: beefy bodyguard bat takes 2 damage.
Round 2: beefy bodyguard bat takes 3 damage.
Round 2: beefy bodyguard bat takes 6 damage.
Round 2: You lose 1 hit point
Adjusted combat item count: waffle (2)

1 - We shouldn't update auto_replaces unless the replacement works. Currently we assume it will work and track it before using the replacer. This is a bit of a refactor and could be in a different PR

2 - Having troubles lining up what is in log vs what your code is. Code seems that it would abort if we are going to replace the enemy, but log shows we got to round 2 before aborting for not being able to find a replacer. Which is good as we used waffle and don't want to use it again. Also why does log show combat state gets "replacer" added? That should always be added before using the waffle. Are you sure this code is the same as what you were using when log was generated?

dsimich · 2023-09-21T02:56:35Z

There is some weirdness going on in your log there
> [INFO] auto_combat initialized fighting [beefy bodyguard bat]: atk = 78. def = 74. HP = 77. LA = 52
Preference _auto_combatState changed from  to (it11311)
Preference auto_replaces changed from  to (1:beefy bodyguard bat:none:14)
Round 1: erct657 uses the waffle and uses the waffle!
Round 2: beefy bodyguard bat takes 2 damage.
Round 2: beefy bodyguard bat takes 3 damage.
Round 2: beefy bodyguard bat takes 6 damage.
Round 2: You lose 1 hit point
Adjusted combat item count: waffle (2)
1 - We shouldn't update auto_replaces unless the replacement works. Currently we assume it will work and track it before using the replacer. This is a bit of a refactor and could be in a different PR

2 - Having troubles lining up what is in log vs what your code is. Code seems that it would abort if we are going to replace the enemy, but log shows we got to round 2 before aborting for not being able to find a replacer. Which is good as we used waffle and don't want to use it again. Also why does log show combat state gets "replacer" added? That should always be added before using the waffle. Are you sure this code is the same as what you were using when log was generated?

Yeah, the log was just showing that the couple of iterations of useItem I went through weren't effective. After I did the cigarette lighter trick of useItems($item[waffle], $item[none]); it works better and then after I fixed the combat tracking section in stage2 it works perfectly as expected. It uses 1 and logs it properly.

Alium58 · 2023-09-21T03:40:48Z

RELEASE/scripts/autoscend/combat/auto_combat_ed.ash

@@ -375,7 +375,7 @@ string auto_edCombatHandler(int round, monster enemy, string text)
 		combat_status_add("banishercheck");
 	}

-	if (!combat_status_check("replacercheck") && canReplace(enemy) && auto_wantToReplace(enemy, my_location()))
+	if (!combat_status_check("replacercheck") && auto_wantToReplace(enemy, my_location()))


Thinking out loud. Don't need to add support for parsing funkslinging like you did in the general combat code because Ed can't throw 2 items in a single round of combat. True fact?

Never ran Ed but looking through the wiki that makes sense to me since you lose your skills and there is no funkslinging equivalent in the skill tree

RELEASE/scripts/autoscend/combat/auto_combat_default_stage2.ash

Malibu-Stacey · 2023-09-21T06:17:17Z

RELEASE/scripts/autoscend/combat/auto_combat_util.ash

 	{
-		return "item " + $item[waffle];
+		return useItems($item[waffle], $item[none]);


Suggested change

return useItems($item[waffle], $item[none]);

return useItem($item[waffle]);

useItem() has handling for funkslinging, no need to complicate it unnecessarily.

It didn't work with useItem. It tried to double use them, BUT that was before I updated the replacer logger in stage2. Will try useItem again and see if it works now

Yeah, useItem double uses waffle for some reason. I changed it back to useItem and this happened.
useItem waffle.txt

Could the issue be none vs nothing?

Does it still double use when using useItem + change useItem to have none as the second item?

hmm did a quick test by using 2 different custom combat scripts. One for each of the returned value above. Both resulted in only 1 waffle being used. So none vs nothing doesn't seem to be the issue

Alium58 · 2023-10-01T18:19:40Z

@Malibu-Stacey agree with you useItem should be used but isn't obvious why it double uses waffles. Folks are running into this issue so over rode you request and merged it. We can make an issue for it

dsimich added 7 commits September 14, 2023 18:24

Try useItem to fix waffle

7481971

Merge branch 'main' into wafflefix

1a0a1b0

useItem works now

d370627

Tracker and hopefully this stops double-using them

c8dc023

Merge branch 'main' into wafflefix

0fea52b

Some changes

b9ff080

Trying something different to log waffles

7932e75

dsimich added 3 commits September 19, 2023 17:26

Closing brackets is hard

883320c

Stealing cigarette lighter trick

8f8555e

Merge branch 'main' into wafflefix

f1f6cd4

gausie previously approved these changes Sep 20, 2023

View reviewed changes

Handle replacer combat string that has a comma

7c57419

dsimich dismissed gausie’s stale review via 7c57419 September 21, 2023 02:48

Remove abort

5d44092

dsimich closed this Sep 21, 2023

dsimich reopened this Sep 21, 2023

Alium58 reviewed Sep 21, 2023

View reviewed changes

Malibu-Stacey requested changes Sep 21, 2023

View reviewed changes

dsimich and others added 2 commits September 21, 2023 15:54

tracker adjustment suggestion from Alium

3689219

Merge branch 'main' into wafflefix

98170f5

Alium58 approved these changes Sep 28, 2023

View reviewed changes

Alium58 merged commit edc175b into loathers:main Oct 1, 2023
1 check passed

dsimich deleted the wafflefix branch October 1, 2023 20:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't double-use waffles #1365

Don't double-use waffles #1365

dsimich commented Sep 19, 2023 •

edited

Loading

dsimich commented Sep 19, 2023

gausie left a comment

Alium58 commented Sep 20, 2023

dsimich commented Sep 21, 2023

Alium58 Sep 21, 2023

dsimich Sep 21, 2023

Malibu-Stacey Sep 21, 2023

dsimich Sep 21, 2023

dsimich Sep 21, 2023

Alium58 Sep 28, 2023

Alium58 Sep 28, 2023

Alium58 Sep 28, 2023

Alium58 commented Oct 1, 2023

	return useItems($item[waffle], $item[none]);
	return useItem($item[waffle]);

Don't double-use waffles #1365

Don't double-use waffles #1365

Conversation

dsimich commented Sep 19, 2023 • edited Loading

Description

How Has This Been Tested?

Checklist:

dsimich commented Sep 19, 2023

gausie left a comment

Choose a reason for hiding this comment

Alium58 commented Sep 20, 2023

dsimich commented Sep 21, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Alium58 commented Oct 1, 2023

dsimich commented Sep 19, 2023 •

edited

Loading