luxferre/ArmageDec
1
0
Fork 0
Code Actions Releases 1 Activity

Fixed Health Crates Cure Poison choices, started some UI optimization

Browse Source
This commit is contained in:
Luxferre
2024-10-12 18:49:14 +03:00
parent 140a085ebe
commit 3846afaf10
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armagedec.tcl
+25 -25
View File
@@ -7,7 +7,7 @@
package require Tk
set appversion 0.5
set appversion 0.6
set scriptpath [file normalize [info script]]
set appdir [file dirname $scriptpath]
# check if we're running from a starpack
@@ -54,11 +54,11 @@ set wa_opts {
{offset 0x1E name {Blood} val {bool}}
{offset 0x23 name {Upgraded Grenade} val {bool}}
{offset 0x24 name {Upgraded Shotgun} val {bool}}
{offset 0x25 name {Upgraded Clusters} val {bool}}
{offset 0x26 name {Upgraded Longbow} val {bool}}
{offset 0x0F name {Sudden Death Event} val {0 {Round ends} 1 {Nuclear strike} 2 {HP drops to 1} 3 {Nothing happens}}}
{offset 0x0D name {Stockpiling Mode} val {0 Replenish 1 Accumulate 2 Reduce}}
{offset 0x0E name {Worm Selection} val {0 Sequential 1 Manual 2 Random}}
{offset 0x25 name {Upgraded Clusters} val {bool}}
{offset 0x26 name {Upgraded Longbow} val {bool}}
}
# names of weapon properties
@@ -202,18 +202,16 @@ set wa_ext_opts {
{offset 0x150 size 1 name {Undetermined Crates} def 128 val {0 Off 1 On 128 Default}}
{offset 0x151 size 1 name {Undetermined Fuses} def 128 val {0 Off 1 On 128 Default}}
{offset 0x14A size 1 name {Rope-Roll Drops} def 0 val {0 {Disabled} 1 {As from rope only} 2 {As from rope or jump}}}
{offset 0x14B size 1 name {Horizontal Impact Loss of Control} def 0 val {0 {Lose control} 255 {No loss of control}}}
{offset 0x143 size 1 name {Phased Worms (Enemy)} def 0 val {
0 {Off}
1 {Worms move through each other}
2 {+ Move through enemy weapon objects}
3 {+ Don't take damage from enemy explosions}
}}
{offset 0x14D size 1 name {Keep Control After Skimming} def 0 val {0 {Lose control} 1 {Keep control} 2 {Keep control and rope}}}
{offset 0x183 size 1 name {RubberWorm Gravity Type} def 0 val {0 {Unmodified} 1 {Standard} 2 {Black hole (constant)} 3 {Black hole (linear)}}}
{offset 0x191 size 1 name {Health Crates Cure Poison} def 1 val {255 {Off} 0 {Cure the collector} 1 {Cure the collector's team} 2 {Cure all allied teams}}}
{offset 0x156 size 1 name {Pneumatic Drill Imparts Velocity} def 128 val {0 Off 1 On 128 Default}}
{offset 0x16D size 1 name {Indian Rope Glitch} def 128 val {0 Off 1 On 128 Default}}
{offset 0x16E size 1 name {Herd-Doubling Glitch} def 128 val {0 Off 1 On 128 Default}}
{offset 0x172 size 1 name {Skipwalking} def 0 val {255 Disabled 0 Possible 1 Facilitated}}
{offset 0x193 size 1 name {Sheep Heaven's Gate} def 7 val {
1 {1. Sheep explode out of all crates}
2 {2. Sheep weapon extended fuse time}
@@ -223,18 +221,20 @@ set wa_ext_opts {
6 {6. Option 2 + Option 4}
7 {7. All of the above}
}}
{offset 0x192 size 1 name {Kaos Mod Preset} def 0 val {
0 {20, 10, 15, 5, 10, 15, 10, 15, 5}
1 {20, 10, 10, 5, 10, 15, 10, 12, 5}
2 {20, 15, 10, 5, 10, 15, 10, 10, 0}
3 {25, 15, 5, 0, 20, 20, 10, 5, 0}
4 {25, 25, 0, 5, 20, 10, 10, 5, 0}
5 {25, 15, 5, 5, 25, 10, 10, 5, 0}
}}
{offset 0x16E size 1 name {Herd-Doubling Glitch} def 128 val {0 Off 1 On 128 Default}}
{offset 0x172 size 1 name {Skipwalking} def 0 val {255 Disabled 0 Possible 1 Facilitated}}
{offset 0x173 size 1 name {Roofing} def 0 val {0 {Allowed} 1 {Block above} 2 {Block everywhere}}}
{offset 0x18E size 1 name {Terrain Overlap Phasing Glitch} def 128 val {0 Off 1 On 128 Default}}
{offset 0x183 size 1 name {RubberWorm Gravity Type} def 0 val {0 {Unmodified} 1 {Standard} 2 {Black hole (constant)} 3 {Black hole (linear)}}}
{offset 0x191 size 1 name {Health Crates Cure Poison} def 1 val {255 {Off} 0 {Cure the collector} 2 {Cure the collector's team} 3 {Cure all allied teams}}}
{offset 0x192 size 1 name {Kaos Mod Preset} def 0 val {
0 {Preset 0}
1 {Preset 1}
2 {Preset 2}
3 {Preset 3}
4 {Preset 4}
5 {Preset 5}
}}
{offset 0x14B size 1 name {Horizontal Impact Loss of Control} def 0 val {0 {Lose control} 255 {No loss of control}}}
{offset 0x14D size 1 name {Keep Control After Skimming} def 0 val {0 {Lose control} 1 {Keep control} 2 {Keep control and rope}}}
}
# special setting processor section
@@ -571,7 +571,7 @@ grid .infoframe -row 1 -column 0 -sticky we
ttk::frame .tabbar.nopts
.tabbar add .tabbar.nopts -text "Options"
ttk::labelframe .tabbar.nopts.opts -text "General options"
grid .tabbar.nopts.opts -column 0 -row 0 -sticky nw -padx 5 -pady 5 -columnspan 6
grid .tabbar.nopts.opts -column 0 -row 0 -sticky nw -padx 5 -pady 5 -columnspan 4
set row 0
set col 0
@@ -609,7 +609,7 @@ foreach opt $wa_opts {
grid $comboid -column $col -row $row -sticky news
}
incr col
if {$col > 4} {
if {$col > 3} {
set col 0
incr row
}
@@ -721,7 +721,7 @@ foreach opt $wa_ext_opts {
}
grid $comboid -column $col -row $row -sticky news -padx 5 -pady 3
incr col
if {$col > 5} {
if {$col > 4} {
set col 0
incr row
}
@@ -730,7 +730,7 @@ foreach opt $wa_ext_opts {
# right container of the first tab
ttk::frame .tabbar.nopts.right
grid .tabbar.nopts.right -column 6 -row 0 -sticky ne
grid .tabbar.nopts.right -column 4 -row 0 -sticky nwe
# Mines and barrels calc
set hcalc_mines 0
@@ -741,11 +741,11 @@ ttk::labelframe $calcpref -text "Mines & Barrels Calculator"
grid $calcpref -column 0 -row 0 -sticky nw -padx 5 -pady 5
ttk::label "$calcpref.minelbl" -text Mines
ttk::entry "$calcpref.minetxt" -width 3 -textvariable hcalc_mines
grid $calcpref.minelbl -column 0 -row 0 -sticky nw -padx 5 -pady 5
grid $calcpref.minelbl -column 0 -row 0 -sticky nsw -padx 5 -pady 5
grid $calcpref.minetxt -column 1 -row 0 -sticky nw -padx 5 -pady 5
ttk::label "$calcpref.barrlbl" -text Barrels
ttk::entry "$calcpref.barrtxt" -width 3 -textvariable hcalc_barrels
grid $calcpref.barrlbl -column 0 -row 1 -sticky nw -padx 5 -pady 5
grid $calcpref.barrlbl -column 0 -row 1 -sticky nsw -padx 5 -pady 5
grid $calcpref.barrtxt -column 1 -row 1 -sticky nw -padx 5 -pady 5
ttk::button "$calcpref.reset" -text Reset -command {
set hcalc_mines 0
@@ -841,9 +841,9 @@ ttk::button "$calcpref.docalc" -text Calculate -command {
}
grid $calcpref.docalc -column 2 -row 2 -sticky nw -padx 5 -pady 5
ttk::label "$calcpref.resultlbl" -text "Result:"
grid $calcpref.resultlbl -column 0 -row 2 -sticky nw -padx 5 -pady 5
grid $calcpref.resultlbl -column 0 -row 2 -sticky nsw -padx 5 -pady 5
ttk::label "$calcpref.result" -textvariable hcalc_result
grid $calcpref.result -column 1 -row 2 -sticky nw -padx 5 -pady 5
grid $calcpref.result -column 1 -row 2 -sticky nsw -padx 5 -pady 5
# Version overrider
set verpref ".tabbar.nopts.right.vers"