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

@AmProsius AmProsius commented Apr 1, 2021

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 label Mar 28, 2021
@AmProsius
Copy link
Owner Author

@AmProsius AmProsius commented Mar 28, 2021

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 label Mar 28, 2021
@szapp szapp added compatibility: easy impl: replace assign/push str type: session fix labels Mar 28, 2021
@szapp
Copy link
Collaborator

@szapp 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

@AmProsius AmProsius 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.

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

@szapp
Copy link
Collaborator

@szapp 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 Apr 1, 2021
@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
szapp
szapp approved these changes Apr 2, 2021
Copy link
Collaborator

@szapp szapp left a comment

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 Apr 2, 2021
AmProsius added a commit that referenced this issue Apr 3, 2021
szapp added a commit that referenced this issue Apr 19, 2021
@szapp szapp removed the validation: required label May 14, 2021
szapp added a commit that referenced this issue Feb 6, 2022
szapp added a commit that referenced this issue Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compatibility: easy impl: replace assign/push str provided fix type: session fix
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