-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12 from UniTrader/UE-Improvements-dev
UE improvements Changelog: => Moved Optional Changes to a folder with batch files (alternative to creating multiple, optional, packages - Downloaded Version is the one representing how i want everything, but some things can be added or removed from this) => Fixed Issue with refueling when using my Navigation Scripts for all Bigships in the Universe => Also Updated Standalone Version of Nav Scripts replacement => removed some debug stuff I dont need => added Logging of activities to Playerlog (Feedback wanted!!!) => Changed: emptycargo routine now prioritzes Homebase => Changed: minimum Trade amount now 10% of Cargo bay (as before) or 1/4 of Ship Value for the base price of the Ware => Added: Restrict Trading to Player Stations only (for whoever needs this) => Removed some stuff i dont need => Externalized all Text to Language Files - have fun translating ;) => Added Compatibility for Vim Razz' Human ressources by setting the $actor.$InUse-Var => Added some missing Spoken Lines in Dialogue Tree (feedback wanted! can some Lines be improved? are there logical mistakes with the used line? etc.) => Made all Spoken Text Optional (just tell your employees to never. say. a. word.) => Added Conversation Flow Control - the Workaround from the Previous Version is now unnecesary => Improved some stuff for re-usability
- Loading branch information
Showing
41 changed files
with
1,224 additions
and
3,716 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
del ..\assets\props\storagemodules\macros\* |
1 change: 1 addition & 0 deletions
1
Optional Stuff/Enable Movement Scripts for all Ships in Galaxy.bat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
copy .\TechStuff\MovementWrapper\* ..\aiscripts\ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<?xml version="1.0" encoding="UTF-8" ?> | ||
<diff> | ||
<replace sel='//run_script[@name="'move.undock'"]'> | ||
<do_if value="true"> | ||
<run_script name="'ut.cac.move.generic.wrapper'"> | ||
<param name="destination" value="$destination"/> | ||
<param name="position" value="$position"/> | ||
<param name="rotation" value="$rotation"/> | ||
<param name="lookat" value="$lookat"/> | ||
<param name="nojump" value="$nojump"/> | ||
<param name="skipcharge" value="$skipcharge"/> | ||
<param name="ignorefuel" value="$ignorefuel"/> | ||
<param name="autorefuel" value="$autorefuel"/> | ||
<param name="disablecollisionavoidance" value="$disablecollisionavoidance"/> | ||
<param name="abortpath" value="$abortpath"/> | ||
<param name="forcesteering" value="$forcesteering"/> | ||
<param name="endintargetzone" value="$endintargetzone"/> | ||
<param name="debugchance" value="$debugchance"/> | ||
</run_script> | ||
<!-- movement already done - return/exit - Will still execute rest of move.generic just in case --> | ||
<!--do_if value="$tmp"> | ||
<return/> | ||
</do_if--> | ||
</do_if> | ||
</replace> | ||
</diff> |
63 changes: 63 additions & 0 deletions
63
Optional Stuff/TechStuff/MovementWrapper/ut.cac.move.generic.wrapper.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
<?xml version="1.0" encoding="UTF-8" ?> | ||
<aiscript name="ut.cac.move.generic.wrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://utnas/~unitrader/XRebirthxsds/aiscripts.xsd" version="2"> | ||
<!-- | ||
Wrapper Script to switch Movement for L/XL Ships to UT CAC Movement (for testing only, not part of the Project itself) | ||
--> | ||
<params> | ||
<param name="destination" comment="can be a space or an object in a zone. Providing Sector and Cluster will attempt to find the nearest zone"/> | ||
<param name="position" default="null" comment="position is treated as an offset to destination. Default: safe position on [0,0,0] of destination"/> | ||
<param name="rotation" default="null" comment="rotation the ship should have - overrides lookat"/> | ||
<param name="lookat" default="null" comment="position the ship should point to - overridden by rotation"/> | ||
<param name="nojump" default="false" comment="set true to prevent Big ships from using their jumpdrive (only use for insector movement - for review when we have capship in-sector boosters)"/> | ||
<param name="skipcharge" default="false" comment="skip the jump drive charge time (only to be used in special cases e.g. plot missions)"/> | ||
<param name="ignorefuel" default="false" comment="ignore jump fuel requirements (only to be used in special cases e.g. plot missions)"/> | ||
<param name="autorefuel" default="true" comment="automatically take steps to re-fuel if necessary"/> | ||
<param name="disablecollisionavoidance" default="false" comment="HACK - disable collisionavoidance for this ship"/> | ||
<param name="abortpath" default="true" comment="disable aborting existing path"/> | ||
<param name="forcesteering" default="false" comment="force steering flight control model"/> | ||
<param name="endintargetzone" default="false" comment="complete this script if we are in the correct zone, no matter where"/> | ||
<param name="debugchance" default="0"/> | ||
</params> | ||
<attention min="unknown"> | ||
<actions> | ||
<!-- to maintain compatibility the replaced move.undock is performed here --> | ||
<run_script name="'move.undock'" /> | ||
|
||
<!-- onlx L and XL Ships supported atm --> | ||
<do_if value="this.ship.isclass.ship_l or this.ship.isclass.ship_xl"> | ||
<!-- $skipcharge, $ignorefuel, $autorefuel , $abortpath not supported, use default Script --> | ||
<do_if value="not ($skipcharge or $ignorefuel)"> | ||
<!-- $nojump, $disablecollisionavoidance, $forcesteering can be safely ignored i think --> | ||
<!-- restore vanilla behavior that rotation overrides lookat --> | ||
<do_if value="$rotation and $lookat"> | ||
<set_value name="$lookat" exact="null"/> | ||
</do_if> | ||
<!-- set debug Value --> | ||
<do_if value="$debugchance"> | ||
<set_value name="this.$debug" exact="true"/> | ||
</do_if> | ||
<do_else> | ||
<set_value name="this.$debug" exact="false"/> | ||
</do_else> | ||
<!-- first check for refuel, then move (for L and XL Ships)--> | ||
<do_if value="not this.$refueling? and this.ship.cargo.{ware.fuelcells}.count lt this.ship.cargo.{ware.fuelcells}.max * 0.2f"> | ||
<set_value name="this.$refueling"/> | ||
<run_script name="'move.refuel'" sinceversion="2"/> | ||
<remove_value name="this.$refueling"/> | ||
</do_if> | ||
<run_script name="'ut.cac.move.generic'"> | ||
<param name="destination" value="$destination" comment="Object to move relative to - will default to relative to Zone if not set"/> | ||
<param name="position" value="$position" comment="position is treated as an offset to destination. Default: safe position on [0,0,0] of destination"/> | ||
<param name="rotation" value="$rotation" comment="rotation the ship should have - overridden by lookat"/> | ||
<param name="lookat" value="$lookat" comment="position the ship should point to - overrides rotation"/> | ||
<param name="endintargetspace" value="$endintargetzone" comment="complete this script if we have the correct Space context, no matter where (may be Cluster, Sector or Zone, will resolve to Zone if an Object is the destination)"/> | ||
</run_script> | ||
<!-- remove debug Value --> | ||
<remove_value name="this.$debug"/> | ||
</do_if> | ||
</do_if> | ||
</actions> | ||
</attention> | ||
</aiscript> |
Binary file not shown.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.