Skip to content

Commit

Permalink
version bump (#1262)
Browse files Browse the repository at this point in the history 
* pojenie zwierzaka (#1263)

* Rozne poprawki (#1264)

* pojenie zwierzaka

* gp spec pudlo
dodanie kategorii npc_spece
ruiny rinde - woda, lokalizacja

* wbiles/wbilas postepy

* zenska wersja na postepy
bloker w wiatraku

* fix event

* remove not neede trigger

* konfigurowanie komendy do zaslony

* fix missing comma

* dystans w asystencie (#1265)

* Wizualizacja dla dylizansow (#1266)

* wizualizacja trasy transportow

* more often updates

* maribor - fix
rides - visualisation

* remove test feed triggers

* ride progress doc

* korekta kolejnosci triggerow dla tablicy paczek

Co-authored-by: Delwing <Delwing@users.noreply.github.com>
Co-authored-by: Piotr <delwing@gmail.com>
  • Loading branch information
@github-actions @Delwing
3 people authored Jan 12, 2022
1 parent 444c1ca commit 9fbfbe6
Show file tree
Hide file tree
Showing 30 changed files with 219 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_events.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
raise_events.append(variable.group(1))


not_covered = [item for item in raise_events if item not in events and item not in mudlet_events]
not_covered = [item for item in raise_events if item not in events and item not in mudlet_events and not item.startswith("gmcp.")]
if(len(not_covered) > 0):
print("Events not present in events.md")
for name in not_covered:
Expand Down
48 changes: 38 additions & 10 deletions Arkadia.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8715,9 +8715,11 @@ trigger_func_skrypty_inventory_equipment_zagladanie_depozyt()</script>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Wykorzystujac dogodny moment wyprowadzasz</string>
<string>Wykorzystujac dogodny moment probujesz wyprowadzic</string>
</regexCodeList>
<regexCodePropertyList>
<integer>0</integer>
<integer>0</integer>
</regexCodePropertyList>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>ja_spec_0</name>
Expand Down Expand Up @@ -12834,7 +12836,7 @@ trigger_func_skrypty_inventory_equipment_zagladanie_depozyt()</script>
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Wykorzystujac dogodny moment .* wyprowadza </string>
<string>^Wykorzystujac dogodny moment.* (?:wyprowadza|probuje wyprowadzic)\s</string>
</regexCodeList>
<regexCodePropertyList>
<integer>1</integer>
Expand Down Expand Up @@ -15637,12 +15639,12 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<regexCodeList>
<string>Przystan powozowa.</string>
<string>Sa tutaj trzy widoczne wyjscia: polnoc, zachod i wschod.</string>
<string>Otwarty stojacy powoz.</string>
<string>stojacy powoz</string>
</regexCodeList>
<regexCodePropertyList>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
<integer>0</integer>
</regexCodePropertyList>
</Trigger>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="yes" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
Expand All @@ -15661,12 +15663,12 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<regexCodeList>
<string>Przystan powozowa.</string>
<string>Sa tutaj trzy widoczne wyjscia: polnoc, zachod i wschod.</string>
<string>Drewniany stojacy woz.</string>
<string>stojacy woz</string>
</regexCodeList>
<regexCodePropertyList>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
<integer>0</integer>
</regexCodePropertyList>
</Trigger>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
Expand Down Expand Up @@ -20513,8 +20515,30 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<string> Tablica zawiera liste adresatow przesylek, ktore mozesz tutaj pobrac:</string>
</regexCodeList>
<regexCodePropertyList>
<integer>3</integer>
<integer>2</integer>
</regexCodePropertyList>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>terminals</name>
<script>trigger_packages_assistant_replace_terminals()</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>..o$</string>
<string>..\|$</string>
</regexCodeList>
<regexCodePropertyList>
<integer>1</integer>
<integer>1</integer>
</regexCodePropertyList>
</Trigger>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>paczka-tablica</name>
<script>trigger_packages_assistant_package(matches.index, matches.name, matches.city, matches.time)</script>
Expand All @@ -20535,11 +20559,11 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<integer>1</integer>
</regexCodePropertyList>
</Trigger>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="yes" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>tablica-close</name>
<script>trigger_packages_assistant_close()</script>
<triggerType>0</triggerType>
<conditonLineDelta>0</conditonLineDelta>
<conditonLineDelta>2</conditonLineDelta>
<mStayOpen>0</mStayOpen>
<mCommand></mCommand>
<packageName></packageName>
Expand All @@ -20550,9 +20574,11 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string> | Symbolem * oznaczono</string>
<string> o==</string>
</regexCodeList>
<regexCodePropertyList>
<integer>2</integer>
<integer>2</integer>
</regexCodePropertyList>
</Trigger>
</Trigger>
Expand Down Expand Up @@ -21237,8 +21263,8 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Wyschniete jeziorko.</string>
<string>Jest tutaj jedno widoczne wyjscie: poludnie.</string>
<string>Wyciagasz dlon w strone blasku i trafiasz w pustke. Woda rozlewa sie na boki odrzucajac twe cialo na twardepodloze...</string>
<string>Niebo.</string>
</regexCodeList>
<regexCodePropertyList>
<integer>2</integer>
Expand Down Expand Up @@ -25213,6 +25239,7 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<string>Probujesz isc naprzod, ale sliski lod sprawia, ze wywracasz sie na nim.</string>
<string>Probujesz przecisnac sie przez otwor na dach, ale ze wzgledu na brak miejsca,</string>
<string>Probujesz isc w glab korytarza, lecz zwalisty szarawy golem zastepuje ci droge.</string>
<string>Probujesz przecisnac sie przez otwor na dach, ale ze wzgledu na brak miejsca, zmuszony jestes wrocic na dol.</string>
</regexCodeList>
<regexCodePropertyList>
<integer>1</integer>
Expand All @@ -25229,6 +25256,7 @@ trigger_func_skrypty_ui_misc_ptakopodobny_inkantuje()</script>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
<integer>2</integer>
</regexCodePropertyList>
</Trigger>
</TriggerGroup>
Expand Down
19 changes: 19 additions & 0 deletions config.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,7 @@ Ponizej jest opcja co ma byc robione:
"bloki" : 2,
"bron" : 2,
"npc" : 2,
"npc_spece" : 2
}
```

Expand All @@ -1147,6 +1148,7 @@ Ponizej jest opcja co ma byc robione:
## `scripts.gag_colors.zaslony_nieudane`
## `scripts.gag_colors.bron`
## `scripts.gag_colors.npc`
## `scripts.gag_colors.npc_spece`

Opcja kolorow do tagow (czyli tylko kiedy scripts.gag_settings ustawione ne 2)

Expand Down Expand Up @@ -1692,3 +1694,20 @@ Włącza/wyłącza pasek pokazujący orientacyjny czas do dotarcia do celu podcz
Dostępne wartości:
* `true` - pasek będzie widoczny
* `false` - pasek będzie niewidoczny

---

## `amap.water_animal`

Włącza/wyłącza pojenie zwierzęcia razem z piciem wody na lokacji.

Dostępne wartości:
* `true` - pojenie włączone
* `false` - pojenie wyłączone

---

## `ateam.cover_command`

Ustawienie komendy do zaslony, domyslnie jest `zaslon`.

21 changes: 21 additions & 0 deletions config_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1697,6 +1697,15 @@
"_ux"
]
},
{
"name": "scripts.gag_colors.npc_spece",
"default_value": "floral_white",
"field_type": "string",
"content_type" : "mudlet_color",
"macros_on_modify": [
"_ux"
]
},
{
"name": "scripts.gags.own_spec_prefix",
"default_value": "",
Expand Down Expand Up @@ -2886,6 +2895,18 @@
"default_value": true,
"field_type": "boolean",
"macros_on_modify": []
},
{
"name": "amap.water_animal",
"default_value": false,
"field_type": "boolean",
"macros_on_modify": []
},
{
"name": "ateam.cover_command",
"default_value": "zaslon",
"field_type": "string",
"macros_on_modify": []
}
]
}
8 changes: 7 additions & 1 deletion events.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,4 +347,10 @@ Argumenty:
* `arg1`: tablica kreatorow

Event podniesiony po stworzeniu tablicy kreatorow elementow stopki.
Mozn go wykorzystac, zeby zarejestrowac swoj wlasny element.
Mozn go wykorzystac, zeby zarejestrowac swoj wlasny element.

## `rideProgress`

Argument:
* `arg1`: obiekt podrozy
* `arg2`: aktualnie wyliczona lokacja (w przyblizeniu)
1 change: 1 addition & 0 deletions mapper.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ if not amap then
next_dir_bind = nil,
legacy_locate = false,
disable_team_sneak = false,
water_animal = false
}
end

Expand Down
3 changes: 3 additions & 0 deletions mapper/events/custom-events/water.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ end

function amap:drinking_bind()
send("napij sie do syta wody", false)
if amap.water_animal then
send("zwnapoj zwierze")
end
end

registerAnonymousEventHandler("amapNewLocation", "amap_check_drinkable_room_event")
Expand Down
1 change: 0 additions & 1 deletion mapper/localizers/room-gps.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ function trigger_func_mapper_localizers_room_gps_ruiny_rinde_za_krata()
end

function trigger_func_mapper_localizers_room_gps_ruiny_za_nekromanta()
amap:print_log("GPS po nazwie/wyjsciach lokacji: Za woda z nekromanty w Ruinach Rinde", true)
amap:set_position(1925, true)
end

Expand Down
1 change: 1 addition & 0 deletions scriptsList.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ return {
"skrypty/character/core",
"skrypty/character/character_gmcp_updater",
"skrypty/character/combat_state",
"skrypty/character/info",
"skrypty/character/options",
"skrypty/character/profession",
"skrypty/character/titles",
Expand Down
16 changes: 15 additions & 1 deletion skrypty.lua
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scripts = scripts or { ver = "4.48" }
scripts = scripts or { ver = "4.49" }
scripts.event_handlers = scripts.event_handlers or {}

function alias_func_skrypty_help()
Expand All @@ -21,6 +21,20 @@ function alias_func_skrypty_fake()
echo("\n")
end

function alias_func_skrypty_fake_combat()
local s = matches[2]

s = string.gsub(s, "%$", "\n")
gmcp = {
gmcp_msgs = {
text = enc(s .. "\n"),
type = "combat.avatar"
}
}
raiseEvent("gmcp.gmcp_msgs", gmcp)
echo("\n")
end

function alias_func_skrypty_lua_code()
local f, e = loadstring("return " .. matches[2])
if not f then
Expand Down
16 changes: 16 additions & 0 deletions skrypty/character/info.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
scripts.character.info_update = scripts.character.info_update or {}
scripts.character.info = scripts.character.info or {
gender = "male"
}

function scripts.character.info_update:init()
self.handler = scripts.event_register:force_register_event_handler(self.handler, "gmcp.char.info", function()
scripts.character.info = gmcp.char.info
end)
end

function scripts.character:is_male()
return self.info.gender == "male"
end

scripts.character.info_update:init()
2 changes: 1 addition & 1 deletion skrypty/misc/improve/gmcp_handler_improvement.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function gmcp_handler_improvement()
snapshot["time_passed"] = misc.improve:seconds_to_formatted_string(seconds_passed)

table.insert(misc.improve["level_snapshots"], snapshot)
scripts:print_log("[" .. snapshot["time"] .. "] Wlasnie wbiles postepy: " .. misc.improve.levels[improve_level] .. " (czas: " .. snapshot["time_passed"] .. ")")
scripts:print_log(string.format("[%s] Wlasnie %s postepy: %s (czas: %s)", snapshot["time"], scripts.utils.gender_form("wbiles", "wbilas"), misc.improve.levels[improve_level], snapshot["time_passed"]))
misc_on_exit_dump()
end

Expand Down
26 changes: 26 additions & 0 deletions skrypty/packages/assistant.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,18 @@ function scripts.packages:add(index, name, city, time)
fg("spring_green")
resetFormat()
location = assistant_match.room_id
if getPath(amap.curr.id, location) and selectString(" |", 1) then
local distance = table.size(speedWalkPath)
replace(scripts.utils.str_pad(tostring(distance), 8, "right") .. " |")
end
else
location = scripts.people.mail:check_table(name)
end

selectString(name, 1)
local command = "wybierz paczke " .. index
setLink(function() send(command) end, command)

self.current_offer[index] = { name = name, location = location }
if city and city ~= "" then
self.current_offer[index].city = city
Expand Down Expand Up @@ -163,4 +172,21 @@ function trigger_packages_assistant_close()
setTriggerStayOpen("tablice-open", 0)
end

function trigger_packages_assistant_replace_terminals()
selectCaptureGroup(1)
if matches[1] == "==o" then
replace("====================o", true)
elseif matches[1] == " |" then
replace(" |", true)
elseif matches[1] == "- o" then
replace("------------------- o", true)
end

local cursor = selectString("dostarczenie ", 1)
if cursor > -1 then
moveCursor(cursor + 18, getLineNumber())
replace("dostarczenie Dystans", true)
end
end

scripts.packages:init()
3 changes: 2 additions & 1 deletion skrypty/team.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ateam = ateam or {
my_id = nil,
next_team_id = "A",
to_support = nil,
cover_command = nil,
cover_command = "zaslon",
cover_command_click = nil,
is_enemy_on_location = nil,
attack_mode = 3,
clicked_second_defense = false,
Expand Down
Loading

0 comments on commit 9fbfbe6

Please sign in to comment.