Poprawki regexp, przeniesienie granita do items, dodanie stuna do jat… (

#1621) * Poprawki regexp, przeniesienie granita do items, dodanie stuna do jatagana, zapamietanie przedstawionych * Poprawka stunow
tjurczyk · Nov 1, 2024 · ee2219a · ee2219a
1 parent 6872b89
commit ee2219a
Show file tree

Hide file tree

Showing 8 changed files with 155 additions and 95 deletions.
diff --git a/Arkadia.xml b/Arkadia.xml
diff --git a/skrypty/misc/counter/utils.lua b/skrypty/misc/counter/utils.lua
@@ -10,6 +10,7 @@ misc.counter.utils.two_word_mobs = {
     "lodowego trolla",
     "pajaka sieciarza",
     "pomiot chaosu",
+    "rumaka bojowego",
     "rycerza chaosu",
     "smoczego ogra",
     "smoka chaosu",

diff --git a/skrypty/people/introduced.lua b/skrypty/people/introduced.lua
@@ -34,6 +34,9 @@ end
 
 function scripts.people.introduced:process_introduced(matches)
     local people = string.split(matches[2]:gsub(" i ", ", "), ", ")
+    local key = "przedstawieni." .. scripts.character_name
+    self.previous_introduced = scripts.state_store:get(key)
+    scripts.state_store:set(key, people)
     for k, name in pairs(people) do
         if not table.contains(self.introduced, name) then
             if selectString(name, 1) > -1 then

diff --git a/skrypty/ui/gags/color/color_innych_spece/sprzet.lua b/skrypty/ui/gags/color/color_innych_spece/sprzet.lua
@@ -1,7 +1,7 @@
 
 function trigger_func_skrypty_ui_gags_color_color_innych_spece_zbroje_blekitno_srebrna_trojkatna_tarcza()
     scripts.gags:gag_prefix("TARCZA SPEC", "innych_spece")
-    ateam:may_setup_paralyzed_name(matches[2])
+    ateam:may_setup_paralyzed_name(matches["target"])
 end
 
 function trigger_func_skrypty_ui_gags_color_color_innych_spece_zbroje_lsniaca_plomienista_tarcza()
@@ -10,9 +10,15 @@ end
 
 function trigger_func_skrypty_ui_gags_color_color_innych_spece_zbroje_ciemnogranatowy_smukly_helm()
     scripts.gags:gag_prefix("HELM SPEC", "innych_spece")
+    ateam:may_setup_paralyzed_name(matches["target"])
 end
 
-function trigger_func_skrypty_ui_gags_color_color_innych_spece_bar_ktos_granit()
+function trigger_func_skrypty_ui_gags_color_color_innych_spece_bronie_gigantyczny_granitowy_mlot()
     scripts.gags:gag_prefix("GRA OGL", "innych_spece")
     ateam:may_setup_paralyzed_name(matches["target"])
-end
+end
+
+function trigger_func_skrypty_ui_gags_color_color_innych_spece_bronie_jasniejacy_zdobiony_jatagan()
+    scripts.gags:gag_prefix("JATAGAN OGL", "innych_spece")
+    ateam:may_setup_paralyzed_name(matches["target"])
+end
diff --git a/skrypty/ui/gags/color/color_moje_ciosy/niestandardowe_topory.lua b/skrypty/ui/gags/color/color_moje_ciosy/niestandardowe_topory.lua
@@ -8,8 +8,8 @@ function trigger_func_skrypty_ui_gags_ciosy_obosieczny_gwiezdny_topor()
     local dmg = matches["damage"]
     local value = -1
         if dmg == "tnie plytko" then value = 1
-    elseif dmg == "tnie gladko" then value = 2
-    elseif dmg == "tnie lekko" then value = 3
+    elseif dmg == "tnie lekko" then value = 2
+    elseif dmg == "tnie gladko" then value = 3
     elseif dmg == "tnie szeroko" then value = 4
     elseif dmg == "tnie gleboko" then value = 5
     elseif dmg == "niemal przecina w pol" then value = 6

diff --git a/skrypty/ui/gags/color/color_moje_spece/bar.lua b/skrypty/ui/gags/color/color_moje_spece/bar.lua
@@ -26,11 +26,6 @@ function trigger_func_skrypty_ui_gags_color_color_moje_spece_bar_ja_fin()
     scripts.gags:gag_prefix("JA "..scripts.gags.fin_prefix, "moje_spece")
 end
 
-function trigger_func_skrypty_ui_gags_color_color_moje_spece_bar_ja_granit()
-    scripts.gags:gag_prefix("GRA OGL", "moje_spece")
-    ateam:may_setup_paralyzed_name(matches["target"])
-end
-
 function trigger_func_skrypty_ui_gags_color_color_moje_spece_bar_ja_spec_ja_ogluch()
     scripts.gags:gag_own_spec("OGL")
     ateam:may_setup_paralyzed_name(matches["target"])

diff --git a/skrypty/ui/gags/color/color_moje_spece/sprzet.lua b/skrypty/ui/gags/color/color_moje_spece/sprzet.lua
@@ -9,9 +9,20 @@ function trigger_func_skrypty_ui_gags_color_color_moje_spece_zbroje_lsniaca_plom
 end
 
 function trigger_func_skrypty_ui_gags_color_color_moje_spece_zbroje_ciemnogranatowy_smukly_helm()
+    ateam:may_setup_paralyzed_name(matches["target"])
     scripts.gags:gag_prefix("HELM SPEC", "moje_spece")
 end
 
 function trigger_func_skrypty_ui_gags_color_color_moje_spece_bron_truje()
     scripts.gags:gag_prefix("BRON TRUJE", "moje_spece")
-end
+end
+
+function trigger_func_skrypty_ui_gags_color_color_moje_spece_bronie_gigantyczny_granitowy_mlot()
+    scripts.gags:gag_prefix("GRA OGL", "moje_spece")
+    ateam:may_setup_paralyzed_name(matches["target"])
+end
+
+function trigger_func_skrypty_ui_gags_color_color_moje_spece_bronie_jasniejacy_zdobiony_jatagan()
+    scripts.gags:gag_prefix("JATAGAN OGL", "moje_spece")
+    ateam:may_setup_paralyzed_name(matches["target"])
+end
diff --git a/skrypty/utils/string.lua b/skrypty/utils/string.lua
@@ -2,6 +2,10 @@ function string.starts(String, Start)
     return string.sub(String, 1, string.len(Start)) == Start
 end
 
+function string.endswith(str, ending)
+    return str:sub(-#ending) == ending
+end
+
 function trim_string(str)
     return str:match("^%s*(.-)%s*$")
 end