Merge branch 'dev' of https://git.iiens.net/labane2013/tekajam into dev

Assets/Data/Fights/CostaHummingFight8-10.asset → Assets/Data/Fights/CostaHummingFight12-14.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: CostaHummingFight8-10
+  m_Name: CostaHummingFight12-14
   m_EditorClassIdentifier: 
   bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3}
   scoreToMatch: 16
-  tierMin: 8
-  tierMax: 10
+  tierMin: 12
+  tierMax: 14
   FightDescription: 'Coastal Hummingbird the Annoying. Score : 16. Decreases your
     draw.'
   alterationEffects:

Assets/Data/Fights/CostaHummingFight11-13.asset → Assets/Data/Fights/CostaHummingFight15-17.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: CostaHummingFight11-13
+  m_Name: CostaHummingFight15-17
   m_EditorClassIdentifier: 
   bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3}
   scoreToMatch: 20
-  tierMin: 11
-  tierMax: 13
+  tierMin: 15
+  tierMax: 17
   FightDescription: 'Coastal Hummingbird the Annoying. Score : 20. Decreases your
     draw.'
   alterationEffects:

Assets/Data/Fights/CostaHummingFight9-11.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
+  m_Name: CostaHummingFight12-14
+  m_EditorClassIdentifier: 
+  bird: {fileID: 498878385731201535, guid: 39963b9ecc6e40e49a45816d4f379193, type: 3}
+  scoreToMatch: 16
+  tierMin: 12
+  tierMax: 14
+  FightDescription: 'Coastal Hummingbird the Annoying. Score : 16. Decreases your
+    draw.'
+  alterationEffects:
+  - validity: 1
+    type: 5
+    value: -1

Assets/Data/Fights/CostaHummingFight9-11.asset.meta

+fileFormatVersion: 2
+guid: 824eec0d9354b4f40aad025657feed24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Fights/EvilDuck.asset

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   bird: {fileID: 1695193658733767104, guid: f7d632d63b642d14d9ae01213b67367d, type: 3}
   scoreToMatch: 60
-  tierMin: 14
-  tierMax: 14
+  tierMin: 18
+  tierMax: 18
   FightDescription: Evil Duck, your archnemesis.
   alterationEffects:
   - validity: 1

Assets/Data/Fights/FlameBowerFight8-10.asset → Assets/Data/Fights/FlameBowerFight12-14.asset

@@ -10,11 +10,11 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: FlameBowerFight8-10
+  m_Name: FlameBowerFight12-14
   m_EditorClassIdentifier: 
   bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
   scoreToMatch: 24
-  tierMin: 8
-  tierMax: 10
+  tierMin: 12
+  tierMax: 14
   FightDescription: 'Flame Bowerbird the Plain. Score : 24.'
   alterationEffects: []

Assets/Data/Fights/FlameBowerFight11-13.asset → Assets/Data/Fights/FlameBowerFight15-17.asset

@@ -10,11 +10,11 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: FlameBowerFight11-13
+  m_Name: FlameBowerFight15-17
   m_EditorClassIdentifier: 
   bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
   scoreToMatch: 32
-  tierMin: 11
-  tierMax: 13
+  tierMin: 15
+  tierMax: 17
   FightDescription: 'Flame Bowerbird the Plain. Score : 32.'
   alterationEffects: []

Assets/Data/Fights/FlameBowerFight5-8.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
+  m_Name: FlameBowerFight5-8
+  m_EditorClassIdentifier: 
+  bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
+  scoreToMatch: 15
+  tierMin: 5
+  tierMax: 8
+  FightDescription: 'Flame Bowerbird the Plain. Score : 12.'
+  alterationEffects: []

Assets/Data/Fights/FlameBowerFight5-8.asset.meta

+fileFormatVersion: 2
+guid: 7036b75f56e9d254688f1d4d1481a87c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Fights/FlameBowerFight5-7.asset → Assets/Data/Fights/FlameBowerFight9-11.asset

@@ -10,11 +10,11 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: FlameBowerFight5-7
+  m_Name: FlameBowerFight9-11
   m_EditorClassIdentifier: 
   bird: {fileID: 5083819637802795338, guid: c1345dc568727664fa5489acdedd80af, type: 3}
   scoreToMatch: 18
-  tierMin: 5
-  tierMax: 7
+  tierMin: 9
+  tierMax: 11
   FightDescription: 'Flame Bowerbird the Plain. Score : 18.'
   alterationEffects: []

Assets/Data/Fights/GreaterFightOfParadise7-11.asset → Assets/Data/Fights/GreaterFightOfParadise15-17.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: GreaterFightOfParadise7-11
+  m_Name: GreaterFightOfParadise15-17
   m_EditorClassIdentifier: 
   bird: {fileID: 6750887986308946089, guid: 36eb6cce5668d95429e4a26c874240c0, type: 3}
   scoreToMatch: 16
-  tierMin: 11
-  tierMax: 13
+  tierMin: 15
+  tierMax: 17
   FightDescription: 'Greater Bird of Paradise, the Stunning. Score : 16. Leeches score
     from your actions.'
   alterationEffects:

Assets/Data/Fights/MagnificentRiflefight8-10.asset → Assets/Data/Fights/MagnificentRiflefight12-14.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: MagnificentRiflefight8-10
+  m_Name: MagnificentRiflefight12-14
   m_EditorClassIdentifier: 
   bird: {fileID: 7700743239997283471, guid: d3e52fce826412e4e8a960dda34214e8, type: 3}
   scoreToMatch: 15
-  tierMin: 8
-  tierMax: 10
+  tierMin: 12
+  tierMax: 14
   FightDescription: 'Magnificent Riflebird the Copycat. Score : 15. Gains score when
     you do.'
   alterationEffects:

Assets/Data/Fights/MagnificentRiflefight11-13.asset → Assets/Data/Fights/MagnificentRiflefight15-17.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9d9096f239b36c5468a259941b1009ef, type: 3}
-  m_Name: MagnificentRiflefight11-13
+  m_Name: MagnificentRiflefight15-17
   m_EditorClassIdentifier: 
   bird: {fileID: 7700743239997283471, guid: d3e52fce826412e4e8a960dda34214e8, type: 3}
   scoreToMatch: 18
-  tierMin: 11
-  tierMax: 13
+  tierMin: 15
+  tierMax: 17
   FightDescription: 'Magnificent Riflebird the Copycat. Score : 18. Gains score when
     you do.'
   alterationEffects: