Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Digger doesn't repair hut #216

Merged
merged 2 commits into from Apr 2, 2021
Merged

Digger doesn't repair hut #216

merged 2 commits into from Apr 2, 2021

Conversation

AmProsius
Copy link
Owner

Describe the bug
A Digger is supposed to repair his hut during daytime, but a typo in the waypoint name prevents him from doing so.

Expected behavior
A Digger now correctly repairs his hut during daytime.

Additional context
Bug and fix provided by NikX94.

@AmProsius AmProsius added the validation: required This issue needs validation from one of the validators. label Mar 28, 2021
@AmProsius
Copy link
Owner Author

FUNC VOID Rtn_start_506 ()
{
TA_Sleep (23,00,06,30,"OCR_HUT_15");
TA_StandAround (06,30,11,00,"OCR_OUTSIDE_HUT_15");
TA_RepairHut (11,00,17,00,"OCR_Hut_15");
TA_SitCampfire (17,00,23,00,"OCR_OUTSIDE_HUT_15");
};

changed to

FUNC VOID Rtn_start_506 ()
{
    TA_Sleep        (23,00,06,30,"OCR_HUT_15");
    TA_StandAround  (06,30,11,00,"OCR_OUTSIDE_HUT_15");
    TA_RepairHut    (11,00,17,00,"OCR_HUT_15");
    TA_SitCampfire  (17,00,23,00,"OCR_OUTSIDE_HUT_15");
};

@AmProsius AmProsius added the provided fix This issue has a fix provided in the comments. label Mar 28, 2021
@szapp szapp added compatibility: easy This issue is easy to make compatible. impl: replace assign/push str This issue requires replacing pushed strings or string assignments in the scripts. type: session fix The fix for this issues is persistent across a session. labels Mar 28, 2021
@szapp
Copy link
Collaborator

szapp commented Mar 28, 2021

Here, replacing the pushed string replacement will always happen (i.e. fix applied), because Hlp_StrCmp within G1CP_ReplacePushStr is case-insensitive. I could replace it by STR_Compare which is case-sensitive.

@AmProsius
Copy link
Owner Author

Here, replacing the pushed string replacement will always happen (i.e. fix applied), because Hlp_StrCmp within G1CP_ReplacePushStr is case-insensitive. I could replace it by STR_Compare which is case-sensitive.

If there's no downside to it, I'd approve that.

@szapp
Copy link
Collaborator

szapp commented Mar 29, 2021

I changed it to case-insensitive string compare. This fix here should now be possible.

@szapp szapp added this to NPC daily routine in Fix templates Mar 31, 2021
@AmProsius AmProsius added this to To Do in v1.1.0 via automation Mar 31, 2021
@AmProsius AmProsius added this to the v1.1.0 milestone Mar 31, 2021
@AmProsius AmProsius requested a review from szapp April 1, 2021 10:08
@AmProsius AmProsius removed their assignment Apr 1, 2021
@szapp szapp moved this from To Do to In Progress in v1.1.0 Apr 1, 2021
Copy link
Collaborator

@szapp szapp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good, test passes.

@szapp szapp merged commit c5097df into master Apr 2, 2021
v1.1.0 automation moved this from In Progress to Done Apr 2, 2021
@szapp szapp deleted the bug216 branch April 2, 2021 09:33
AmProsius added a commit that referenced this pull request Apr 3, 2021
szapp added a commit that referenced this pull request Apr 19, 2021
@szapp szapp removed the validation: required This issue needs validation from one of the validators. label May 14, 2021
szapp added a commit that referenced this pull request Feb 6, 2022
szapp added a commit that referenced this pull request Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compatibility: easy This issue is easy to make compatible. impl: replace assign/push str This issue requires replacing pushed strings or string assignments in the scripts. provided fix This issue has a fix provided in the comments. type: session fix The fix for this issues is persistent across a session.
Projects
Fix templates
Change daily routine waypoint
v1.1.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants