Skip to content

Commit

Permalink
Fixed a bunch of bugs and added damage scaling with items
Browse files Browse the repository at this point in the history
  • Loading branch information
@milesthenerd
milesthenerd committed Sep 18, 2021
1 parent a029624 commit d434594
Show file tree
Hide file tree
Showing 20 changed files with 373 additions and 198 deletions.
88 changes: 72 additions & 16 deletions AM2R.project.gmx
View file
Expand Up @@ -3,8 +3,8 @@
<Configs name="configs">
<Config>Configs\Default</Config>
</Configs>
<datafiles number="366" name="datafiles">
<datafiles number="366" name="lang">
<datafiles number="369" name="datafiles">
<datafiles number="369" name="lang">
<datafile>
<name>czech.ini</name>
<exists>-1</exists>
Expand Down Expand Up @@ -158,7 +158,7 @@
</ConfigOptions>
<filename>languages.txt</filename>
</datafile>
<datafiles number="366" name="headers">
<datafiles number="369" name="headers">
<datafile>
<name>castellano_a1_f24_b0_c3_d19_e21.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -857,7 +857,7 @@
<filename>russian_a8_f19_b0_c3_d14_e16.png</filename>
</datafile>
</datafiles>
<datafiles number="366" name="fonts">
<datafiles number="369" name="fonts">
<datafile>
<name>04b09.ttf</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1030,8 +1030,8 @@
</ConfigOptions>
<filename>readme.txt</filename>
</datafile>
<datafiles number="366" name="mods">
<datafiles number="366" name="titles">
<datafiles number="369" name="mods">
<datafiles number="369" name="titles">
<datafile>
<name>config.ini</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1067,8 +1067,8 @@
<filename>titlebackground.png</filename>
</datafile>
</datafiles>
<datafiles number="366" name="palettes">
<datafiles number="366" name="monsters">
<datafiles number="369" name="palettes">
<datafiles number="369" name="monsters">
<datafile>
<name>alpha.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1240,7 +1240,7 @@
<filename>zeta_blur.png</filename>
</datafile>
</datafiles>
<datafiles number="366" name="suits">
<datafiles number="369" name="suits">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1343,7 +1343,7 @@
</ConfigOptions>
<filename>varia.png</filename>
</datafile>
<datafiles number="366" name="MorphTrailColors">
<datafiles number="369" name="MorphTrailColors">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1447,7 +1447,7 @@
<filename>varia.png</filename>
</datafile>
</datafiles>
<datafiles number="366" name="SpaceJumpTrails">
<datafiles number="369" name="SpaceJumpTrails">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1551,7 +1551,7 @@
<filename>varia.png</filename>
</datafile>
</datafiles>
<datafiles number="366" name="SpiderBallGlow">
<datafiles number="369" name="SpiderBallGlow">
<datafile>
<name>fusion_gravity.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1656,8 +1656,8 @@
</datafile>
</datafiles>
</datafiles>
<datafiles number="366" name="multitroid">
<datafiles number="366" name="dark_player_icons">
<datafiles number="369" name="multitroid">
<datafiles number="369" name="dark_player_icons">
<datafile>
<name>sDarkMultitroidPlayer_0.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -1931,7 +1931,7 @@
<filename>sDarkMultitroidPlayer_15.png</filename>
</datafile>
</datafiles>
<datafiles number="366" name="player_icons">
<datafiles number="369" name="player_icons">
<datafile>
<name>sMultitroidPlayer_0.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -2205,7 +2205,7 @@
<filename>sMultitroidPlayer_15.png</filename>
</datafile>
</datafiles>
<datafiles number="366" name="map_icons">
<datafiles number="369" name="map_icons">
<datafile>
<name>sMultitroidMapIcon_0.png</name>
<exists>-1</exists>
Expand Down Expand Up @@ -2478,6 +2478,57 @@
</ConfigOptions>
<filename>sMultitroidMapIcon_15.png</filename>
</datafile>
<datafile>
<name>sFusionIcon.png</name>
<exists>-1</exists>
<size>150</size>
<exportAction>2</exportAction>
<exportDir></exportDir>
<overwrite>0</overwrite>
<freeData>-1</freeData>
<removeEnd>0</removeEnd>
<store>0</store>
<ConfigOptions>
<Config name="Default">
<CopyToMask>9223372036854775807</CopyToMask>
</Config>
</ConfigOptions>
<filename>sFusionIcon.png</filename>
</datafile>
<datafile>
<name>sSpectatorIcon.png</name>
<exists>-1</exists>
<size>153</size>
<exportAction>2</exportAction>
<exportDir></exportDir>
<overwrite>0</overwrite>
<freeData>-1</freeData>
<removeEnd>0</removeEnd>
<store>0</store>
<ConfigOptions>
<Config name="Default">
<CopyToMask>9223372036854775807</CopyToMask>
</Config>
</ConfigOptions>
<filename>sSpectatorIcon.png</filename>
</datafile>
<datafile>
<name>sSAXIcon.png</name>
<exists>-1</exists>
<size>148</size>
<exportAction>2</exportAction>
<exportDir></exportDir>
<overwrite>0</overwrite>
<freeData>-1</freeData>
<removeEnd>0</removeEnd>
<store>0</store>
<ConfigOptions>
<Config name="Default">
<CopyToMask>9223372036854775807</CopyToMask>
</Config>
</ConfigOptions>
<filename>sSAXIcon.png</filename>
</datafile>
</datafiles>
<datafile>
<name>baby_metroid.png</name>
Expand Down Expand Up @@ -5226,6 +5277,11 @@
<sprite>sprites\sFusionIcon</sprite>
<sprite>sprites\sFedtogg</sprite>
</sprites>
<sprites name="Default Palettes">
<sprite>sprites\sPowerPalette</sprite>
<sprite>sprites\sVariaPalette</sprite>
<sprite>sprites\sGravityPalette</sprite>
</sprites>
</sprites>
<backgrounds name="background">
<background>background\bgScreenGuide</background>
Expand Down
6 changes: 3 additions & 3 deletions Configs/Default.config.gmx
View file
Expand Up @@ -25,7 +25,7 @@
<option_android_build_version>2</option_android_build_version>
<option_android_color_depth>1</option_android_color_depth>
<option_android_compile_sdk_version>28</option_android_compile_sdk_version>
<option_android_display_name>Multitroid 1.4</option_android_display_name>
<option_android_display_name>Multitroid 1.4.1</option_android_display_name>
<option_android_facebook_app_display_name></option_android_facebook_app_display_name>
<option_android_facebook_appid></option_android_facebook_appid>
<option_android_facebook_enable>0</option_android_facebook_enable>
Expand Down Expand Up @@ -220,7 +220,7 @@
<option_changeresolution>false</option_changeresolution>
<option_closeesc>true</option_closeesc>
<option_colordepth>0</option_colordepth>
<option_display_name>AM2R Multitroid 1.4</option_display_name>
<option_display_name>AM2R Multitroid 1.4.1</option_display_name>
<option_displayerrors>True</option_displayerrors>
<option_ecma>0</option_ecma>
<option_facebook_app_display_name></option_facebook_app_display_name>
Expand Down Expand Up @@ -362,7 +362,7 @@
<option_ios_texture_page>1024</option_ios_texture_page>
<option_ios_use_test_ads>false</option_ios_use_test_ads>
<option_lastchanged></option_lastchanged>
<option_linux_display_name>AM2R Multitroid 1.4</option_linux_display_name>
<option_linux_display_name>AM2R Multitroid 1.4.1</option_linux_display_name>
<option_linux_enable_steam>0</option_linux_enable_steam>
<option_linux_fullscreen>0</option_linux_fullscreen>
<option_linux_homepage>https://www.reddit.com/r/AM2R/</option_linux_homepage>
Expand Down

0 comments on commit d434594

Please sign in to comment.