Skip to content

Commit

Permalink
Merge pull request #10 from Gitjas/master
Browse files Browse the repository at this point in the history
update to v23
  • Loading branch information
Gitjas authored Dec 18, 2020
2 parents 47fcc8f + ec6b40d commit 38b5ff9
Show file tree
Hide file tree
Showing 43 changed files with 2,732 additions and 1,876 deletions.
45 changes: 45 additions & 0 deletions .github/workflows/InfinityAutoPackager.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Infinity Auto Packager by AL|EN ([email protected])
# A tool that automatically generates Infinity Engine mod packages when you publish a release.

on:
release:
types: [published]
jobs:
InfinityAutoPackager:
runs-on: ubuntu-latest
steps:

- name: Initial setup
run: |
git lfs uninstall
git config --global core.autocrlf false
git config --global core.ignorecase true
- name: Clone repository using 'github.ref' from release
uses: actions/checkout@master

- name: Create Infinity Engine Mod Packages (.iemod and .zip)
uses: ALIENQuake/CreateIEModZipPackage@master
id: CreateIEModZipPackage
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload iemod package to latest release
uses: svenstaro/upload-release-action@v1-release
if: github.ref != 'refs/heads/master'
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ steps.CreateIEModZipPackage.outputs.PackageBaseName }}.iemod
asset_name: ${{ steps.CreateIEModZipPackage.outputs.PackageBaseName }}.iemod
tag: ${{ github.ref }}
overwrite: true

- name: Upload zip package to latest release
uses: svenstaro/upload-release-action@v1-release
if: github.ref != 'refs/heads/master'
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ steps.CreateIEModZipPackage.outputs.PackageBaseName }}.zip
asset_name: ${{ steps.CreateIEModZipPackage.outputs.PackageBaseName }}.zip
tag: ${{ github.ref }}
overwrite: true
11 changes: 4 additions & 7 deletions bgqe/bgqe.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ Forum = https://www.gibberlings3.net/forums/forum/148-baldurs-gate-mini-quests-a
# If you use other hosting sites, please check requirements and put direct download link
Download = https://github.com/Gibberlings3/BG_Quests_And_Encounters
# Requirements for other hosting sites:
# - forum attachments won't work because the download links will be changed every time when you update mod package
# - mod package should be downloaded using 'wget' commandline tool: wget.exe --no-check-certificate 'link'
# - it's possible to preform file size check using 'wget' commandline tool: wget.exe --no-check-certificate --spider 'link'
# - links do not expire after 30 or more days without download ( speeedyshare, mediafire etc has forced expiration dates)
# - hosting site won't require user interaction or captcha ( googledrive, mediafire etc require user interaction)
# - hosting site don't advertise any kind of adware/crapware etc
# Dynamic Install Order Category
Type = Quests
Before = ACBre, bg1npc, c#brage, c#brandock, c#grey, c#husam, EET_end
7 changes: 4 additions & 3 deletions bgqe/friendlysil/friendlysil.d
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ APPEND %tutu_var%SIL
IF ~~ THEN friendly_sil
SAY @3
IF ~~ THEN + friendly_sil_01
IF ~OR(2)
Global("c#lc_silencounter","GLOBAL",2) //bg1re: Sil's Blessing
Global("J#PirateFight","GLOBAL",3) //Lure of Sirine's Call
IF ~Global("c#lc_silencounter","GLOBAL",2) //bg1re: Sil's Blessing
~ + friendly_sil_03
IF ~Global("J#PirateFight","GLOBAL",3) //Lure of Sirine's Call
~ + friendly_sil_03
END

Expand Down Expand Up @@ -76,6 +76,7 @@ END

IF ~~ THEN friendly_sil_06
SAY @22
IF ~~ THEN + friendly_sil_07
END

IF ~~ THEN friendly_sil_07
Expand Down
64 changes: 64 additions & 0 deletions bgqe/lib/func_fetch_journal_entries.tph
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/* argent77's function for fetching journal strrefs. With many thanks! */

/* To be used later in the form:

COPY_EXISTING ~husam.dlg~ ~override~
// get journal entry from first response associated with dialogue state 6
LPF READ_JOURNAL_STRREF
INT_VAR
state = 6
// stateResponse = 1 //As an example: This would be reply option #2 from top
RET
strref
END

SET myUniqueVar = strref //adapt "myUniqueVar" as necessary

// just for debugging purposes: fetch journal text from strref and output it in console
GET_STRREF strref journalText
PATCH_PRINT ~Journal entry #%strref%: %journalText%~
BUT_ONLY

*/

DEFINE_PATCH_FUNCTION READ_JOURNAL_STRREF
INT_VAR
// either use these two parameters if response index should be determined from a state index
state = "-1" // state index
stateResponse = 0 // relative response index (e.g. 0 for first response associated with the state, 1 for second response, and so on...)

// or use this parameter instead to specify response index directly
response = "-1" // (absolute) response index

RET
strref // returned string reference, or -1 if not available
BEGIN
SET strref = "-1"

// determine response index from dialogue state if specified
PATCH_IF (state >= 0) BEGIN
READ_LONG 0x08 numStates
PATCH_IF (state < numStates) BEGIN
READ_LONG 0x0c ofsStates
SET ofs = ofsStates + (state * 0x10) // calculate offset to specified state
READ_LONG (ofs + 4) firstResponse
READ_LONG (ofs + 8) numStateResponses
PATCH_IF (stateResponse >= 0 && stateResponse < numStateResponses) BEGIN
SET response = firstResponse + stateResponse // calculate absolute response index (processed below)
END
END
END

// deal with dialogue response index directly
PATCH_IF (response >= 0) BEGIN
READ_LONG 0x10 numResponses
PATCH_IF (response < numResponses) BEGIN
READ_LONG 0x14 ofsResponses
SET ofs = ofsResponses + (response * 0x20)
READ_LONG ofs flags
PATCH_IF (flags & BIT4) BEGIN // response flags bit 4 indicates available journal entry
READ_LONG (ofs + 8) strref
END
END
END
END
7 changes: 7 additions & 0 deletions bgqe/noober/lc_noober.d
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ Global("C#LCNOOB_FTOWN2_Angry","GLOBAL",0)
END
IF ~~ THEN DO ~SetGlobal("C#LCNOOB_Quest","GLOBAL",6)
%ERASEJOURNALENTRY_18%
~ %UNSOLVED_JOURNAL% @83 EXIT
IF ~Global("HelpNashkellWoman","GLOBAL",2)~ THEN DO ~SetGlobal("C#LCNOOB_Quest","GLOBAL",6)
%ERASEJOURNALENTRY_18%
~ %UNSOLVED_JOURNAL% @59 EXIT


Expand Down Expand Up @@ -338,6 +341,10 @@ END
IF ~~ THEN DO ~AddexperienceParty(150)
%ERASEJOURNALENTRY_18%
%ERASEJOURNALENTRY_59%
SetGlobal("C#LCNOOB_Quest","GLOBAL",7)~ %SOLVED_JOURNAL% @84 EXIT
IF ~Global("HelpNashkellWoman","GLOBAL",2)~ THEN DO ~AddexperienceParty(150)
%ERASEJOURNALENTRY_18%
%ERASEJOURNALENTRY_59%
SetGlobal("C#LCNOOB_Quest","GLOBAL",7)~ %SOLVED_JOURNAL% @65 EXIT


Expand Down
74 changes: 55 additions & 19 deletions bgqe/readmes/english.bgqe.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Since Version 9, the Bjornin Extention is moved to the RE BG1 mod (Romantic Enco

Install this mod before bg1npc project. Otherwise, some reply options are gone.

The mod "Brage's Redemption" inserts the same quest as bgqe's component "Brage's Sword" as a prerequirement before Brage can be taken into the party. The quest gets extended by Brage's Redemption mod with additional hints and journal entries. It is recommended that you install Brage's Redemption to see the extra content but it is not required to play the quest. BGQE should be installed before Brage's Redemption.
The mod "Brage's Redemption" inserts the same quest as bgqe's component "Brage's Sword" as a prerequirement before Brage can be taken into the party. The quest gets extended by Brage's Redemption mod with additional hints and journal entries. It is recommended that you install Brage's Redemption to see the extra content but it is not required to play the quest. Note: If both mods are installed, BGQE has to be installed before Brage's Redemption.


DESCRIPTION
Expand Down Expand Up @@ -116,16 +116,26 @@ This component extends the original game quest about priest Tremain's dead son a
14.B Tremain's Sellout: in the original game, Tremain asks the PC to retrieve his dead son from the temple of Umberlee, so he can revive him. The PC now has the possibility to bring the son to the temple, instead.


15. A worried farmer (not for original BG1) (LABEL bgqe_worriedfarmer)
15. A worried farmer (not for original BG1) (LABEL bgqe_worriedfarmer), by Lumorus and White Agnus
-------
In Beregost/Nashkel there are some rumors by a few farmers, so far one of them is addressed in this component: talk to a farmer in Beregost until he tells the PC about a creature making noises behind his house at night. He will then ask the PC to help him to get rid of it.


16. Bodies for a good cause (LABEL bgqe_bodiesforgoodcause)
16. Bodies for a good cause (LABEL bgqe_bodiesforgoodcause), by Lumorus and White Agnus
-------
This mod plays in Baldur's Gate. Bring the corpses you find in the sewers to Sylar, a necromancer with a special research. This component is also good for PCs that care about the environment! :D


17. Finish Cordyr's Quest without killing Sil, by Lumorus
-------
This component expands on Cordyr's Quest twofold:
-The door to his house will be unlocked and all PCs no matter the reputation will get the quest to take care of the sirines who took over Cordyr's old fishing grounds.
-The conflict can be solved without having to kill Sil and the sirines.

This component is compatible with all changes to Sil and her sirines by bg1re and Lure of Sirine's Call.



INSTALLATION

Note: If you've previously installed the mod, remove it before extracting the new version. To do this, uninstall all previously installed components and delete the mod folder and executables. When installing or uninstalling, do not close the DOS window by clicking on the X button! Instead, press the Enter key when instructed to do so.
Expand Down Expand Up @@ -177,17 +187,24 @@ BG1NPC Project: the component "Brage's Sword" from bgqe has to be installed befo

Brage's Redemption: The mod "Brage's Redemption" inserts the same quest as a prerequirement before Brage can be taken into the party. The quest gets extended by Brage's Redemption mod with additional hints and journal entries. It is recommended that you install Brage's Redemption to see the extra content but it is not required to play the quest. BGQE should be installed before Brage's Redemption.

bg1re: fully compatibility of all components (I'm putting this here because both mods change Sil's dialogue)

Lure of Sirine's Call: fully compatibility of all components (I'm putting this here because both mods change Sil's dialogue)


If you play it with the original BG, the mod is compatible with
-Echon's "Field of the Dead" (Version 1.07)

For original BG, the mod should also be technically compatible with (this does not necessarily imply that the listed mods are all compatible with each other):
-BG1 Unfinished Business
-NTotSC (non-WeiDU)
-Grey Clan Episode 1
-Herbs and Potions Add-In
-BG1 Adventure and CoM Forge
-BG1 Ajantis Expansion Mod
-bg1re BG1 Romantic Encounters
-Grey Clan Episode 1
-Herbs and Potions Add-In
-DSotSC (BGT/EET version)
-Lure of Sirine's Call
-NTotSC
-Xan Friendship Mod


Expand All @@ -197,7 +214,7 @@ KNOWN ISSUES

-"Many little paws" I am also sometimes left with one or two hamsters after the boy supposedly takes them all, although which ones exactly differs each try. (I hope this will be fixed for v16)

-"Brage's Sword" (BG:EE / EET): after returning Brage to Nashkell, the journal entry "The Tale of Captain Brage(Finished)" will remain in the journal, but without any text attached to it. Obviously the journal system is not meant to remove titels even if the entries are removed. This is an engine problem. (Let's see whether this will change for 2.5)
-"Brage's Sword" (BG:EE / EET): after returning Brage to Nashkell, the journal entry "The Tale of Captain Brage(Finished)" will remain in the journal, but without any text attached to it. Obviously the journal system is not meant to remove titels even if the entries are removed. This is an engine problem.

-"A Warm PLace for Noober" (BG1:TotSC): It can happen that Joseph's widow's mother will sleep on the floor, while a generic sleeping woman sleeps in the bed. Just imagine Joseph's widow to have a real great heart for needing souls.

Expand All @@ -223,14 +240,16 @@ Angel: thank you for the hamster BAM (c#q10004.bam), item fixes and more for v21

berelinde: proofreading of English translation

Chev: alpha and beta testing

cujo: alpha and beta testing, ideas for quest developpment / NPC-reactions

Cahir: beta testing

Caillean: alpha and beta testing, ideas for quest developpment / NPC-reactions, proof-reading of German translation

Chev: alpha and beta testing

Coland: heavy revision of Italian translation and translations of new component for v23

cujo: alpha and beta testing, ideas for quest developpment / NPC-reactions

Drogan Di'Umptu: alpha and beta testing

Erg: beta testing
Expand Down Expand Up @@ -264,22 +283,32 @@ Zed Nocear: Coding of spell effect, alpha and beta testing, ideas for quest deve
zenblack: alpha and beta testing, ideas for quest developpment / NPC-reactions


-translations-
Translations:
-------------------

French translation: Le Marquis (des d'Oghmatiques) and Jazira, v22 completed by Jazira (proof readings by Le Marqui and Elisabeth)
Russian translation: v8 by hawkmoon & arcanecoast.ru team, v20 completed by d0lphin, v22 revised, corrected, and updated by d0lphin
French translation: v23 completed by Jazira.
v22 completed by Jazira (proof readings by Le Marquis and Elisabeth).
v21 by Le Marquis (des d'Oghmatiques) and Jazira.

Russian translation: New component in v23 by yota13, proofreading by Austin.
v22 revised, corrected, and updated by d0lphin.
v20 completed by d0lphin.
v8 by hawkmoon & arcanecoast.ru team.

Italian translation: Heavy revision of Italian translation and translations of new component for v23 by Coland.
Updates v12 - 22 completed by ilot, mapnotes by jojo678.
Old translations of v12 by Stoneangel.
First translation of the slimequest by Jakkus & Lord Hagen (GIMT).

-old translations v8-
Italian translation: Stoneangel, with translation of the slimequest by Jakkus & Lord Hagen (GIMT)
-old translations v8:
Polish translation: Zed Nocear
Spanish translation: Excalibur (slime quest), Immortality (proofreading)

-hosting-

CamDawg, cmorgan and G3 staff: Uploading to G3 site and actualisation of links

CamDawg (G3-Team), Hedian, Fridtjof, Sir Darian, Tim und Vernochan (Kerzenburgforum): Hosting of the Mod.
CamDawg, Mike1072, theacefes (G3); Hedian, Fridtjof (Rosenrankenforum); Sir Darian, Tim and Vernochan (Kerzenburgforum): Hosting of the Mod.


TOOLS USED
Expand Down Expand Up @@ -323,14 +352,21 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati

HISTORY

Version 23:
-new component added: "Finish Cordyr's Quest without killing Sil" by Lumorus, coding by jastey. Russian translation by yota13, proofreading by Austin. Italian translation by Coland. French translation by Jazira.
-"A Warm PLace for Noober": journal entry will reflect whether player knows about Joseph's death (new lines: Italian by Coland, Russian by Austin, French by Jazira, English and German by jastey)
-French translation finished by Jazira.
-Italian translation heavily revised and improved by Coland.
-Added Dynamic Install Order categories to support Project Infinity.

Version 22:
-French translation completed (translation: Jazira, proof reading: Le Marquis, Elisabeth)
-"Brage's Sword": will not be stuck in the trial scene for Tutu
-"Many Little Paws": vendor should not respawn at the Carnival, should not disappear after 12 days if PC hasn't spoken to him yet, should not be at FAI if hamster was given to boy.
-"Slimequest": Tulbor can only be asked about the effects ot the antidote if the antidote is in the group's inventory.
-"Slimequest": Tulbor can only be asked about the effects of the antidote if the antidote is in the group's inventory.
-"Warm Place for Noober": shouldn't give doubled journal entry about Brage if talked to Nalin.
-"Legal Searchart Sources": Calahan should spawn always after talking to Mendas.
- "Unexpected Help": Sir Trun should have his shield in the inventory, not in the shield slot or the shield slot.
- "Unexpected Help": Sir Trun should have his shield in the inventory, not in the shield slot or the quick item slot.
-Added LABEL declarations to components.
-(English version) Typo corrections.
-(Russian version) Serious updates and corrections of the Russian translation from d0lphin.
Expand Down
Loading

0 comments on commit 38b5ff9

Please sign in to comment.