2006Scape-Scripts/ParaScript
1
0
Fork 0
mirror of https://github.com/2006Scape-Scripts/ParaScript.git synced 2026-07-03 00:38:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mine equal parts TIN and COPPER

Browse Source
This commit is contained in:
RedSparr0w
2019-10-14 15:49:44 +13:00
parent b2fd6c29c0
commit dc2f62ae24
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+10 -5
View File
@@ -3,8 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment=""> <list default="true" id="3ab8e8a0-ccfd-4b0b-9547-98173085dc38" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ParaScript/strategies/MakeArrowShafts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/strategies/MakeArrowShafts.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ParaScript/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/ui/UI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ParaScript/strategies/Mine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ParaScript/strategies/Mine.java" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@@ -24,7 +24,9 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="ProjectId" id="1RwJc2HEUFTeubPY6u2X9b5qHk3" /> <component name="ProjectId" id="1RwJc2HEUFTeubPY6u2X9b5qHk3" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="1" id="Add" />
</component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="GenerateAntBuildDialog.backupFiles" value="true" /> <property name="GenerateAntBuildDialog.backupFiles" value="true" />
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" /> <property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
@@ -35,11 +37,12 @@
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="com.intellij.jarRepository.settings.RemoteRepositoriesConfigurable" /> <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="ParaScript.strategies" /> <recent name="ParaScript.strategies" />
<recent name="ParaScript.data.variables" />
<recent name="ParaScript.ui" /> <recent name="ParaScript.ui" />
<recent name="ParaScript.data" /> <recent name="ParaScript.data" />
<recent name="ParaScript" /> <recent name="ParaScript" />
@@ -82,7 +85,9 @@
<map> <map>
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State /> <State>
<option name="COLUMN_ORDER" />
</State>
</value> </value>
</entry> </entry>
</map> </map>
src/ParaScript/strategies/Mine.java
+6 -1
View File
@@ -43,7 +43,12 @@ public class Mine implements Strategy {
} }
private SceneObject ore(){ private SceneObject ore(){
for(SceneObject ore : SceneObjects.getNearest(Ores.COPPER_TIN.getIDs())){ int[] ore_to_mine = Ores.COPPER_TIN.getIDs();
if (Inventory.getCount(Ores.COPPER.getIDs()) >= 14)
ore_to_mine = Ores.TIN.getIDs();
if (Inventory.getCount(Ores.TIN.getIDs()) >= 14)
ore_to_mine = Ores.COPPER.getIDs();
for(SceneObject ore : SceneObjects.getNearest(ore_to_mine)){
if(Variables.VARROCK_EAST_MINE_ZONE.inTheZoneObject(ore)) { if(Variables.VARROCK_EAST_MINE_ZONE.inTheZoneObject(ore)) {
return ore; return ore;
} }