Skip to content

Commit

Permalink
Feat(update): 2025-02-21 conflict update (#224)
Browse files Browse the repository at this point in the history
Conflict was a simple matter of Avgi updates upstream confusing github with my additions of slots making it think there was a conflict.
  • Loading branch information
Zitchas authored Feb 21, 2025
2 parents c2e6331 + f2e451e commit bd2260f
Show file tree
Hide file tree
Showing 29 changed files with 583 additions and 948 deletions.
1 change: 0 additions & 1 deletion .codespell.exclude
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"do gud" # [do|does] good (mispronounced)
"a's no gud" # is no good (mispronounced)
"ain' gud" # ain't good (mispronounced)
"do gud" # [do|does] good (mispronounced)
"Korath flame stong." # [The] Korath flame is strong. (mispronounced)
"Can hav" 3 # Can have (mispronounced)
"yoo ded mor" # you dead more (mispronounced)
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,6 @@ jobs:
- name: Parse Integration Test Data
run: "'./Endless Sky.exe' -p --config 'tests/integration/config'"
shell: bash
- name: Parse All Resources
run: "'./Endless Sky.exe' --parse-assets"
shell: bash
47 changes: 29 additions & 18 deletions data/avgi/avgi 0 first contact.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/avgi/avgi culture conversations.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ mission "Avgi Culture: Doomed Korath"
minor
invisible
source
attributes "avgi siege"
attributes "aberrant siege"
to offer
not "avgi: lost in twilight"
random < 3
Expand All @@ -173,7 +173,7 @@ mission "Avgi Culture: General Ripper"
minor
invisible
source
attributes "avgi siege"
attributes "aberrant siege"
to offer
not "avgi: lost in twilight"
random < 3
Expand Down
24 changes: 12 additions & 12 deletions data/avgi/avgi fleets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fleet "Avgi Core Defense"
variant 12
"Refraktos"
variant 12
"Difraktos (Missile)"
"Difraktos (KKV)"
variant 12
"Prismaios" 2
variant 12
Expand All @@ -55,7 +55,7 @@ fleet "Avgi Core Defense"
"Vibratia" 22
"Photikon (Atomic)" 8
"Optikon" 2
"Difraktos (Missile)"
"Difraktos (KKV)"
"Refraktos"
"Prismaios" 2
"Tremoros" 3
Expand Down Expand Up @@ -159,7 +159,7 @@ fleet "Avgi Strike Group"
variant 12
"Difraktos"
variant 12
"Difraktos (Missile)"
"Difraktos (KKV)"
"Refraktos"
variant 3
"Atenuatia"
Expand Down Expand Up @@ -197,7 +197,7 @@ fleet "Avgi Fleetgroup"
"Atenuatia"
"Vibratia" 18
"Photikon" 6
"Difraktos (Missile)"
"Difraktos (KKV)"
"Prismaios"
"Tremoros" 3
variant 6
Expand All @@ -212,7 +212,7 @@ fleet "Avgi Fleetgroup"
"Vibratia" 18
"Photikon" 6
"Difraktos"
"Difraktos (Missile)"
"Difraktos (KKV)"
"Refraktos"
"Prismaios"
"Prismaios (Laserstar)"
Expand Down Expand Up @@ -252,10 +252,10 @@ fleet "Avgi Twilight Guard Logistics"
"Tremoros" 2
variant 12
"Koryfi" 3
"Interferos" 2
"Interferos (KKV)" 2
variant 12
"Avlaki" 3
"Interferos" 2
"Interferos (KKV)" 2
variant 12
"Melodikos"
"Tremoros" 4
Expand Down Expand Up @@ -289,7 +289,7 @@ fleet "Avgi Twilight Guard Logistics"
variant 12
"Undsyni (Tanker)"
"Sonikis (Tanker)" 4
"Interferos"
"Interferos (KKV)"
"Tremoros" 6
variant 12
"Koryfi" 2
Expand All @@ -300,7 +300,7 @@ fleet "Avgi Twilight Guard Logistics"
variant 12
"Harmonikos"
"Melodikos"
"Interferos"
"Interferos (KKV)"
"Prismaios (Laserstar)"
"Tremoros" 6
variant 6
Expand All @@ -309,7 +309,7 @@ fleet "Avgi Twilight Guard Logistics"
"Undsyni (Tanker)"
"Sonikis (Tanker)" 4
"Prismaios (Laserstar)"
"Interferos" 2
"Interferos (KKV)" 2
"Tremoros" 6


Expand Down Expand Up @@ -585,11 +585,11 @@ fleet "Large Dissonance Pirates"
"Entasi"
"Sonikis (Armed)" 6
"Akoustiki" 2
"Interferos"
"Interferos (KKV)"
variant 6
"Undsyni"
"Sonikis (Armed)" 4
variant 3
"Undsyni"
"Sonikis (Armed)" 4
"Interferos"
"Interferos (KKV)"
Loading

0 comments on commit bd2260f

Please sign in to comment.