version bump (#1312)

- fix podwojny spec barba - wspinanie sie na otwarte bramy prawidlowo cofnie pozycje - /postepy2+ [id] [ile] dodane - leczenie magikow + tasak dodane jako prefix
tjurczyk · Mar 31, 2022 · 204d9f6 · 204d9f6
1 parent 356fac7
commit 204d9f6
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 18 deletions.
diff --git a/Arkadia.xml b/Arkadia.xml
@@ -5591,8 +5591,12 @@ trigger_func_skrypty_inventory_equipment_zagladanie_depozyt()</script>
 								<mSoundFile></mSoundFile>
 								<colorTriggerFgColor>#000000</colorTriggerFgColor>
 								<colorTriggerBgColor>#000000</colorTriggerBgColor>
-								<regexCodeList />
-								<regexCodePropertyList />
+								<regexCodeList>
+									<string>return scripts.gags:is_type("combat.avatar")</string>
+								</regexCodeList>
+								<regexCodePropertyList>
+									<integer>4</integer>
+								</regexCodePropertyList>
 								<TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
 									<name>str</name>
 									<script></script>
@@ -25466,6 +25470,26 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
 						</regexCodePropertyList>
 					</Trigger>
 				</TriggerGroup>
+				<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
+					<name>blocker_exprimental</name>
+					<script>trigger_func_mapper_blockers_experimental_only()</script>
+					<triggerType>0</triggerType>
+					<conditonLineDelta>0</conditonLineDelta>
+					<mStayOpen>0</mStayOpen>
+					<mCommand></mCommand>
+					<packageName></packageName>
+					<mFgColor>#ff0000</mFgColor>
+					<mBgColor>#ffff00</mBgColor>
+					<mSoundFile></mSoundFile>
+					<colorTriggerFgColor>#000000</colorTriggerFgColor>
+					<colorTriggerBgColor>#000000</colorTriggerBgColor>
+					<regexCodeList>
+						<string>Przeciez brama jest otwarta!</string>
+					</regexCodeList>
+					<regexCodePropertyList>
+						<integer>2</integer>
+					</regexCodePropertyList>
+				</Trigger>
 			</TriggerGroup>
 			<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
 				<name>jedziesz-wozem</name>
@@ -26801,7 +26825,7 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
 						<script>alias_func_skrypty_misc_postepy_postepy2__val()</script>
 						<command></command>
 						<packageName></packageName>
-						<regex>^/postepy2\+ ([0-9]+)$</regex>
+						<regex>^/postepy2\+ ([0-9]+)(?: ([\d+]))?$</regex>
 					</Alias>
 					<Alias isActive="yes" isFolder="no">
 						<name>postepy2-</name>

diff --git a/skrypty.lua b/skrypty.lua
@@ -1,4 +1,4 @@
-scripts = scripts or { ver = "4.61" }
+scripts = scripts or { ver = "4.62" }
 scripts.event_handlers = scripts.event_handlers or {}
 
 function alias_func_skrypty_help()

diff --git a/skrypty/help.lua b/skrypty/help.lua
@@ -44,6 +44,7 @@ function scripts:print_help()
     cecho("| <light_slate_blue>/postepy2+<grey> - dodaje jeden postep do globalnego licznika.                       |\n")
     cecho("| <light_slate_blue>/postepy2+ [ile]<grey> - dodaje <light_slate_blue>[ile]<grey> postepow do globalnego licznika.               |\n")
     cecho("| np <light_slate_blue>/postepy2+ 4<grey> doda 4 postepy. Musi to byc liczba mniejsza badz rowna 15!     |\n")
+    cecho("| <light_slate_blue>/postepy2+ [id] [ile]<grey> - dodaje <light_slate_blue>[ile]<grey> postepow z globalnego licznika o <light_slate_blue>[id]<grey>.    |\n")
     cecho("| <light_slate_blue>/postepy2- [id]<grey> - usuwa wpis z globalnego licznika o tym <light_slate_blue>[id]<grey>. id mozna        |\n")
     cecho("| znalezc jako pierwsza kolumna od lewej w <light_slate_blue>/postepy2<grey>.                            |\n")
     cecho("| <light_slate_blue>/postepy2- [id] [ile]<grey> - odejmuje <light_slate_blue>[ile]<grey> postepow z globalnego licznika o <light_slate_blue>[id]<grey>.  |\n")

diff --git a/skrypty/inventory/magic-weapons.lua b/skrypty/inventory/magic-weapons.lua
@@ -1,21 +1,29 @@
+local function magic_prefix(text)
+    text = string.format("[ %s ] ", text)
+    prefix(text)
+    if selectString(text, 1) > -1 then
+        fg("orange")
+    end
+    resetFormat()
+end
+
 function trigger_func_skrypty_inventory_magic_weapons_widelec_leczy()
-    cecho("<orange>\n Widelec leczy\n")
+    magic_prefix("HP+")
 end
 
 function trigger_func_skrypty_inventory_magic_weapons_amu_leczy()
-    cecho("<orange>\n Amulet leczy\n")
+    magic_prefix("HP+")
 end
 
 function trigger_func_skrypty_inventory_magic_weapons_tasak_dziala()
-    resetFormat()
-    cecho("<orange>\n Tasak dziala\n")
+    magic_prefix("Tasak")
 end
 
 function trigger_func_skrypty_inventory_magic_weapons_gadacz_leczy()
-    cecho("<orange>\n Gadacz leczy\n")
+    magic_prefix("HP+")
 end
 
 function trigger_func_skrypty_inventory_magic_weapons_plaszcz_leczy()
-    cecho("<orange>\n Plaszcz leczy\n")
+    magic_prefix("HP+")
 end
 
diff --git a/skrypty/misc/improve/improve2.lua b/skrypty/misc/improve/improve2.lua
@@ -1,22 +1,32 @@
 
 
-function misc.improve:add_improvee2(val)
+function misc.improve:add_improvee2(val, id)
     if not scripts.character_name then
         scripts:print_log("Korzystanie z globalnej bazy postepow po ustawieniu 'scripts.character_name' w configu")
         return
     end
 
+    local entry
+
     local hour = getTime(true, "hh:mm:ss")
     local year = getTime(true, "yyyy")
     local month = getTime(true, "MM")
     local day = getTime(true, "dd")
 
-    local entry = db:fetch(misc.improve.db_improvee.improvee, {
-        db:eq(misc.improve.db_improvee.improvee.year, year),
-        db:eq(misc.improve.db_improvee.improvee.month, month),
-        db:eq(misc.improve.db_improvee.improvee.day, day),
-        db:eq(misc.improve.db_improvee.improvee.character, scripts.character_name)
-    })
+    display(id)
+
+    if not id then
+        entry = db:fetch(misc.improve.db_improvee.improvee, {
+            db:eq(misc.improve.db_improvee.improvee.year, year),
+            db:eq(misc.improve.db_improvee.improvee.month, month),
+            db:eq(misc.improve.db_improvee.improvee.day, day),
+            db:eq(misc.improve.db_improvee.improvee.character, scripts.character_name)
+        })
+    else 
+        local sql_query = "SELECT * FROM improvee WHERE character=\"" .. scripts.character_name ..
+        "\" AND _row_id=\"" .. id .. "\" ORDER BY _row_id ASC"
+        entry = db:fetch_sql(misc.improve.db_improvee.improvee, sql_query)
+    end
 
     local ret = true
 

diff --git a/skrypty/misc/postepy.lua b/skrypty/misc/postepy.lua
@@ -23,7 +23,11 @@ function alias_func_skrypty_misc_postepy_postepy2_plus()
 end
 
 function alias_func_skrypty_misc_postepy_postepy2__val()
-    misc.improve:add_improvee2(tonumber(matches[2]))
+    if matches[3] then
+        misc.improve:add_improvee2(tonumber(matches[3]), tonumber(matches[2]))
+    else
+        misc.improve:add_improvee2(tonumber(matches[2]))
+    end
 end
 
 function alias_func_skrypty_misc_postepy_postepy2_minus()

diff --git a/skrypty/ui/gags/gags.lua b/skrypty/ui/gags/gags.lua
@@ -13,6 +13,10 @@ function scripts.gags:is_combat()
     return gmcp and gmcp.gmcp_msgs and table.index_of(combat_types, gmcp.gmcp_msgs.type)
 end
 
+function scripts.gags:is_type(type)
+    return gmcp and gmcp.gmcp_msgs and gmcp.gmcp_msgs.type == type
+end
+
 function scripts.gags:gag(power, total_power, kind)
     self:gag_prefix(string.format("%d/%d", power, total_power), kind)
 end