Added innate ki multiplier for better power stuff.

Putnam3145 · Apr 19, 2015 · 5b2c431 · 5b2c431
1 parent 61f1498
commit 5b2c431
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 24 deletions.
diff --git a/raw/objects/creature_android.txt b/raw/objects/creature_android.txt
@@ -36,6 +36,7 @@ creature_android
 		[NOT_LIVING]
 		[FLIER]
 		[CREATURE_CLASS:NATURAL_KI]
+        [CREATURE_CLASS:KI_MULTIPLIER_50]
 		[CREATURE_CLASS:ANDROID]
 		[BODY_SIZE:0:0:40000]
 		[BODY_SIZE:1:168:175000]

diff --git a/raw/objects/creature_boo.txt b/raw/objects/creature_boo.txt
@@ -72,7 +72,9 @@ creature_boo
 	[CANNOT_UNDEAD]
 	[FLIER]
 	[NO_THOUGHT_CENTER_FOR_MOVEMENT]
-	[CREATURE_CLASS:NATURAL_KI][APPLY_CREATURE_VARIATION:FLYING_DBZ_GAITS:900:675:450:225:1900:2900]
+	[CREATURE_CLASS:NATURAL_KI]
+    [CREATURE_CLASS:KI_MULTIPLIER_200]
+    [APPLY_CREATURE_VARIATION:FLYING_DBZ_GAITS:900:675:450:225:1900:2900]
 	[CREATURE_CLASS:SAIYAN]
 	[BODY_SIZE:0:0:100000]
 	[APPLY_CURRENT_CREATURE_VARIATION]

diff --git a/raw/objects/creature_cell.txt b/raw/objects/creature_cell.txt
@@ -5,7 +5,7 @@ creature_cell
 		[DESCRIPTION:A bionic android, called "Cell" by some. It contains the DNA and abilities of the universe's greatest fighters. It can only be killed through the destruction of its nucleus.]
 		[MEGABEAST][ITEMCORPSE:TOOL:DRAGONBALL:NONE:NONE]
 		[DIFFICULTY:15]
-		[ATTACK_TRIGGER:100:5000:50000] Why so low? Spoilers.
+		[ATTACK_TRIGGER:100:5000:50000]
 		[CREATURE_TILE:'C']
 		[COLOR:2:0:1]
 		[CASTE_NAME:bionic android:bionic androids:android]
@@ -25,6 +25,8 @@ creature_cell
 		[USE_TISSUE_TEMPLATE:NAIL:SYNTHARMOR_TEMPLATE]
 		[TISSUE_LAYER:BY_CATEGORY:FINGER:NAIL:FRONT]
 		[TISSUE_LAYER:BY_CATEGORY:TOE:NAIL:FRONT]
+        [CREATURE_CLASS:NATURAL_KI]
+        [CREATURE_CLASS:KI_MULTIPLIER_75] Between SSJ and SSJ2 tier
 		[NO_EAT]
 		[NO_DRINK]
 		[TRAPAVOID]
@@ -62,7 +64,7 @@ creature_cell
 		[NATURAL_SKILL:RANGED_COMBAT:20]
 		[NATURAL_SKILL:MELEE_COMBAT:20]
 		[NATURAL_SKILL:PROSE:20]
-		[BODY_SIZE:0:0:5000000] Between SSJ and SSJ2 tier
+		[BODY_SIZE:0:0:70000]
 		[BIOME:NOT_FREEZING]
 		[APPLY_CREATURE_VARIATION:HUMANOID_MARTIAL_ARTS_MOVES_DRAGONBALL]
 		[APPLY_CURRENT_CREATURE_VARIATION]
@@ -185,8 +187,8 @@ creature_cell
 			[SYN_INGESTED]
 			[SYN_INHALED]
 			[SYN_CONTACT]
-			[SYN_CLASS:CELL_ABSORB_BUFF] not sure why this is here...
-			[SYN_CLASS:\COMMAND][SYN_CLASS:dragonball/cell_absorb][SYN_CLASS:\UNIT_ID] Oh, that's why.
+			[SYN_CLASS:CELL_ABSORB_BUFF]
+			[SYN_CLASS:\COMMAND][SYN_CLASS:dragonball/cell_absorb][SYN_CLASS:\UNIT_ID]
 	[TISSUE:FLESH]
 		[TISSUE_NAME:flesh:NP]
 		[STRUCTURAL]

diff --git a/raw/objects/creature_fanciful_dragonball.txt b/raw/objects/creature_fanciful_dragonball.txt
@@ -44,6 +44,7 @@ creature_fanciful_dragonball
 		[USE_MATERIAL_TEMPLATE:PUS:PUS_TEMPLATE]
 		[PUS:LOCAL_CREATURE_MAT:PUS:LIQUID]
 		[CREATURE_CLASS:NATURAL_KI][APPLY_CREATURE_VARIATION:FLYING_DBZ_GAITS:900:675:450:225:1900:2900]
+        [CREATURE_CLASS:KI_MULTIPLIER_100]
 		[FLIER]
 		[PHYS_ATT_RANGE:STRENGTH:500:1050:2150:2550:2750:2950:5000]
 		[PHYS_ATT_RANGE:AGILITY:1000:2050:3150:3550:3750:3950:5000]

diff --git a/raw/objects/creature_frieza.txt b/raw/objects/creature_frieza.txt
@@ -255,7 +255,8 @@ creature_frieza
 		[CASTE:FRIEZA]
 			[MALE]
 			[BUILDINGDESTROYER:2]
-			[BODY_SIZE:12:0:3000000] Form 4, less than SSJ tier, but still incredibly powerful
+			[BODY_SIZE:12:0:70000]
+            [CREATURE_CLASS:KI_MULTIPLIER_30]
 			[POP_RATIO:1]
 			[BODY:TAIL_PREHENSILE]
 			[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]

diff --git a/raw/objects/creature_movies_db.txt b/raw/objects/creature_movies_db.txt
@@ -122,6 +122,7 @@ creature_movies_db
 		[USE_MATERIAL_TEMPLATE:PUS:PUS_TEMPLATE]
 		[PUS:LOCAL_CREATURE_MAT:PUS:LIQUID]
 		[CREATURE_CLASS:NATURAL_KI][APPLY_CREATURE_VARIATION:FLYING_DBZ_GAITS:900:675:450:225:1900:2900]
+        [CREATURE_CLASS:KI_MULTIPLIER_20]
 		[CANNOT_UNDEAD]
 		[CREATURE_CLASS:NAMEK]
 		[FLIER]
@@ -287,9 +288,10 @@ creature_movies_db
 		[PUS:LOCAL_CREATURE_MAT:PUS:LIQUID]
 		[FLIER]
 		[CREATURE_CLASS:NATURAL_KI][APPLY_CREATURE_VARIATION:FLYING_DBZ_GAITS:900:675:450:225:1900:2900]
+        [CREATURE_CLASS:KI_MULTIPLIER_30]
 		[BODY_SIZE:0:0:4000]
 		[BODY_SIZE:1:168:17500]
-		[BODY_SIZE:12:0:2800000]
+		[BODY_SIZE:12:0:70000]
 		[PHYS_ATT_RANGE:STRENGTH:1000:2050:3150:3550:3750:3950:5000]
 		[PHYS_ATT_RANGE:AGILITY:1000:2050:3150:3550:3750:3950:5000]
 		[PHYS_ATT_RANGE:TOUGHNESS:1450:1950:2150:2250:2350:2550:4250]
@@ -413,6 +415,7 @@ creature_movies_db
 		[PUS:LOCAL_CREATURE_MAT:PUS:LIQUID]
 		[FLIER]
 		[CREATURE_CLASS:NATURAL_KI][APPLY_CREATURE_VARIATION:FLYING_DBZ_GAITS:900:675:450:225:1900:2900]
+        [CREATURE_CLASS:KI_MULTIPLIER_75]
 		[CREATURE_CLASS:SAIYAN]
         [CREATURE_CLASS:ZENKAI]
 		[BODY_SIZE:0:0:4000]
@@ -454,7 +457,6 @@ creature_movies_db
 
 			[MALE]
 			[PRONE_TO_RAGE:1000]
-			[GENERAL_MATERIAL_FORCE_MULTIPLIER:1:6]
 			[CASTE_NAME:legendary super saiyan:legendary super saiyan:super saiyan]
 			[DESCRIPTION:Run!]
 			[CAN_DO_INTERACTION:DO_NOTHING_INTERACTION_DB:START:0]
@@ -544,7 +546,7 @@ creature_movies_db
 	[CREATURE_CLASS:NATURAL_KI][APPLY_CREATURE_VARIATION:FLYING_DBZ_GAITS:900:675:450:225:1900:2900]
 	[BODY_SIZE:0:0:4000]
 	[BODY_SIZE:1:168:17500]
-	[BODY_SIZE:12:0:2000000000]
+	[BODY_SIZE:12:0:70000]
 	[CREATURE_CLASS:GOD]
 	[NATURAL_SKILL:DODGING:20]
 	[NATURAL_SKILL:MELEE_COMBAT:20]
@@ -634,6 +636,7 @@ creature_movies_db
 	[MENT_ATT_RATES:WILLPOWER:75:3:4:3]
 	[MENT_ATT_RATES:KINESTHETIC_SENSE:75:3:4:3]
 	[MENT_ATT_RATES:SPATIAL_SENSE:75:3:4:3]
+    [CREATURE_CLASS:KI_MULTIPLIER_4000]
 	[BABY:1]
 	[CHILD:12]
 	[EQUIPS]
@@ -646,7 +649,6 @@ creature_movies_db
 
 		[MALE]
 		[PRONE_TO_RAGE:10000]
-		[GENERAL_MATERIAL_FORCE_MULTIPLIER:1:40]
 		[DESCRIPTION:The God of Destruction of this universe. Lock yourselves up, for when he arrives, your only hope is the Super Saiyan God.]
 	[SELECT_CASTE:ALL]
 	[SET_TL_GROUP:BY_CATEGORY:ALL:SKIN]

diff --git a/raw/objects/creature_saiyan.txt b/raw/objects/creature_saiyan.txt
@@ -350,7 +350,6 @@ creature_saiyan
 			[CRAZED]
 			[CASTE_COLOR:6:0:1]
 			[FIREIMMUNE_SUPER]
-			[GENERAL_MATERIAL_FORCE_MULTIPLIER:1:5]
 		[SELECT_CASTE:ALL]
 			[CAN_DO_INTERACTION:MATERIAL_EMISSION]
 				[CDI:ADV_NAME:makohou]

diff --git a/raw/objects/interaction_dragonball.txt b/raw/objects/interaction_dragonball.txt
@@ -116,7 +116,6 @@ interaction_dragonball
                 [SYN_CLASS:KI_INVEST_FRACTION_100]
                 [SYN_CLASS:KI_TIME_5000]
 				[SYN_NAME:Super Saiyan]
-				[CE_MATERIAL_FORCE_MULTIPLIER:MAT_MULT:NONE:NONE:1:50:START:0:END:5000]
 				[CE_SKILL_ROLL_ADJUST:PERC:5000:PERC_ON:100:START:0:END:5000]
 				[CE_PHYS_ATT_CHANGE:AGILITY:5000:0:TOUGHNESS:5000:0:ENDURANCE:5000:0:RECUPERATION:5000:0:DISEASE_RESISTANCE:5000:0:START:0:END:5000]
 				[CE_MENT_ATT_CHANGE:FOCUS:5000:0:WILLPOWER:5000:0:INTUITION:5000:0:SPATIAL_SENSE:5000:0:KINESTHETIC_SENSE:5000:0:START:0:END:5000]
@@ -144,7 +143,6 @@ interaction_dragonball
                 [SYN_CLASS:KI_BOOST_100]
                 [SYN_CLASS:KI_INVEST_FRACTION_50]
                 [SYN_CLASS:KI_TIME_5000]
-				[CE_MATERIAL_FORCE_MULTIPLIER:MAT_MULT:NONE:NONE:1:100:START:0:END:5000]
 				[CE_SKILL_ROLL_ADJUST:PERC:10000:PERC_ON:100:START:0:END:5000]
 				[CE_PHYS_ATT_CHANGE:AGILITY:10000:0:TOUGHNESS:10000:0:ENDURANCE:10000:0:RECUPERATION:10000:0:DISEASE_RESISTANCE:10000:0:START:0:END:5000]
 				[CE_MENT_ATT_CHANGE:FOCUS:10000:0:WILLPOWER:10000:0:INTUITION:10000:0:SPATIAL_SENSE:10000:0:KINESTHETIC_SENSE:10000:0:START:0:END:5000]
@@ -172,7 +170,6 @@ interaction_dragonball
                 [SYN_CLASS:KI_INVEST_FRACTION_20]
                 [SYN_CLASS:KI_TIME_5000]
 				[SYN_NAME:Super Saiyan 3]
-				[CE_MATERIAL_FORCE_MULTIPLIER:MAT_MULT:NONE:NONE:1:400:START:0:END:5000]
 				[CE_SKILL_ROLL_ADJUST:PERC:40000:PERC_ON:100:START:0:END:5000]
 				[CE_PHYS_ATT_CHANGE:AGILITY:40000:0:TOUGHNESS:40000:0:ENDURANCE:20:0:RECUPERATION:40000:0:DISEASE_RESISTANCE:40000:0:START:0:END:5000]
 				[CE_MENT_ATT_CHANGE:FOCUS:40000:0:WILLPOWER:40000:0:INTUITION:40000:0:SPATIAL_SENSE:40000:0:KINESTHETIC_SENSE:40000:0:START:0:END:5000]
@@ -239,7 +236,7 @@ interaction_dragonball
 			[IE_IMMEDIATE]
 			[SYNDROME]
                 [SYN_NAME:Kaioken x5]
-                [SYN_CLASS:KI_BOOST_2]
+                [SYN_CLASS:KI_BOOST_5]
                 [SYN_CLASS:KI_INVEST_FRACTION_20]
                 [SYN_CLASS:KI_TIME_5000]
 				[CE_PHYS_ATT_CHANGE:AGILITY:500:0:TOUGHNESS:500:0:ENDURANCE:50:0:START:0:END:5000]
@@ -253,7 +250,7 @@ interaction_dragonball
 			[IE_TARGET:A]
 			[IE_IMMEDIATE]
 			[SYNDROME]
-                [SYN_CLASS:KI_BOOST_2]
+                [SYN_CLASS:KI_BOOST_10]
                 [SYN_CLASS:KI_INVEST_FRACTION_15]
                 [SYN_CLASS:KI_TIME_5000]
                 [SYN_NAME:Kaioken x10]
@@ -346,7 +343,6 @@ interaction_dragonball
 				[SYN_CLASS:GOD]
 				[SYN_CLASS:SUPER_SAIYAN]
 				[SYN_NAME:super saiyan god] If it isn't capitalized, it isn't a problem.
-				[CE_MATERIAL_FORCE_MULTIPLIER:MAT_MULT:NONE:NONE:1:4000:START:0:END:2000]
 				[CE_SPEED_CHANGE:SPEED_PERC:1500:START:0:END:2000]
 				[CE_SKILL_ROLL_ADJUST:PERC:400000:PERC_ON:100:START:0:END:2000]
 				[CE_PHYS_ATT_CHANGE:AGILITY:400000:0:TOUGHNESS:400000:0:ENDURANCE:400000:0:RECUPERATION:400000:0:DISEASE_RESISTANCE:400000:0:START:0:END:2000]
@@ -366,7 +362,7 @@ interaction_dragonball
 			[SYNDROME]
                 [SYN_NAME:beerus god]
 				[CE_PHYS_ATT_CHANGE:STRENGTH:0:100000:AGILITY:0:100000:TOUGHNESS:0:100000:ENDURANCE:0:100000:RECUPERATION:0:100000:DISEASE_RESISTANCE:0:100000:START:0]
-				[CE_MENT_ATT_CHANGE:FOCUS:400000:0:WILLPOWER:400000:0:INTUITION:400000:0:SPATIAL_SENSE:400000:0:KINESTHETIC_SENSE:400000:0:START:0]
+				[CE_MENT_ATT_CHANGE:FOCUS:0:100000:WILLPOWER:0:100000:INTUITION:0:100000:SPATIAL_SENSE:0:100000:KINESTHETIC_SENSE:0:100000:START:0]
 
 [INTERACTION:DO_NOTHING_INTERACTION_DB]
 		[I_SOURCE:CREATURE_ACTION]

diff --git a/raw/objects/interaction_secret_dragonball.txt b/raw/objects/interaction_secret_dragonball.txt
@@ -149,11 +149,12 @@ interaction_secret_dragonball
             [IE_IMMEDIATE]
             [SYNDROME]
                 [SYN_CLASS:KI]
-                [CE_BODY_APPEARANCE_MODIFIER:START:0:APPEARANCE_MODIFIER:HEIGHT:50000]
-                [CE_MATERIAL_FORCE_MULTIPLIER:MAT_MULT:NONE:NONE:1:20:START:0]
+                [SYN_CLASS:KI_BOOST_400]
+                [SYN_CLASS:KI_INVEST_FRACTION_100]
+                [SYN_CLASS:KI_TIME_0]
                 [CE_SPEED_CHANGE:SPEED_PERC:150:START:0]
                 [CE_SKILL_ROLL_ADJUST:PERC:50000:PERC_ON:100:START:0]
-                [CE_PHYS_ATT_CHANGE:STRENGTH:50000:0:AGILITY:50000:0:TOUGHNESS:50000:0:ENDURANCE:50000:0:RECUPERATION:50000:0:DISEASE_RESISTANCE:50000:0:START:0]
+                [CE_PHYS_ATT_CHANGE:AGILITY:50000:0:TOUGHNESS:50000:0:ENDURANCE:50000:0:RECUPERATION:50000:0:DISEASE_RESISTANCE:50000:0:START:0]
                 [CE_MENT_ATT_CHANGE:FOCUS:50000:0:WILLPOWER:50000:0:INTUITION:50000:0:SPATIAL_SENSE:50000:0:KINESTHETIC_SENSE:50000:0:START:0]
                 [CE_DISPLAY_NAME:NAME:(old kai potential unlocked):(old kai potential unlocked):old kai potential unlocked]
                 [CE_FLASH_TILE:TILE:142:7:0:1:FREQUENCY:5000:1000:START:0]

diff --git a/raw/scripts/dragonball/ki.lua b/raw/scripts/dragonball/ki.lua
@@ -2,7 +2,7 @@ local function unitCanUseKi(unit_id)
     local unit = df.unit.find(unit_id)
     if not unit then return false end
     for _,class in ipairs(df.creature_raw.find(unit.race).caste[unit.caste].creature_class) do
-        if class.value == 'NATURAL_KI' then return true end
+        if class.value=='NATURAL_KI' then return true end
     end
     for _,syndrome in ipairs(unit.syndromes.active) do
         for _,synclass in ipairs(df.syndrome.find(syndrome.type).syn_class) do
@@ -12,13 +12,22 @@ local function unitCanUseKi(unit_id)
     return false
 end
 
+local function get_ki_multiplier(unit)
+    for _,class in ipairs(df.creature_raw.find(unit.race).caste[unit.caste].creature_class) do
+        if class.value:find('KI_MULTIPLIER_') then 
+            return tonumber(class.value:sub(15)) or 1
+        end
+    end
+    return 1
+end
 
 function calculate_max_ki(unit_id)
     local unit = df.unit.find(unit_id)
     local willpower = unit.status.current_soul.mental_attrs.WILLPOWER.value
     local focus = unit.status.current_soul.mental_attrs.FOCUS.value
     local endurance = unit.body.physical_attrs.ENDURANCE.value
-    return willpower+focus+endurance
+    local multiplier=get_ki_multiplier(unit)
+    return (willpower+focus+endurance)*multiplier
 end
 
 function init_ki(unit_id)
@@ -31,7 +40,7 @@ function init_ki(unit_id)
         local willpower = unit.status.current_soul.mental_attrs.WILLPOWER.value
         local focus = unit.status.current_soul.mental_attrs.FOCUS.value
         local endurance = unit.body.physical_attrs.ENDURANCE.value
-        adjust_max_ki(unit_id,(willpower-unitKi.ints[4])+(focus-unitKi.ints[5])+(endurance-unitKi.ints[6]),false,true)
+        adjust_max_ki(unit_id,((willpower-unitKi.ints[4])+(focus-unitKi.ints[5])+(endurance-unitKi.ints[6]))*unitKi.ints[7],false,true)
         unitKi.ints[4]=unit.status.current_soul.mental_attrs.WILLPOWER.value
         unitKi.ints[5]=unit.status.current_soul.mental_attrs.FOCUS.value
         unitKi.ints[6]=unit.body.physical_attrs.ENDURANCE.value
@@ -42,6 +51,7 @@ function init_ki(unit_id)
     unitKi.ints[4]=unit.status.current_soul.mental_attrs.WILLPOWER.value
     unitKi.ints[5]=unit.status.current_soul.mental_attrs.FOCUS.value
     unitKi.ints[6]=unit.body.physical_attrs.ENDURANCE.value
+    unitKi.ints[7]=get_ki_multiplier(unit)
     unitKi.ints[2]=maxKi
     unitKi.ints[1]=maxKi
     unitKi.ints[3]=1000