Skip to content

Commit

Permalink
Dodanie definicji srodkow transportu (#1069)
Browse files Browse the repository at this point in the history
* poczatkowe zmiany

* logika bazujaca na dowolnej definicji

* ride corrections

* definicje do plikow json
obsluga dylizansow
drobne poprawki

* kolejne definicje i poprawki

* czasy varieno-campo

* korekty + dodanie transportow

* dodanie bindu "lokacyjnego" na statki i dylizanse

* komenda wsiadania do wozu

* labels

* styl dla paska statkow

* correct default style

* dodanie localizera dla promu temeria
definicja promu temerskie
drobne poprawki

* use numeric transport location

* arkadia typo correction

* definicja wozu wyzima oxen
  • Loading branch information
Delwing authored Aug 15, 2021
1 parent 99d756c commit 694dbdb
Show file tree
Hide file tree
Showing 44 changed files with 1,514 additions and 56 deletions.
102 changes: 52 additions & 50 deletions Arkadia.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,7 @@
<string>Nieduza rzeczna barka</string>
<string>Wielka galera</string>
<string>Niewielki dwumasztowy statek</string>
<string>Dluga niezgrabna barka</string>
</regexCodeList>
<regexCodePropertyList>
<integer>1</integer>
Expand All @@ -1622,6 +1623,7 @@
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
</regexCodePropertyList>
</Trigger>
</TriggerGroup>
Expand Down Expand Up @@ -22219,7 +22221,7 @@
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Doplynelismy do przystani w Kreutzhoffen! Mozna wysiadac!</string>
<string>Doplynelismy do przystani w Kreutzhofen! Mozna wysiadac!</string>
</regexCodeList>
<regexCodePropertyList>
<integer>0</integer>
Expand Down Expand Up @@ -23637,7 +23639,7 @@
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Doplynelismy do przystani w Kreutzhoffen! Mozna wysiadac!</string>
<string>Doplynelismy do przystani w Kreutzhofen! Mozna wysiadac!</string>
</regexCodeList>
<regexCodePropertyList>
<integer>0</integer>
Expand Down Expand Up @@ -23824,49 +23826,11 @@
</regexCodePropertyList>
</Trigger>
</TriggerGroup>
</Trigger>
<TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>piana-temeria</name>
<script></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 />
<regexCodePropertyList />
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="yes" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>gps-temeria</name>
<script>trigger_func_mapper_localizers_ships_buses_piana_temeria_gps_temeria()</script>
<triggerType>0</triggerType>
<conditonLineDelta>1</conditonLineDelta>
<mStayOpen>0</mStayOpen>
<mCommand></mCommand>
<packageName></packageName>
<mFgColor>#ff0000</mFgColor>
<mBgColor>#ffff00</mBgColor>
<mSoundFile></mSoundFile>
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Droga za poludniowym mostem.</string>
<string>Jest tutaj jedno widoczne wyjscie: poludniowy-zachod.</string>
</regexCodeList>
<regexCodePropertyList>
<integer>3</integer>
<integer>3</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">
<name>gps-piana</name>
<script>trigger_func_mapper_localizers_ships_buses_piana_temeria_gps_piana()</script>
<TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>piana-temeria</name>
<script></script>
<triggerType>0</triggerType>
<conditonLineDelta>1</conditonLineDelta>
<conditonLineDelta>0</conditonLineDelta>
<mStayOpen>0</mStayOpen>
<mCommand></mCommand>
<packageName></packageName>
Expand All @@ -23876,15 +23840,53 @@
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Przystan promowa.</string>
<string>Jest tutaj jedno widoczne wyjscie: polnocny-wschod.</string>
<string>^(?:Mlody silny mezczyzna|Gmeath) krzyczy: (.*)</string>
</regexCodeList>
<regexCodePropertyList>
<integer>3</integer>
<integer>3</integer>
<integer>1</integer>
</regexCodePropertyList>
</Trigger>
</TriggerGroup>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="yes" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>gps-temeria</name>
<script>trigger_func_mapper_localizers_ships_buses_piana_temeria_gps_temeria()</script>
<triggerType>0</triggerType>
<conditonLineDelta>1</conditonLineDelta>
<mStayOpen>0</mStayOpen>
<mCommand></mCommand>
<packageName></packageName>
<mFgColor>#ff0000</mFgColor>
<mBgColor>#ffff00</mBgColor>
<mSoundFile></mSoundFile>
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Doplynelismy do przystani na poludniowym brzegu Pontaru! Mozna wysiadac!</string>
</regexCodeList>
<regexCodePropertyList>
<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">
<name>gps-piana</name>
<script>trigger_func_mapper_localizers_ships_buses_piana_temeria_gps_piana()</script>
<triggerType>0</triggerType>
<conditonLineDelta>1</conditonLineDelta>
<mStayOpen>0</mStayOpen>
<mCommand></mCommand>
<packageName></packageName>
<mFgColor>#ff0000</mFgColor>
<mBgColor>#ffff00</mBgColor>
<mSoundFile></mSoundFile>
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>Doplynelismy do przystani na polnocnym brzegu Pontaru! Mozna wysiadac!</string>
</regexCodeList>
<regexCodePropertyList>
<integer>0</integer>
</regexCodePropertyList>
</Trigger>
</TriggerGroup>
</Trigger>
<TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>urbimo-novigrad</name>
<script></script>
Expand Down
11 changes: 11 additions & 0 deletions events.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,17 @@ Argumenty:

---

## `travelDestinationReached`

Event podniesiony kiedy srodek transportu dotrze do przystanku.

Argumenty:
* `arg1`: definicja przystanku
* `arg2`: definicja transportu
* `arg3`: obiekt podrozy

---

## `ateamAttackingDifferentTarget`

Event ten jest podniesiony w momencie, kiedy postac atakuje innego przeciwnika niz aktualny cel ataku.
Expand Down
4 changes: 4 additions & 0 deletions mapper/events/custom-events/binds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ function amap_db_check_bind()
end

function amap.db:execute_bind()
if scripts.transports.transport_bind then
misc:run_separeted_command(scripts.transports.transport_bind)
return
end
if not amap.curr.id or getRoomUserData(amap.curr.id, "bind") == "" then
return
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ end
function trigger_func_mapper_localizers_ships_buses_ships_novigrad_bodrog_scala_gps_scala()
amap:print_log("GPS: Scala", true)
amap:set_position(927, true)
end

end
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ function trigger_func_mapper_localizers_ships_buses_ships_novigrad_oxenfurt_bial
amap:print_log("GPS: Bialy Most", true)
amap:set_position(2212, true)
end

3 changes: 0 additions & 3 deletions mapper/localizers/ships_buses/ships/parravon-bretonia.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
function trigger_func_mapper_localizers_ships_buses_ships_parravon_bretonia_gps_parravon()
amap:print_log("GPS: Parravon", true)
amap:set_position(7732, true)

--Doplynelismy do polnocnego brzegu Grismerie!
--Doplynelismy do poludniowego brzegu Grismerie!
end

function trigger_func_mapper_localizers_ships_buses_ships_parravon_bretonia_gps_bretonia()
Expand Down
3 changes: 3 additions & 0 deletions scriptsList.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ return {
"mapper/area",
"mapper/dirs",
"mapper/db",
"skrypty/ui/gauges",
"skrypty/team/core",
"skrypty/team/bind_functions",
"skrypty/team/gmcp_handler_data",
Expand Down Expand Up @@ -142,6 +143,8 @@ return {
"skrypty/misc/misc_on_exit_dump",
"skrypty/misc/misc_load_dump",
"skrypty/misc/compare_with_everyone",
"skrypty/transport/transports",
"skrypty/transport/ride",
"skrypty/utils/colors",
"skrypty/utils/list",
"skrypty/utils/sounds",
Expand Down
5 changes: 5 additions & 0 deletions skrypty/logger.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ function scripts:print_url(formatted_msg, func_name, tooltip)
cechoLink(formatted_msg, func_name .. "()", tooltip, true)
end

function scripts:debug_log(msg, new_line)
if scripts.debug then
self:print_log(msg, new_line)
end
end
54 changes: 54 additions & 0 deletions skrypty/transport/definitions/other/Jouinard - Nuln.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"enter": "Oplacasz podroz u woznicy i wsiadasz do ciemnego stojacego dylizansu.",
"start": "Drzwiczki sie zamykaja, drzenie przebiega przez caly pojazd, ktory powoli rusza.",
"exit_command": "wyjscie",
"bind": "wyjrzyj przez okno",
"stops": [
{
"start": 7640,
"destination": 7550,
"time": 42,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, rynek przy fontannie\\.$",
"label" : "Bogenhafen"
},
{
"start": 7550,
"destination": 7458,
"time": 27,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, przed zajazdem 'Pod Srebrnym Grotem'\\.$",
"set_pattern": "^Woznica.* wola: Nastepny postoj - Zajazd 'Pod Srebrnym Grotem'!$",
"label" : " Zajazd 'Pod Srebrnym Grotem'"
},
{
"start": 7458,
"destination": 7332,
"time": 37,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, ulica Bramna\\.$",
"label" : "Nuln"
},
{
"start": 7332,
"destination": 7458,
"time": 37,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, przed zajazdem 'Pod Srebrnym Grotem'\\.$",
"set_pattern": "^Woznica.* wola: Nastepny postoj - Zajazd 'Pod Srebrnym Grotem'!$",
"label" : "Zajazd 'Pod Srebrnym Grotem'"
},
{
"start": 7458,
"destination": 7550,
"time": 27,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, rynek przy fontannie\\.$",
"set_pattern": "^Woznica.* wola: Nastepny postoj - Bogenhafen!$",
"label" : "Bogenhafen"
},
{
"start": 7550,
"destination": 7640,
"time": 41,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, placyk z fontanna\\.$",
"set_pattern": "^Woznica.* wola: Nastepny postoj - Jouinard!$",
"label" : "Jouinard"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"enter": "Oplacasz podroz u woznicy i wsiadasz do czarnego stojacego dylizansu.",
"start": "Drzwiczki sie zamykaja, drzenie przebiega przez caly pojazd, ktory powoli rusza.",
"exit_command": "wyjscie",
"bind": "wyjrzyj przez okno",
"stops": [
{
"start": 6727,
"destination": 6571,
"time": 19,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, rozstaje przed zajazdem\\.",
"label": "Karczma 'Czarny Kon'"
},
{
"start": 6571,
"destination": 6779,
"time": 17,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, trakt przez wioske\\.",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Nuln!$",
"label": "Blutdorf"
},
{
"start": 6779,
"destination": 7256,
"time": 27,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, placyk w polnocnej czesci miasta\\.",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Nuln!$",
"label": "Nuln"
},
{
"start": 7256,
"destination": 6779,
"time": 27,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, trakt przez wioske\\.",
"label": "Blutdorf"
},
{
"start": 6779,
"destination": 6571,
"time": 17,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, rozstaje przed zajazdem\\.",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Krainy Zgromadzenia!$",
"label": "Karczma 'Czarny Kon'"
},
{
"start": 6571,
"destination": 6727,
"time": 19,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, dziedziniec frontowy karczmy\\.",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Krainy Zgromadzenia!$",
"label": "Kraina Zgromadzenia"
}
]
}
54 changes: 54 additions & 0 deletions skrypty/transport/definitions/other/Maribor - Grabowa Buchta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"enter": "Oplacasz podroz u woznicy i wsiadasz do drewnianego stojacego wozu.",
"exit_command": "wyjscie",
"start": "Woznica donosnym glosem oznajmia odjazd.",
"bind": "wyjrzyj na zewnatrz",
"stops": [
{
"start": 3525,
"destination": 3457,
"time": 22,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, centralny plac wioski\\.$",
"label": "Kocie Pole"
},
{
"start": 3457,
"destination": 3343,
"time": 38,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, na dziedzincu zajazdu\\.$",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Mariboru!$",
"label": "Zajazd u Marfa"
},
{
"start": 3343,
"destination": 180,
"time": 43,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, przystan powozowa\\.$",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Mariboru!$",
"label": "Maribor"
},
{
"start": 180,
"destination": 3343,
"time": 42,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, na dziedzincu zajazdu\\.$",
"label": "Zajazd u Marfa"
},
{
"start": 3343,
"destination": 3457,
"time": 38,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, centralny plac wioski\\.$",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Grabowej Buchty!$",
"label": "Kocie Pole"
},
{
"start": 3457,
"destination": 3525,
"time": 21,
"stop_pattern": "^Z zewnatrz dochodzi stlumiony glos woznicy: Postoj, placyk w Grabowej Buchcie\\.$",
"set_pattern": "^Woznica.*wola: Za chwile ruszamy w kierunku Grabowej Buchty!$",
"label": "Grabowa Buchta"
}
]
}
Loading

0 comments on commit 694dbdb

Please sign in to comment.