Skip to content

Fixed and simplified #9

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.

Sign up for GitHub

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

Open
Gurkoel wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Fixed and simplified #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
014165d
Update MethHelper.lua
Gurkoel Nov 14, 2019
9a752ca
Update README.md
Gurkoel Nov 14, 2019
1215033
Add files via upload
Gurkoel Nov 15, 2019
abc5573
Add files via upload
Gurkoel Nov 15, 2019
fba50e1
Add files via upload
Gurkoel Nov 15, 2019
3ce32a5
Add files via upload
Gurkoel Nov 15, 2019
452fb8c
Fixed a Few bugs and added a Menu
Gurkoel Nov 16, 2019
5cfe624
Merge pull request #1 from Gurkoel/Menu
Gurkoel Nov 16, 2019
b714ae1
simplyfied code
Gurkoel Jan 13, 2020
91bc123
Fixen and simplified
Gurkoel Jan 17, 2020
e81c42b
further simplyfied code, investigating into 8bag bug
Gurkoel Jan 17, 2020
867227d
Found a solution for 8 bag error, its being tested if a dialog is mis…
Gurkoel Jan 18, 2020
8310f01
Testing in progression ...
Gurkoel Jan 20, 2020
58e3083
test
Gurkoel Jan 20, 2020
8e8c2e2
Merge branch 'Testing' of https://github.com/Gurkoel/MethHelper into …
Gurkoel Jan 20, 2020
37d3d2e
8-bag bug fixed
Gurkoel Jan 20, 2020
7ac250d
Merge pull request #2 from Gurkoel/Testing
Gurkoel Jan 20, 2020
4905106
Merge branch 'master' into master
Gurkoel Jan 30, 2020
4a9ada6
Update MethHelper.lua
Gurkoel Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 85 additions & 32 deletions lua/MethHelper.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ ingredient_dialog['Play_loc_mex_cook_03'] = 'Muriatic Acid'
ingredient_dialog['Play_loc_mex_cook_04'] = 'Caustic Soda'
ingredient_dialog['Play_loc_mex_cook_05'] = 'Hydrogen Chloride'
-- Round about hacky way to trigger by both ingredients and recipe state dialogue

local batchFinishedDialog = {"pln_rat_stage1_28","pln_rt1_28","Play_loc_mex_cook_17","Play_loc_mex_cook_13"}

ingredient_dialog[RatsFinishedID] = true
ingredient_dialog[RatsAddedID] = true
ingredient_dialog[CookoffFinishedID] = true
Expand All @@ -103,8 +106,64 @@ currentRecipeList['Muriatic Acid'] = false
currentRecipeList['Caustic Soda'] = false
currentRecipeList['Hydrogen Chloride'] = false

IngredientCount = 0
OldIngredientCount = 0

local lastAdded = false
local IngredientCount = 0
local OldIngredientCount = 0

function sendMethMessage(number, id)
Copy link
Owner

@mluzarow mluzarow Mar 11, 2020

Choose a reason for hiding this comment

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

Can we clean this up slightly so it has less repetition?

    MessageColor = Color.green;

    if number == 1 then
        Message =  'Ingredient added!';
    elseif number == 2 then
        Message = '[' .. countAddedIngredients(currentRecipeList) .. '/3] [' .. ingredient_dialog[id] .. ']';    
    elseif number == 3 then
        Message = 'Total bags: [' .. totalBags .. ']';
    elseif number == 4 then
        Message = 'No finished dialouge caught, Bag-count is being guessed by now';
        MessageColor = Color.red;
    else
        return;
    end

    if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
            managers.chat:_receive_message(1, '[SilentMethMagic]', Message, MessageColor);
    else
            managers.chat:send_message(1, '[SilentMethMagic]',Message, MessageColor);
    end

(I feel like thats easier to understand)

if number == 1 then
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', 'Ingredient added!', Color.green)
else
managers.chat:send_message(1, '[SilentMethMagic]', 'Ingredient added!', Color.green)
end
elseif number == 2 then
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', '[' .. countAddedIngredients(currentRecipeList) .. '/3] [' .. ingredient_dialog[id] .. ']', Color.green)
else
managers.chat:send_message(1, '[SilentMethMagic]', '[' .. countAddedIngredients(currentRecipeList) .. '/3] [' .. ingredient_dialog[id] .. ']', Color.green)
end
elseif number == 3 then
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', 'Total bags: [' .. totalBags .. ']', Color.green)
else
managers.chat:send_message(1, '[SilentMethMagic]', 'Total bags: [' .. totalBags .. ']', Color.green)
end
elseif number == 4 then
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', 'No finished dialouge caught, Bag-count is being guessed by now', Color.red)
else
managers.chat:send_message(1, '[SilentMethMagic]', 'No finished dialouge caught, Bag-count is being guessed by now', Color.red)
end
end
end

function isMethFinished(id)
for i, v in pairs(batchFinishedDialog) do
if v == id then
return true
end
end
end

function isIngredient(id)
for i,v in pairs(ingredient_dialog) do
if v == 'Muriatic Acid' or v == 'Caustic Soda' or v == 'Hydrogen Chloride' then
return true
end
end
end


function getTotalIngredients(Table)
local ingredients = 0
for k, v in pairs(Table) do
ingredients = ingredients + 1
end
return ingredients
end


function countAddedIngredients(Table)
local count = 0
Expand All @@ -123,60 +182,54 @@ function DialogManager:queue_dialog(id, ...)
-- If dialogue code is found in dict
if ingredient_dialog[id] and MethHelper._data.active_toggle == true or MethHelper._data.active_toggle == 'on' then
-- If "batch finished" dialogue is played
if id == CookoffFinishedID or id == RatsFinishedID or id == BorderCrystalFinsishedID or id == BorderCrystalFinsishedID2 then
-- If "ingredient added" dialogue is played
if isMethFinished(id) == true then
-- If "BAg finished" dialogue is played
Copy link
Owner

@mluzarow mluzarow Mar 11, 2020

Choose a reason for hiding this comment

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

Bonus capital letter.

OldIngredientCount = 0
totalBags = totalBags + 1
-- Reset recipe state
currentRecipeList['Muriatic Acid'] = false
currentRecipeList['Caustic Soda'] = false
currentRecipeList['Hydrogen Chloride'] = false
lastAdded = false
-- check menu options
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', 'Total bags: [' .. totalBags .. ']', Color.green)
else
managers.chat:send_message(1, '[SilentMethMagic]', 'Total bags: [' .. totalBags .. ']', Color.green)
end
sendMethMessage(3, id) -- Total bags ...
elseif
(id == CookoffAddedID or id == RatsAddedID or id == BorderCrystalAddedID) and ((currentRecipeList['Muriatic Acid'] == true and currentRecipeList['Caustic Soda'] == true and currentRecipeList['Hydrogen Chloride'] == true) == false) and
((currentRecipeList['Muriatic Acid'] == false and currentRecipeList['Caustic Soda'] == false and currentRecipeList['Hydrogen Chloride'] == false) == false)
then
IngredientCount = countAddedIngredients(currentRecipeList)
if IngredientCount > OldIngredientCount then
OldIngredientCount = IngredientCount
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', 'Ingredient added!', Color.green)
else
managers.chat:send_message(1, '[SilentMethMagic]', 'Ingredient added!', Color.green)
end
end
elseif (id == CookoffAddedID or id == RatsAddedID or id == BorderCrystalAddedID) and countAddedIngredients(currentRecipeList) == 3 then
-- Else ID is for ingredient
-- Dialouge is a Meth-related dialouge and it's neither 0 nor a higher than 3
(id == CookoffAddedID or id == RatsAddedID or id == BorderCrystalAddedID) and countAddedIngredients(currentRecipeList) > 0 and countAddedIngredients(currentRecipeList) <= getTotalIngredients(currentRecipeList) then
IngredientCount = countAddedIngredients(currentRecipeList)
if IngredientCount > OldIngredientCount then
OldIngredientCount = IngredientCount
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', 'Ingredient added!', Color.green)
sendMethMessage(1, id) -- Ingredient Added
if IngredientCount == getTotalIngredients(currentRecipeList) then
lastAdded = true
else
managers.chat:send_message(1, '[SilentMethMagic]', 'Ingredient added!', Color.green)
lastAdded = false
end
end
--check if Bag finished dialog wasn't played this happens i.E in cook off after bag 8!
elseif isIngredient(id) and lastAdded == true and countAddedIngredients(currentRecipeList) == getTotalIngredients(currentRecipeList) then
sendMethMessage(4, id) --something went wrong warn player about bag count
OldIngredientCount = 0
totalBags = totalBags + 1
-- Reset recipe state because finished dialouge will not be played anymore
currentRecipeList['Muriatic Acid'] = false
currentRecipeList['Caustic Soda'] = false
currentRecipeList['Hydrogen Chloride'] = false
lastAdded = false
sendMethMessage(3, id) -- guessed total bags
sendMethMessage(2, id) -- needed Ingredient
else
-- Check to make sure that the ingredient is not already being echoed
if currentRecipeList[ingredient_dialog[id]] == false then
-- Flip the flag
currentRecipeList[ingredient_dialog[id]] = true

-- Print text
if MethHelper._data.silent_toggle == true or MethHelper._data.silent_toggle == 'on' then
managers.chat:_receive_message(1, '[SilentMethMagic]', '[' .. countAddedIngredients(currentRecipeList) .. '/3] [' .. ingredient_dialog[id] .. ']', Color.green)
else
managers.chat:send_message(1, '[SilentMethMagic]', '[' .. countAddedIngredients(currentRecipeList) .. '/3] [' .. ingredient_dialog[id] .. ']', Color.green)
end
sendMethMessage(2, id) --Ingredient is ....
end
end
end
-- for event mapping

-- log("DialogManager: said " .. tostring(id))
-- managers.chat:send_message(ChatManager.GAME, managers.network.account:username() or "Offline", id)

Expand Down
6 changes: 3 additions & 3 deletions mod.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name" : "MethHelper",
"description": "Prints out information regarding recipe requirements during Hotline Miami day 1, Bomb Dockyard, Rats day 1 and Cook Off.",
"author" : "Keys",
"contact" : "http://steamcommunity.com/id/ilikekeys/",
"version" : "1.00",
"author" : "Keys, Gurkoel",
"contact" : "http://steamcommunity.com/id/ilikekeys/, http://steamcommunity.com/id/Gurkoel/",
"version" : "1.2",
"blt_version" : "2",
"updates" :
[
Expand Down