K-Mod: Far Beyond the Sword
- Thread starter karadoc
- Start date
Zholef
Warlord
- Joined
- Feb 20, 2014
- Messages
- 192
Oh, I didn't know that was going on. Anyway, I don't know. I'm having some reservations about taking things that other people made and uploaded here, changing them and uploading them somewhere else.
AbsintheRed
Deity
Wow, this is awesome, all changes seem to be inline with Karadoc's initiative.
So it's like a spiritual succession to K-mod!
Keep up the good work guys!
Karadoc uploaded some code to the K-Mod github. (This was the last commit previously, so there are 40 new commits now.)
I think that everything from that v1.45 pre-release and some new things are there now except experimental balance changes listed here:
He said that these are not uploaded to github because they haven't been tested, and the same reason is the cause why there hasn't been an official release of v1.45 (yet).
I think that everything from that v1.45 pre-release and some new things are there now except experimental balance changes listed here:
Spoiler :
He said that these are not uploaded to github because they haven't been tested, and the same reason is the cause why there hasn't been an official release of v1.45 (yet).
Ramkhamhaeng
Warlord
- Joined
- Feb 24, 2014
- Messages
- 218
@DarkLunaPhantom
Hello, the latest (or one of the latest) commits pushed indentation errors into CvEventManager.py
My changes:
Hello, the latest (or one of the latest) commits pushed indentation errors into CvEventManager.py
My changes:
Code:
diff --git a/Assets/Python/CvEventManager.py b/Assets/Python/CvEventManager.py
index 704f719..aa499fa 100644
--- a/Assets/Python/CvEventManager.py
+++ b/Assets/Python/CvEventManager.py
@@ -372,7 +372,7 @@ class CvEventManager:
iGameTurn = argsList[0]
## AI AutoPlay ##
if CyGame().getAIAutoPlay() == 0:
- CvTopCivs.CvTopCivs().turnChecker(iGameTurn)
+ CvTopCivs.CvTopCivs().turnChecker(iGameTurn)
## AI AutoPlay ##
# PB Mod begin
self.bGameTurnProcessing = True
@@ -544,13 +544,13 @@ class CvEventManager:
## Platy Builder ##
if not CyGame().GetWorldBuilderMode():
## Platy Builder ##
- popupInfo = CyPopupInfo()
- popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON_SCREEN)
- popupInfo.setData1(iBuildingType)
- popupInfo.setData2(pCity.getID())
- popupInfo.setData3(0)
- popupInfo.setText(u"showWonderMovie")
- popupInfo.addPopup(pCity.getOwner())
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON_SCREEN)
+ popupInfo.setData1(iBuildingType)
+ popupInfo.setData2(pCity.getID())
+ popupInfo.setData3(0)
+ popupInfo.setText(u"showWonderMovie")
+ popupInfo.addPopup(pCity.getOwner())
CvAdvisorUtils.buildingBuiltFeats(pCity, iBuildingType)
@@ -567,13 +567,13 @@ class CvEventManager:
## Platy Builder ##
if not CyGame().GetWorldBuilderMode():
## Platy Builder ##
- popupInfo = CyPopupInfo()
- popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON_SCREEN)
- popupInfo.setData1(iProjectType)
- popupInfo.setData2(pCity.getID())
- popupInfo.setData3(2)
- popupInfo.setText(u"showWonderMovie")
- popupInfo.addPopup(pCity.getOwner())
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON_SCREEN)
+ popupInfo.setData1(iProjectType)
+ popupInfo.setData2(pCity.getID())
+ popupInfo.setData3(2)
+ popupInfo.setText(u"showWonderMovie")
+ popupInfo.addPopup(pCity.getOwner())
def onSelectionGroupPushMission(self, argsList):
'selection group mission'
@@ -904,7 +904,7 @@ class CvEventManager:
if (city.getOwner() == gc.getGame().getActivePlayer()):
## AI AutoPlay ##
if CyGame().getAIAutoPlay() == 0 and not CyGame().GetWorldBuilderMode():
- self.__eventEditCityNameBegin(city, False)
+ self.__eventEditCityNameBegin(city, False)
## AI AutoPlay ##
CvUtil.pyPrint('City Built Event: %s' %(city.getName()))Thanks, it seems that I merged one of alberts2's changes into my fork incorrectly. I'll probably redo all that anyway since more karadoc's code is now available.
Ramkhamhaeng
Warlord
- Joined
- Feb 24, 2014
- Messages
- 218
An other issue are an empty main menu if I use German as language. I've looked into xml/Text, searched for incomplete items, and add a few language strings. Now, all entries have tags for all five languages, again. I've not checked which entry was the issue culpit, but assume it was the double <German> Tag in one of theese files. 
I do not want fork on Github, but you can simply appliy the patch with
'git apply [attachment file]'.
I do not want fork on Github, but you can simply appliy the patch with
'git apply [attachment file]'.
An other issue are an empty main menu if I use German as language. I've looked into xml/Text, searched for incomplete items, and add a few language strings. Now, all entries have tags for all five languages, again. I've not checked which entry was the issue culpit, but assume it was the double <German> Tag in one of theese files.
I do not want fork on Github, but you can simply appliy the patch with
'git apply [attachment file]'.
Nice catch. I think that you accidentally deleted English text for TXT_KEY_PROMOTION_DISORGANIZED in Assets\xml\Text\Civ4GameText_K-Mod.xml.
AbsintheRed
Deity
Yeah, this is indeed an interesting find.
The double german entry in <Tag>TXT_KEY_EVENT_CIV_GAME_1</Tag> is in vanilla BtS, in the CIV4GameText_Events_BTS.xml file.
So this could cause troubles everywhere.
I wonder if it is was fixed somewhere before, in one of the unofficial patches or in a fairly well-known mod.
But probably not, as it would have surely made it's way to most bigger mods a couple years ago.
The double german entry in <Tag>TXT_KEY_EVENT_CIV_GAME_1</Tag> is in vanilla BtS, in the CIV4GameText_Events_BTS.xml file.
So this could cause troubles everywhere.
I wonder if it is was fixed somewhere before, in one of the unofficial patches or in a fairly well-known mod.
But probably not, as it would have surely made it's way to most bigger mods a couple years ago.
AbsintheRed
Deity
Yeah, I'm clueless as well. Surely tens (hundreds?) of thousands people played vanilla BtS in german, it would have come up for sure if it causes any issues without mods used.
Cannot really add a proper rationale behind this.
If the issue always comes up when xml files are loaded from multiple places, then that would mean even the smallest mods cannot be run in german.
That's also very doubtful.
Ramkhamhaeng
Warlord
- Joined
- Feb 24, 2014
- Messages
- 218
Hm, seems like AbsintheRed is right and there are only an indirect releation between my xml changes and the empty menu.
I reverted to the previous version (and cleared the cache, etc) but can't reproduce the error anymore.
Duplicate xml tags and files cause other weird bugs. E.g., having modded xml file with the same name as the BTS file with city names (but none of the same tags) changes city names ingame to concatenation of names from all languages, so "Rome" becomes something like "RomeRomRoma...".
Thanks for making us aware, also of the fork by alberts2. I've now bookmarked all three commit histories: yours, alberts2's and karadoc's. Already adopted your recent addition about defensive pacts - haven't tested it yet, but sounds good.
I think I got all the balance changes from K-Mod 1.45 by copying XML files from the beta. Only a tiny bit seems to be missing:
The change from "3+" to "2+" is in GlobalDefinesAlt, but the missing factor 2 would be a DLL change in CvPlot::doCulture. Well, hardly a crucial difference.
Not really, that way only things from that branch that were discarded are those lines of code which were changed in the master version in the meantime. (Conflict means that the same thing was changed both in that branch and in the master version (with respect to last common point) so they couldn't be merged automatically.)
I decided to check does this still happen:
I tested with barb archer and a galley in a city attacked by gunship and it seems that bug is not present when playing with all of karadoc's commits. I am playing my fork, but I think that none of my or alberts2's code does anything to that so I guess this fixed it.
I tested with barb archer and a galley in a city attacked by gunship and it seems that bug is not present when playing with all of karadoc's commits. I am playing my fork, but I think that none of my or alberts2's code does anything to that so I guess this fixed it.
Oh, I see; that makes sense.
